Merge "Update signature files to the new format" am: a6c3d576e3

am: 1922932041

Change-Id: I2f30078a3b49ee682ddf00591687c6e9c375bd5c

6 files changed, 3416 insertions, 3420 deletions

diff --git a/api/current.txt b/api/current.txt
index b9cf9c9..fa57a92 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -1,17 +1,18 @@
+// Signature format: 2.0
 package android.net.compatibility {
 
   public class WebAddress {
-    ctor public WebAddress(java.lang.String) throws java.lang.IllegalArgumentException;
-    method public java.lang.String getAuthInfo();
-    method public java.lang.String getHost();
-    method public java.lang.String getPath();
+    ctor public WebAddress(String) throws java.lang.IllegalArgumentException;
+    method public String getAuthInfo();
+    method public String getHost();
+    method public String getPath();
     method public int getPort();
-    method public java.lang.String getScheme();
-    method public void setAuthInfo(java.lang.String);
-    method public void setHost(java.lang.String);
-    method public void setPath(java.lang.String);
+    method public String getScheme();
+    method public void setAuthInfo(String);
+    method public void setHost(String);
+    method public void setPath(String);
     method public void setPort(int);
-    method public void setScheme(java.lang.String);
+    method public void setScheme(String);
   }
 
 }
@@ -21,7 +22,7 @@ package android.net.http {
   public final class AndroidHttpClient implements org.apache.http.client.HttpClient {
     method public void close();
     method public void disableCurlLogging();
-    method public void enableCurlLogging(java.lang.String, int);
+    method public void enableCurlLogging(String, int);
     method public org.apache.http.HttpResponse execute(org.apache.http.client.methods.HttpUriRequest) throws java.io.IOException;
     method public org.apache.http.HttpResponse execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.protocol.HttpContext) throws java.io.IOException;
     method public org.apache.http.HttpResponse execute(org.apache.http.HttpHost, org.apache.http.HttpRequest) throws java.io.IOException;
@@ -36,9 +37,9 @@ package android.net.http {
     method public org.apache.http.params.HttpParams getParams();
     method public static java.io.InputStream getUngzippedContent(org.apache.http.HttpEntity) throws java.io.IOException;
     method public static void modifyRequestToAcceptGzipResponse(org.apache.http.HttpRequest);
-    method public static android.net.http.AndroidHttpClient newInstance(java.lang.String, android.content.Context);
-    method public static android.net.http.AndroidHttpClient newInstance(java.lang.String);
-    method public static long parseDate(java.lang.String);
+    method public static android.net.http.AndroidHttpClient newInstance(String, android.content.Context);
+    method public static android.net.http.AndroidHttpClient newInstance(String);
+    method public static long parseDate(String);
     field public static long DEFAULT_SYNC_MIN_GZIP_BYTES;
   }
 
@@ -65,16 +66,16 @@ package android.net.http {
   }
 
   public class CertificateChainValidator {
-    method public android.net.http.SslError doHandshakeAndValidateServerCertificates(android.net.http.HttpsConnection, javax.net.ssl.SSLSocket, java.lang.String) throws java.io.IOException;
+    method public android.net.http.SslError doHandshakeAndValidateServerCertificates(android.net.http.HttpsConnection, javax.net.ssl.SSLSocket, String) throws java.io.IOException;
     method public static android.net.http.CertificateChainValidator getInstance();
     method public static void handleTrustStorageUpdate();
-    method public static android.net.http.SslError verifyServerCertificates(byte[][], java.lang.String, java.lang.String) throws java.io.IOException;
+    method public static android.net.http.SslError verifyServerCertificates(byte[][], String, String) throws java.io.IOException;
   }
 
   public class DelegatingSSLSession implements javax.net.ssl.SSLSession {
     ctor protected DelegatingSSLSession();
     method public int getApplicationBufferSize();
-    method public java.lang.String getCipherSuite();
+    method public String getCipherSuite();
     method public long getCreationTime();
     method public byte[] getId();
     method public long getLastAccessedTime();
@@ -83,31 +84,31 @@ package android.net.http {
     method public int getPacketBufferSize();
     method public javax.security.cert.X509Certificate[] getPeerCertificateChain() throws javax.net.ssl.SSLPeerUnverifiedException;
     method public java.security.cert.Certificate[] getPeerCertificates() throws javax.net.ssl.SSLPeerUnverifiedException;
-    method public java.lang.String getPeerHost();
+    method public String getPeerHost();
     method public int getPeerPort();
     method public java.security.Principal getPeerPrincipal() throws javax.net.ssl.SSLPeerUnverifiedException;
-    method public java.lang.String getProtocol();
+    method public String getProtocol();
     method public javax.net.ssl.SSLSessionContext getSessionContext();
-    method public java.lang.Object getValue(java.lang.String);
-    method public java.lang.String[] getValueNames();
+    method public Object getValue(String);
+    method public String[] getValueNames();
     method public void invalidate();
     method public boolean isValid();
-    method public void putValue(java.lang.String, java.lang.Object);
-    method public void removeValue(java.lang.String);
+    method public void putValue(String, Object);
+    method public void removeValue(String);
   }
 
   public static class DelegatingSSLSession.CertificateWrap extends android.net.http.DelegatingSSLSession {
     ctor public DelegatingSSLSession.CertificateWrap(java.security.cert.Certificate);
   }
 
-  public abstract interface EventHandler {
-    method public abstract void certificate(android.net.http.SslCertificate);
-    method public abstract void data(byte[], int);
-    method public abstract void endData();
-    method public abstract void error(int, java.lang.String);
-    method public abstract boolean handleSslErrorRequest(android.net.http.SslError);
-    method public abstract void headers(android.net.http.Headers);
-    method public abstract void status(int, int, int, java.lang.String);
+  public interface EventHandler {
+    method public void certificate(android.net.http.SslCertificate);
+    method public void data(byte[], int);
+    method public void endData();
+    method public void error(int, String);
+    method public boolean handleSslErrorRequest(android.net.http.SslError);
+    method public void headers(android.net.http.Headers);
+    method public void status(int, int, int, String);
     field public static final int ERROR = -1; // 0xffffffff
     field public static final int ERROR_AUTH = -4; // 0xfffffffc
     field public static final int ERROR_BAD_URL = -12; // 0xfffffff4
@@ -128,91 +129,91 @@ package android.net.http {
 
   public final class Headers {
     ctor public Headers();
-    method public java.lang.String getAcceptRanges();
-    method public java.lang.String getCacheControl();
+    method public String getAcceptRanges();
+    method public String getCacheControl();
     method public int getConnectionType();
-    method public java.lang.String getContentDisposition();
-    method public java.lang.String getContentEncoding();
+    method public String getContentDisposition();
+    method public String getContentEncoding();
     method public long getContentLength();
-    method public java.lang.String getContentType();
-    method public java.lang.String getEtag();
-    method public java.lang.String getExpires();
+    method public String getContentType();
+    method public String getEtag();
+    method public String getExpires();
     method public void getHeaders(android.net.http.Headers.HeaderCallback);
-    method public java.lang.String getLastModified();
-    method public java.lang.String getLocation();
-    method public java.lang.String getPragma();
-    method public java.lang.String getProxyAuthenticate();
-    method public java.lang.String getRefresh();
+    method public String getLastModified();
+    method public String getLocation();
+    method public String getPragma();
+    method public String getProxyAuthenticate();
+    method public String getRefresh();
     method public java.util.ArrayList<java.lang.String> getSetCookie();
     method public long getTransferEncoding();
-    method public java.lang.String getWwwAuthenticate();
-    method public java.lang.String getXPermittedCrossDomainPolicies();
+    method public String getWwwAuthenticate();
+    method public String getXPermittedCrossDomainPolicies();
     method public void parseHeader(org.apache.http.util.CharArrayBuffer);
-    method public void setAcceptRanges(java.lang.String);
-    method public void setCacheControl(java.lang.String);
-    method public void setContentDisposition(java.lang.String);
-    method public void setContentEncoding(java.lang.String);
+    method public void setAcceptRanges(String);
+    method public void setCacheControl(String);
+    method public void setContentDisposition(String);
+    method public void setContentEncoding(String);
     method public void setContentLength(long);
-    method public void setContentType(java.lang.String);
-    method public void setEtag(java.lang.String);
-    method public void setExpires(java.lang.String);
-    method public void setLastModified(java.lang.String);
-    method public void setLocation(java.lang.String);
-    method public void setProxyAuthenticate(java.lang.String);
-    method public void setWwwAuthenticate(java.lang.String);
-    method public void setXPermittedCrossDomainPolicies(java.lang.String);
-    field public static final java.lang.String ACCEPT_RANGES = "accept-ranges";
-    field public static final java.lang.String CACHE_CONTROL = "cache-control";
+    method public void setContentType(String);
+    method public void setEtag(String);
+    method public void setExpires(String);
+    method public void setLastModified(String);
+    method public void setLocation(String);
+    method public void setProxyAuthenticate(String);
+    method public void setWwwAuthenticate(String);
+    method public void setXPermittedCrossDomainPolicies(String);
+    field public static final String ACCEPT_RANGES = "accept-ranges";
+    field public static final String CACHE_CONTROL = "cache-control";
     field public static final int CONN_CLOSE = 1; // 0x1
-    field public static final java.lang.String CONN_DIRECTIVE = "connection";
+    field public static final String CONN_DIRECTIVE = "connection";
     field public static final int CONN_KEEP_ALIVE = 2; // 0x2
-    field public static final java.lang.String CONTENT_DISPOSITION = "content-disposition";
-    field public static final java.lang.String CONTENT_ENCODING = "content-encoding";
-    field public static final java.lang.String CONTENT_LEN = "content-length";
-    field public static final java.lang.String CONTENT_TYPE = "content-type";
-    field public static final java.lang.String ETAG = "etag";
-    field public static final java.lang.String EXPIRES = "expires";
-    field public static final java.lang.String LAST_MODIFIED = "last-modified";
-    field public static final java.lang.String LOCATION = "location";
+    field public static final String CONTENT_DISPOSITION = "content-disposition";
+    field public static final String CONTENT_ENCODING = "content-encoding";
+    field public static final String CONTENT_LEN = "content-length";
+    field public static final String CONTENT_TYPE = "content-type";
+    field public static final String ETAG = "etag";
+    field public static final String EXPIRES = "expires";
+    field public static final String LAST_MODIFIED = "last-modified";
+    field public static final String LOCATION = "location";
     field public static final int NO_CONN_TYPE = 0; // 0x0
     field public static final long NO_CONTENT_LENGTH = -1L; // 0xffffffffffffffffL
     field public static final long NO_TRANSFER_ENCODING = 0L; // 0x0L
-    field public static final java.lang.String PRAGMA = "pragma";
-    field public static final java.lang.String PROXY_AUTHENTICATE = "proxy-authenticate";
-    field public static final java.lang.String PROXY_CONNECTION = "proxy-connection";
-    field public static final java.lang.String REFRESH = "refresh";
-    field public static final java.lang.String SET_COOKIE = "set-cookie";
-    field public static final java.lang.String TRANSFER_ENCODING = "transfer-encoding";
-    field public static final java.lang.String WWW_AUTHENTICATE = "www-authenticate";
-    field public static final java.lang.String X_PERMITTED_CROSS_DOMAIN_POLICIES = "x-permitted-cross-domain-policies";
+    field public static final String PRAGMA = "pragma";
+    field public static final String PROXY_AUTHENTICATE = "proxy-authenticate";
+    field public static final String PROXY_CONNECTION = "proxy-connection";
+    field public static final String REFRESH = "refresh";
+    field public static final String SET_COOKIE = "set-cookie";
+    field public static final String TRANSFER_ENCODING = "transfer-encoding";
+    field public static final String WWW_AUTHENTICATE = "www-authenticate";
+    field public static final String X_PERMITTED_CROSS_DOMAIN_POLICIES = "x-permitted-cross-domain-policies";
   }
 
-  public static abstract interface Headers.HeaderCallback {
-    method public abstract void header(java.lang.String, java.lang.String);
+  public static interface Headers.HeaderCallback {
+    method public void header(String, String);
   }
 
   public class HttpAuthHeader {
-    ctor public HttpAuthHeader(java.lang.String);
-    method public java.lang.String getAlgorithm();
-    method public java.lang.String getNonce();
-    method public java.lang.String getOpaque();
-    method public java.lang.String getPassword();
-    method public java.lang.String getQop();
-    method public java.lang.String getRealm();
+    ctor public HttpAuthHeader(String);
+    method public String getAlgorithm();
+    method public String getNonce();
+    method public String getOpaque();
+    method public String getPassword();
+    method public String getQop();
+    method public String getRealm();
     method public int getScheme();
     method public boolean getStale();
-    method public java.lang.String getUsername();
+    method public String getUsername();
     method public boolean isBasic();
     method public boolean isDigest();
     method public boolean isProxy();
     method public boolean isSupportedScheme();
-    method public void setPassword(java.lang.String);
+    method public void setPassword(String);
     method public void setProxy();
-    method public void setUsername(java.lang.String);
+    method public void setUsername(String);
     field public static final int BASIC = 1; // 0x1
-    field public static final java.lang.String BASIC_TOKEN = "Basic";
+    field public static final String BASIC_TOKEN = "Basic";
     field public static final int DIGEST = 2; // 0x2
-    field public static final java.lang.String DIGEST_TOKEN = "Digest";
+    field public static final String DIGEST_TOKEN = "Digest";
     field public static final int UNKNOWN = 0; // 0x0
   }
 
@@ -225,30 +226,30 @@ package android.net.http {
     method public void certificate(android.net.http.SslCertificate);
     method public void data(byte[], int);
     method public void endData();
-    method public void error(int, java.lang.String);
+    method public void error(int, String);
     method public boolean handleSslErrorRequest(android.net.http.SslError);
     method public void headers(android.net.http.Headers);
-    method public void locationChanged(java.lang.String, boolean);
+    method public void locationChanged(String, boolean);
     method public void requestSent();
-    method public void status(int, int, int, java.lang.String);
+    method public void status(int, int, int, String);
   }
 
   public class RequestHandle {
-    ctor public RequestHandle(android.net.http.RequestQueue, java.lang.String, android.net.compatibility.WebAddress, java.lang.String, java.util.Map<java.lang.String, java.lang.String>, java.io.InputStream, int, android.net.http.Request);
-    ctor public RequestHandle(android.net.http.RequestQueue, java.lang.String, android.net.compatibility.WebAddress, java.lang.String, java.util.Map<java.lang.String, java.lang.String>, java.io.InputStream, int, android.net.http.Request, android.net.http.Connection);
-    method public static java.lang.String authorizationHeader(boolean);
+    ctor public RequestHandle(android.net.http.RequestQueue, String, android.net.compatibility.WebAddress, String, java.util.Map<java.lang.String,java.lang.String>, java.io.InputStream, int, android.net.http.Request);
+    ctor public RequestHandle(android.net.http.RequestQueue, String, android.net.compatibility.WebAddress, String, java.util.Map<java.lang.String,java.lang.String>, java.io.InputStream, int, android.net.http.Request, android.net.http.Connection);
+    method public static String authorizationHeader(boolean);
     method public void cancel();
-    method public static java.lang.String computeBasicAuthResponse(java.lang.String, java.lang.String);
-    method public java.lang.String getMethod();
+    method public static String computeBasicAuthResponse(String, String);
+    method public String getMethod();
     method public int getRedirectCount();
     method public void handleSslErrorResponse(boolean);
     method public boolean isRedirectMax();
     method public void pauseRequest(boolean);
     method public void processRequest();
     method public void setRedirectCount(int);
-    method public void setupBasicAuthResponse(boolean, java.lang.String, java.lang.String);
-    method public void setupDigestAuthResponse(boolean, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
-    method public boolean setupRedirect(java.lang.String, int, java.util.Map<java.lang.String, java.lang.String>);
+    method public void setupBasicAuthResponse(boolean, String, String);
+    method public void setupDigestAuthResponse(boolean, String, String, String, String, String, String, String);
+    method public boolean setupRedirect(String, int, java.util.Map<java.lang.String,java.lang.String>);
     method public void waitUntilComplete();
     field public static final int MAX_REDIRECT_COUNT = 16; // 0x10
   }
@@ -256,16 +257,16 @@ package android.net.http {
   public class RequestQueue {
     ctor public RequestQueue(android.content.Context);
     ctor public RequestQueue(android.content.Context, int);
-    method public synchronized void disablePlatformNotifications();
-    method public synchronized void enablePlatformNotifications();
+    method public void disablePlatformNotifications();
+    method public void enablePlatformNotifications();
     method public org.apache.http.HttpHost getProxyHost();
-    method public synchronized android.net.http.Request getRequest();
-    method public synchronized android.net.http.Request getRequest(org.apache.http.HttpHost);
-    method public synchronized boolean haveRequest(org.apache.http.HttpHost);
-    method public android.net.http.RequestHandle queueRequest(java.lang.String, java.lang.String, java.util.Map<java.lang.String, java.lang.String>, android.net.http.EventHandler, java.io.InputStream, int);
-    method public android.net.http.RequestHandle queueRequest(java.lang.String, android.net.compatibility.WebAddress, java.lang.String, java.util.Map<java.lang.String, java.lang.String>, android.net.http.EventHandler, java.io.InputStream, int);
-    method protected synchronized void queueRequest(android.net.http.Request, boolean);
-    method public android.net.http.RequestHandle queueSynchronousRequest(java.lang.String, android.net.compatibility.WebAddress, java.lang.String, java.util.Map<java.lang.String, java.lang.String>, android.net.http.EventHandler, java.io.InputStream, int);
+    method public android.net.http.Request getRequest();
+    method public android.net.http.Request getRequest(org.apache.http.HttpHost);
+    method public boolean haveRequest(org.apache.http.HttpHost);
+    method public android.net.http.RequestHandle queueRequest(String, String, java.util.Map<java.lang.String,java.lang.String>, android.net.http.EventHandler, java.io.InputStream, int);
+    method public android.net.http.RequestHandle queueRequest(String, android.net.compatibility.WebAddress, String, java.util.Map<java.lang.String,java.lang.String>, android.net.http.EventHandler, java.io.InputStream, int);
+    method protected void queueRequest(android.net.http.Request, boolean);
+    method public android.net.http.RequestHandle queueSynchronousRequest(String, android.net.compatibility.WebAddress, String, java.util.Map<java.lang.String,java.lang.String>, android.net.http.EventHandler, java.io.InputStream, int);
     method public void requeueRequest(android.net.http.Request);
     method public void shutdown();
     method public void startTiming();
@@ -273,14 +274,14 @@ package android.net.http {
   }
 
   public class SslCertificate {
-    ctor public deprecated SslCertificate(java.lang.String, java.lang.String, java.lang.String, java.lang.String);
-    ctor public deprecated SslCertificate(java.lang.String, java.lang.String, java.util.Date, java.util.Date);
+    ctor @Deprecated public SslCertificate(String, String, String, String);
+    ctor @Deprecated public SslCertificate(String, String, java.util.Date, java.util.Date);
     ctor public SslCertificate(java.security.cert.X509Certificate);
     method public android.net.http.SslCertificate.DName getIssuedBy();
     method public android.net.http.SslCertificate.DName getIssuedTo();
-    method public deprecated java.lang.String getValidNotAfter();
+    method @Deprecated public String getValidNotAfter();
     method public java.util.Date getValidNotAfterDate();
-    method public deprecated java.lang.String getValidNotBefore();
+    method @Deprecated public String getValidNotBefore();
     method public java.util.Date getValidNotBeforeDate();
     method public java.security.cert.X509Certificate getX509Certificate();
     method public static android.net.http.SslCertificate restoreState(android.os.Bundle);
@@ -288,28 +289,28 @@ package android.net.http {
   }
 
   public class SslCertificate.DName {
-    ctor public SslCertificate.DName(java.lang.String);
-    method public java.lang.String getCName();
-    method public java.lang.String getDName();
-    method public java.lang.String getOName();
-    method public java.lang.String getUName();
+    ctor public SslCertificate.DName(String);
+    method public String getCName();
+    method public String getDName();
+    method public String getOName();
+    method public String getUName();
   }
 
   public class SslError {
-    ctor public deprecated SslError(int, android.net.http.SslCertificate);
-    ctor public deprecated SslError(int, java.security.cert.X509Certificate);
-    ctor public SslError(int, android.net.http.SslCertificate, java.lang.String);
-    ctor public SslError(int, java.security.cert.X509Certificate, java.lang.String);
+    ctor @Deprecated public SslError(int, android.net.http.SslCertificate);
+    ctor @Deprecated public SslError(int, java.security.cert.X509Certificate);
+    ctor public SslError(int, android.net.http.SslCertificate, String);
+    ctor public SslError(int, java.security.cert.X509Certificate, String);
     method public boolean addError(int);
     method public android.net.http.SslCertificate getCertificate();
     method public int getPrimaryError();
-    method public java.lang.String getUrl();
+    method public String getUrl();
     method public boolean hasError(int);
     field public static final int SSL_DATE_INVALID = 4; // 0x4
     field public static final int SSL_EXPIRED = 1; // 0x1
     field public static final int SSL_IDMISMATCH = 2; // 0x2
     field public static final int SSL_INVALID = 5; // 0x5
-    field public static final deprecated int SSL_MAX_ERROR = 6; // 0x6
+    field @Deprecated public static final int SSL_MAX_ERROR = 6; // 0x6
     field public static final int SSL_NOTYETVALID = 0; // 0x0
     field public static final int SSL_UNTRUSTED = 3; // 0x3
   }
@@ -319,33 +320,33 @@ package android.net.http {
 package com.android.internal.http.multipart {
 
   public class ByteArrayPartSource implements com.android.internal.http.multipart.PartSource {
-    ctor public ByteArrayPartSource(java.lang.String, byte[]);
+    ctor public ByteArrayPartSource(String, byte[]);
     method public java.io.InputStream createInputStream();
-    method public java.lang.String getFileName();
+    method public String getFileName();
     method public long getLength();
   }
 
   public class FilePart extends com.android.internal.http.multipart.PartBase {
-    ctor public FilePart(java.lang.String, com.android.internal.http.multipart.PartSource, java.lang.String, java.lang.String);
-    ctor public FilePart(java.lang.String, com.android.internal.http.multipart.PartSource);
-    ctor public FilePart(java.lang.String, java.io.File) throws java.io.FileNotFoundException;
-    ctor public FilePart(java.lang.String, java.io.File, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
-    ctor public FilePart(java.lang.String, java.lang.String, java.io.File) throws java.io.FileNotFoundException;
-    ctor public FilePart(java.lang.String, java.lang.String, java.io.File, java.lang.String, java.lang.String) throws java.io.FileNotFoundException;
+    ctor public FilePart(String, com.android.internal.http.multipart.PartSource, String, String);
+    ctor public FilePart(String, com.android.internal.http.multipart.PartSource);
+    ctor public FilePart(String, java.io.File) throws java.io.FileNotFoundException;
+    ctor public FilePart(String, java.io.File, String, String) throws java.io.FileNotFoundException;
+    ctor public FilePart(String, String, java.io.File) throws java.io.FileNotFoundException;
+    ctor public FilePart(String, String, java.io.File, String, String) throws java.io.FileNotFoundException;
     method protected com.android.internal.http.multipart.PartSource getSource();
     method protected long lengthOfData();
     method protected void sendData(java.io.OutputStream) throws java.io.IOException;
-    field public static final java.lang.String DEFAULT_CHARSET = "ISO-8859-1";
-    field public static final java.lang.String DEFAULT_CONTENT_TYPE = "application/octet-stream";
-    field public static final java.lang.String DEFAULT_TRANSFER_ENCODING = "binary";
-    field protected static final java.lang.String FILE_NAME = "; filename=";
+    field public static final String DEFAULT_CHARSET = "ISO-8859-1";
+    field public static final String DEFAULT_CONTENT_TYPE = "application/octet-stream";
+    field public static final String DEFAULT_TRANSFER_ENCODING = "binary";
+    field protected static final String FILE_NAME = "; filename=";
   }
 
   public class FilePartSource implements com.android.internal.http.multipart.PartSource {
     ctor public FilePartSource(java.io.File) throws java.io.FileNotFoundException;
-    ctor public FilePartSource(java.lang.String, java.io.File) throws java.io.FileNotFoundException;
+    ctor public FilePartSource(String, java.io.File) throws java.io.FileNotFoundException;
     method public java.io.InputStream createInputStream() throws java.io.IOException;
-    method public java.lang.String getFileName();
+    method public String getFileName();
     method public long getLength();
   }
 
@@ -354,24 +355,25 @@ package com.android.internal.http.multipart {
     ctor public MultipartEntity(com.android.internal.http.multipart.Part[]);
     method public java.io.InputStream getContent() throws java.io.IOException, java.lang.IllegalStateException;
     method public long getContentLength();
+    method public org.apache.http.Header getContentType();
     method protected byte[] getMultipartBoundary();
     method public boolean isRepeatable();
     method public boolean isStreaming();
     method public void writeTo(java.io.OutputStream) throws java.io.IOException;
-    field public static final java.lang.String MULTIPART_BOUNDARY = "http.method.multipart.boundary";
+    field public static final String MULTIPART_BOUNDARY = "http.method.multipart.boundary";
     field protected com.android.internal.http.multipart.Part[] parts;
   }
 
   public abstract class Part {
     ctor public Part();
-    method public static deprecated java.lang.String getBoundary();
-    method public abstract java.lang.String getCharSet();
-    method public abstract java.lang.String getContentType();
+    method @Deprecated public static String getBoundary();
+    method public abstract String getCharSet();
+    method public abstract String getContentType();
     method public static long getLengthOfParts(com.android.internal.http.multipart.Part[]) throws java.io.IOException;
     method public static long getLengthOfParts(com.android.internal.http.multipart.Part[], byte[]) throws java.io.IOException;
-    method public abstract java.lang.String getName();
+    method public abstract String getName();
     method protected byte[] getPartBoundary();
-    method public abstract java.lang.String getTransferEncoding();
+    method public abstract String getTransferEncoding();
     method public boolean isRepeatable();
     method public long length() throws java.io.IOException;
     method protected abstract long lengthOfData() throws java.io.IOException;
@@ -385,3866 +387,3855 @@ package com.android.internal.http.multipart {
     method public static void sendParts(java.io.OutputStream, com.android.internal.http.multipart.Part[], byte[]) throws java.io.IOException;
     method protected void sendStart(java.io.OutputStream) throws java.io.IOException;
     method protected void sendTransferEncodingHeader(java.io.OutputStream) throws java.io.IOException;
-    field protected static final deprecated java.lang.String BOUNDARY = "----------------314159265358979323846";
-    field protected static final deprecated byte[] BOUNDARY_BYTES;
-    field protected static final java.lang.String CHARSET = "; charset=";
+    field @Deprecated protected static final String BOUNDARY = "----------------314159265358979323846";
+    field @Deprecated protected static final byte[] BOUNDARY_BYTES;
+    field protected static final String CHARSET = "; charset=";
     field protected static final byte[] CHARSET_BYTES;
-    field protected static final java.lang.String CONTENT_DISPOSITION = "Content-Disposition: form-data; name=";
+    field protected static final String CONTENT_DISPOSITION = "Content-Disposition: form-data; name=";
     field protected static final byte[] CONTENT_DISPOSITION_BYTES;
-    field protected static final java.lang.String CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding: ";
+    field protected static final String CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding: ";
     field protected static final byte[] CONTENT_TRANSFER_ENCODING_BYTES;
-    field protected static final java.lang.String CONTENT_TYPE = "Content-Type: ";
+    field protected static final String CONTENT_TYPE = "Content-Type: ";
     field protected static final byte[] CONTENT_TYPE_BYTES;
-    field protected static final java.lang.String CRLF = "\r\n";
+    field protected static final String CRLF = "\r\n";
     field protected static final byte[] CRLF_BYTES;
-    field protected static final java.lang.String EXTRA = "--";
+    field protected static final String EXTRA = "--";
     field protected static final byte[] EXTRA_BYTES;
-    field protected static final java.lang.String QUOTE = "\"";
+    field protected static final String QUOTE = "\"";
     field protected static final byte[] QUOTE_BYTES;
   }
 
   public abstract class PartBase extends com.android.internal.http.multipart.Part {
-    ctor public PartBase(java.lang.String, java.lang.String, java.lang.String, java.lang.String);
-    method public java.lang.String getCharSet();
-    method public java.lang.String getContentType();
-    method public java.lang.String getName();
-    method public java.lang.String getTransferEncoding();
-    method public void setCharSet(java.lang.String);
-    method public void setContentType(java.lang.String);
-    method public void setName(java.lang.String);
-    method public void setTransferEncoding(java.lang.String);
-  }
-
-  public abstract interface PartSource {
-    method public abstract java.io.InputStream createInputStream() throws java.io.IOException;
-    method public abstract java.lang.String getFileName();
-    method public abstract long getLength();
+    ctor public PartBase(String, String, String, String);
+    method public String getCharSet();
+    method public String getContentType();
+    method public String getName();
+    method public String getTransferEncoding();
+    method public void setCharSet(String);
+    method public void setContentType(String);
+    method public void setName(String);
+    method public void setTransferEncoding(String);
+  }
+
+  public interface PartSource {
+    method public java.io.InputStream createInputStream() throws java.io.IOException;
+    method public String getFileName();
+    method public long getLength();
   }
 
   public class StringPart extends com.android.internal.http.multipart.PartBase {
-    ctor public StringPart(java.lang.String, java.lang.String, java.lang.String);
-    ctor public StringPart(java.lang.String, java.lang.String);
+    ctor public StringPart(String, String, String);
+    ctor public StringPart(String, String);
     method protected long lengthOfData();
     method protected void sendData(java.io.OutputStream) throws java.io.IOException;
-    field public static final java.lang.String DEFAULT_CHARSET = "US-ASCII";
-    field public static final java.lang.String DEFAULT_CONTENT_TYPE = "text/plain";
-    field public static final java.lang.String DEFAULT_TRANSFER_ENCODING = "8bit";
+    field public static final String DEFAULT_CHARSET = "US-ASCII";
+    field public static final String DEFAULT_CONTENT_TYPE = "text/plain";
+    field public static final String DEFAULT_TRANSFER_ENCODING = "8bit";
   }
 
 }
 
 package org.apache.commons.codec {
 
-  public abstract deprecated interface BinaryDecoder implements org.apache.commons.codec.Decoder {
-    method public abstract byte[] decode(byte[]) throws org.apache.commons.codec.DecoderException;
+  @Deprecated public interface BinaryDecoder extends org.apache.commons.codec.Decoder {
+    method @Deprecated public byte[] decode(byte[]) throws org.apache.commons.codec.DecoderException;
   }
 
-  public abstract deprecated interface BinaryEncoder implements org.apache.commons.codec.Encoder {
-    method public abstract byte[] encode(byte[]) throws org.apache.commons.codec.EncoderException;
+  @Deprecated public interface BinaryEncoder extends org.apache.commons.codec.Encoder {
+    method @Deprecated public byte[] encode(byte[]) throws org.apache.commons.codec.EncoderException;
   }
 
-  public abstract deprecated interface Decoder {
-    method public abstract java.lang.Object decode(java.lang.Object) throws org.apache.commons.codec.DecoderException;
+  @Deprecated public interface Decoder {
+    method @Deprecated public Object decode(Object) throws org.apache.commons.codec.DecoderException;
   }
 
-  public deprecated class DecoderException extends java.lang.Exception {
-    ctor public DecoderException(java.lang.String);
+  @Deprecated public class DecoderException extends java.lang.Exception {
+    ctor @Deprecated public DecoderException(String);
   }
 
-  public abstract deprecated interface Encoder {
-    method public abstract java.lang.Object encode(java.lang.Object) throws org.apache.commons.codec.EncoderException;
+  @Deprecated public interface Encoder {
+    method @Deprecated public Object encode(Object) throws org.apache.commons.codec.EncoderException;
   }
 
-  public deprecated class EncoderException extends java.lang.Exception {
-    ctor public EncoderException(java.lang.String);
+  @Deprecated public class EncoderException extends java.lang.Exception {
+    ctor @Deprecated public EncoderException(String);
   }
 
-  public abstract deprecated interface StringDecoder implements org.apache.commons.codec.Decoder {
-    method public abstract java.lang.String decode(java.lang.String) throws org.apache.commons.codec.DecoderException;
+  @Deprecated public interface StringDecoder extends org.apache.commons.codec.Decoder {
+    method @Deprecated public String decode(String) throws org.apache.commons.codec.DecoderException;
   }
 
-  public abstract deprecated interface StringEncoder implements org.apache.commons.codec.Encoder {
-    method public abstract java.lang.String encode(java.lang.String) throws org.apache.commons.codec.EncoderException;
+  @Deprecated public interface StringEncoder extends org.apache.commons.codec.Encoder {
+    method @Deprecated public String encode(String) throws org.apache.commons.codec.EncoderException;
   }
 
-  public deprecated class StringEncoderComparator implements java.util.Comparator {
-    ctor public StringEncoderComparator();
-    ctor public StringEncoderComparator(org.apache.commons.codec.StringEncoder);
-    method public int compare(java.lang.Object, java.lang.Object);
+  @Deprecated public class StringEncoderComparator implements java.util.Comparator {
+    ctor @Deprecated public StringEncoderComparator();
+    ctor @Deprecated public StringEncoderComparator(org.apache.commons.codec.StringEncoder);
+    method @Deprecated public int compare(Object, Object);
   }
 
 }
 
 package org.apache.commons.codec.binary {
 
-  public deprecated class Base64 implements org.apache.commons.codec.BinaryDecoder org.apache.commons.codec.BinaryEncoder {
-    ctor public Base64();
-    method public java.lang.Object decode(java.lang.Object) throws org.apache.commons.codec.DecoderException;
-    method public byte[] decode(byte[]);
-    method public static byte[] decodeBase64(byte[]);
-    method public java.lang.Object encode(java.lang.Object) throws org.apache.commons.codec.EncoderException;
-    method public byte[] encode(byte[]);
-    method public static byte[] encodeBase64(byte[]);
-    method public static byte[] encodeBase64(byte[], boolean);
-    method public static byte[] encodeBase64Chunked(byte[]);
-    method public static boolean isArrayByteBase64(byte[]);
-  }
-
-  public deprecated class BinaryCodec implements org.apache.commons.codec.BinaryDecoder org.apache.commons.codec.BinaryEncoder {
-    ctor public BinaryCodec();
-    method public java.lang.Object decode(java.lang.Object) throws org.apache.commons.codec.DecoderException;
-    method public byte[] decode(byte[]);
-    method public byte[] encode(byte[]);
-    method public java.lang.Object encode(java.lang.Object) throws org.apache.commons.codec.EncoderException;
-    method public static byte[] fromAscii(char[]);
-    method public static byte[] fromAscii(byte[]);
-    method public static byte[] toAsciiBytes(byte[]);
-    method public static char[] toAsciiChars(byte[]);
-    method public static java.lang.String toAsciiString(byte[]);
-    method public byte[] toByteArray(java.lang.String);
-  }
-
-  public deprecated class Hex implements org.apache.commons.codec.BinaryDecoder org.apache.commons.codec.BinaryEncoder {
-    ctor public Hex();
-    method public byte[] decode(byte[]) throws org.apache.commons.codec.DecoderException;
-    method public java.lang.Object decode(java.lang.Object) throws org.apache.commons.codec.DecoderException;
-    method public static byte[] decodeHex(char[]) throws org.apache.commons.codec.DecoderException;
-    method public byte[] encode(byte[]);
-    method public java.lang.Object encode(java.lang.Object) throws org.apache.commons.codec.EncoderException;
-    method public static char[] encodeHex(byte[]);
-    method protected static int toDigit(char, int) throws org.apache.commons.codec.DecoderException;
+  @Deprecated public class Base64 implements org.apache.commons.codec.BinaryDecoder org.apache.commons.codec.BinaryEncoder {
+    ctor @Deprecated public Base64();
+    method @Deprecated public Object decode(Object) throws org.apache.commons.codec.DecoderException;
+    method @Deprecated public byte[] decode(byte[]);
+    method @Deprecated public static byte[] decodeBase64(byte[]);
+    method @Deprecated public Object encode(Object) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public byte[] encode(byte[]);
+    method @Deprecated public static byte[] encodeBase64(byte[]);
+    method @Deprecated public static byte[] encodeBase64(byte[], boolean);
+    method @Deprecated public static byte[] encodeBase64Chunked(byte[]);
+    method @Deprecated public static boolean isArrayByteBase64(byte[]);
+  }
+
+  @Deprecated public class BinaryCodec implements org.apache.commons.codec.BinaryDecoder org.apache.commons.codec.BinaryEncoder {
+    ctor @Deprecated public BinaryCodec();
+    method @Deprecated public Object decode(Object) throws org.apache.commons.codec.DecoderException;
+    method @Deprecated public byte[] decode(byte[]);
+    method @Deprecated public byte[] encode(byte[]);
+    method @Deprecated public Object encode(Object) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public static byte[] fromAscii(char[]);
+    method @Deprecated public static byte[] fromAscii(byte[]);
+    method @Deprecated public static byte[] toAsciiBytes(byte[]);
+    method @Deprecated public static char[] toAsciiChars(byte[]);
+    method @Deprecated public static String toAsciiString(byte[]);
+    method @Deprecated public byte[] toByteArray(String);
+  }
+
+  @Deprecated public class Hex implements org.apache.commons.codec.BinaryDecoder org.apache.commons.codec.BinaryEncoder {
+    ctor @Deprecated public Hex();
+    method @Deprecated public byte[] decode(byte[]) throws org.apache.commons.codec.DecoderException;
+    method @Deprecated public Object decode(Object) throws org.apache.commons.codec.DecoderException;
+    method @Deprecated public static byte[] decodeHex(char[]) throws org.apache.commons.codec.DecoderException;
+    method @Deprecated public byte[] encode(byte[]);
+    method @Deprecated public Object encode(Object) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public static char[] encodeHex(byte[]);
+    method @Deprecated protected static int toDigit(char, int) throws org.apache.commons.codec.DecoderException;
   }
 
 }
 
 package org.apache.commons.codec.language {
 
-  public deprecated class DoubleMetaphone implements org.apache.commons.codec.StringEncoder {
-    ctor public DoubleMetaphone();
-    method protected char charAt(java.lang.String, int);
-    method protected static boolean contains(java.lang.String, int, int, java.lang.String[]);
-    method public java.lang.String doubleMetaphone(java.lang.String);
-    method public java.lang.String doubleMetaphone(java.lang.String, boolean);
-    method public java.lang.Object encode(java.lang.Object) throws org.apache.commons.codec.EncoderException;
-    method public java.lang.String encode(java.lang.String);
-    method public int getMaxCodeLen();
-    method public boolean isDoubleMetaphoneEqual(java.lang.String, java.lang.String);
-    method public boolean isDoubleMetaphoneEqual(java.lang.String, java.lang.String, boolean);
-    method public void setMaxCodeLen(int);
-    field protected int maxCodeLen;
-  }
-
-  public class DoubleMetaphone.DoubleMetaphoneResult {
-    ctor public DoubleMetaphone.DoubleMetaphoneResult(int);
-    method public void append(char);
-    method public void append(char, char);
-    method public void append(java.lang.String);
-    method public void append(java.lang.String, java.lang.String);
-    method public void appendAlternate(char);
-    method public void appendAlternate(java.lang.String);
-    method public void appendPrimary(char);
-    method public void appendPrimary(java.lang.String);
-    method public java.lang.String getAlternate();
-    method public java.lang.String getPrimary();
-    method public boolean isComplete();
-  }
-
-  public deprecated class Metaphone implements org.apache.commons.codec.StringEncoder {
-    ctor public Metaphone();
-    method public java.lang.Object encode(java.lang.Object) throws org.apache.commons.codec.EncoderException;
-    method public java.lang.String encode(java.lang.String);
-    method public int getMaxCodeLen();
-    method public boolean isMetaphoneEqual(java.lang.String, java.lang.String);
-    method public java.lang.String metaphone(java.lang.String);
-    method public void setMaxCodeLen(int);
-  }
-
-  public deprecated class RefinedSoundex implements org.apache.commons.codec.StringEncoder {
-    ctor public RefinedSoundex();
-    ctor public RefinedSoundex(char[]);
-    method public int difference(java.lang.String, java.lang.String) throws org.apache.commons.codec.EncoderException;
-    method public java.lang.Object encode(java.lang.Object) throws org.apache.commons.codec.EncoderException;
-    method public java.lang.String encode(java.lang.String);
-    method public java.lang.String soundex(java.lang.String);
-    field public static final org.apache.commons.codec.language.RefinedSoundex US_ENGLISH;
-    field public static final char[] US_ENGLISH_MAPPING;
-  }
-
-  public deprecated class Soundex implements org.apache.commons.codec.StringEncoder {
-    ctor public Soundex();
-    ctor public Soundex(char[]);
-    method public int difference(java.lang.String, java.lang.String) throws org.apache.commons.codec.EncoderException;
-    method public java.lang.Object encode(java.lang.Object) throws org.apache.commons.codec.EncoderException;
-    method public java.lang.String encode(java.lang.String);
-    method public deprecated int getMaxLength();
-    method public deprecated void setMaxLength(int);
-    method public java.lang.String soundex(java.lang.String);
-    field public static final org.apache.commons.codec.language.Soundex US_ENGLISH;
-    field public static final char[] US_ENGLISH_MAPPING;
-    field public static final java.lang.String US_ENGLISH_MAPPING_STRING = "01230120022455012623010202";
+  @Deprecated public class DoubleMetaphone implements org.apache.commons.codec.StringEncoder {
+    ctor @Deprecated public DoubleMetaphone();
+    method @Deprecated protected char charAt(String, int);
+    method @Deprecated protected static boolean contains(String, int, int, String[]);
+    method @Deprecated public String doubleMetaphone(String);
+    method @Deprecated public String doubleMetaphone(String, boolean);
+    method @Deprecated public Object encode(Object) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public String encode(String);
+    method @Deprecated public int getMaxCodeLen();
+    method @Deprecated public boolean isDoubleMetaphoneEqual(String, String);
+    method @Deprecated public boolean isDoubleMetaphoneEqual(String, String, boolean);
+    method @Deprecated public void setMaxCodeLen(int);
+    field @Deprecated protected int maxCodeLen;
+  }
+
+  @Deprecated public class DoubleMetaphone.DoubleMetaphoneResult {
+    ctor @Deprecated public DoubleMetaphone.DoubleMetaphoneResult(int);
+    method @Deprecated public void append(char);
+    method @Deprecated public void append(char, char);
+    method @Deprecated public void append(String);
+    method @Deprecated public void append(String, String);
+    method @Deprecated public void appendAlternate(char);
+    method @Deprecated public void appendAlternate(String);
+    method @Deprecated public void appendPrimary(char);
+    method @Deprecated public void appendPrimary(String);
+    method @Deprecated public String getAlternate();
+    method @Deprecated public String getPrimary();
+    method @Deprecated public boolean isComplete();
+  }
+
+  @Deprecated public class Metaphone implements org.apache.commons.codec.StringEncoder {
+    ctor @Deprecated public Metaphone();
+    method @Deprecated public Object encode(Object) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public String encode(String);
+    method @Deprecated public int getMaxCodeLen();
+    method @Deprecated public boolean isMetaphoneEqual(String, String);
+    method @Deprecated public String metaphone(String);
+    method @Deprecated public void setMaxCodeLen(int);
+  }
+
+  @Deprecated public class RefinedSoundex implements org.apache.commons.codec.StringEncoder {
+    ctor @Deprecated public RefinedSoundex();
+    ctor @Deprecated public RefinedSoundex(char[]);
+    method @Deprecated public int difference(String, String) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public Object encode(Object) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public String encode(String);
+    method @Deprecated public String soundex(String);
+    field @Deprecated public static final org.apache.commons.codec.language.RefinedSoundex US_ENGLISH;
+    field @Deprecated public static final char[] US_ENGLISH_MAPPING;
+  }
+
+  @Deprecated public class Soundex implements org.apache.commons.codec.StringEncoder {
+    ctor @Deprecated public Soundex();
+    ctor @Deprecated public Soundex(char[]);
+    method @Deprecated public int difference(String, String) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public Object encode(Object) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public String encode(String);
+    method @Deprecated public int getMaxLength();
+    method @Deprecated public void setMaxLength(int);
+    method @Deprecated public String soundex(String);
+    field @Deprecated public static final org.apache.commons.codec.language.Soundex US_ENGLISH;
+    field @Deprecated public static final char[] US_ENGLISH_MAPPING;
+    field @Deprecated public static final String US_ENGLISH_MAPPING_STRING = "01230120022455012623010202";
   }
 
 }
 
 package org.apache.commons.codec.net {
 
-  public deprecated class BCodec implements org.apache.commons.codec.StringDecoder org.apache.commons.codec.StringEncoder {
-    ctor public BCodec();
-    ctor public BCodec(java.lang.String);
-    method public java.lang.String decode(java.lang.String) throws org.apache.commons.codec.DecoderException;
-    method public java.lang.Object decode(java.lang.Object) throws org.apache.commons.codec.DecoderException;
-    method protected byte[] doDecoding(byte[]) throws org.apache.commons.codec.DecoderException;
-    method protected byte[] doEncoding(byte[]) throws org.apache.commons.codec.EncoderException;
-    method public java.lang.String encode(java.lang.String, java.lang.String) throws org.apache.commons.codec.EncoderException;
-    method public java.lang.String encode(java.lang.String) throws org.apache.commons.codec.EncoderException;
-    method public java.lang.Object encode(java.lang.Object) throws org.apache.commons.codec.EncoderException;
-    method public java.lang.String getDefaultCharset();
-    method protected java.lang.String getEncoding();
-  }
-
-  public deprecated class QCodec implements org.apache.commons.codec.StringDecoder org.apache.commons.codec.StringEncoder {
-    ctor public QCodec();
-    ctor public QCodec(java.lang.String);
-    method public java.lang.String decode(java.lang.String) throws org.apache.commons.codec.DecoderException;
-    method public java.lang.Object decode(java.lang.Object) throws org.apache.commons.codec.DecoderException;
-    method protected byte[] doDecoding(byte[]) throws org.apache.commons.codec.DecoderException;
-    method protected byte[] doEncoding(byte[]) throws org.apache.commons.codec.EncoderException;
-    method public java.lang.String encode(java.lang.String, java.lang.String) throws org.apache.commons.codec.EncoderException;
-    method public java.lang.String encode(java.lang.String) throws org.apache.commons.codec.EncoderException;
-    method public java.lang.Object encode(java.lang.Object) throws org.apache.commons.codec.EncoderException;
-    method public java.lang.String getDefaultCharset();
-    method protected java.lang.String getEncoding();
-    method public boolean isEncodeBlanks();
-    method public void setEncodeBlanks(boolean);
-  }
-
-  public deprecated class QuotedPrintableCodec implements org.apache.commons.codec.BinaryDecoder org.apache.commons.codec.BinaryEncoder org.apache.commons.codec.StringDecoder org.apache.commons.codec.StringEncoder {
-    ctor public QuotedPrintableCodec();
-    ctor public QuotedPrintableCodec(java.lang.String);
-    method public byte[] decode(byte[]) throws org.apache.commons.codec.DecoderException;
-    method public java.lang.String decode(java.lang.String, java.lang.String) throws org.apache.commons.codec.DecoderException, java.io.UnsupportedEncodingException;
-    method public java.lang.String decode(java.lang.String) throws org.apache.commons.codec.DecoderException;
-    method public java.lang.Object decode(java.lang.Object) throws org.apache.commons.codec.DecoderException;
-    method public static final byte[] decodeQuotedPrintable(byte[]) throws org.apache.commons.codec.DecoderException;
-    method public byte[] encode(byte[]);
-    method public java.lang.String encode(java.lang.String) throws org.apache.commons.codec.EncoderException;
-    method public java.lang.Object encode(java.lang.Object) throws org.apache.commons.codec.EncoderException;
-    method public java.lang.String encode(java.lang.String, java.lang.String) throws java.io.UnsupportedEncodingException;
-    method public static final byte[] encodeQuotedPrintable(java.util.BitSet, byte[]);
-    method public java.lang.String getDefaultCharset();
-  }
-
-  public deprecated class URLCodec implements org.apache.commons.codec.BinaryDecoder org.apache.commons.codec.BinaryEncoder org.apache.commons.codec.StringDecoder org.apache.commons.codec.StringEncoder {
-    ctor public URLCodec();
-    ctor public URLCodec(java.lang.String);
-    method public byte[] decode(byte[]) throws org.apache.commons.codec.DecoderException;
-    method public java.lang.String decode(java.lang.String, java.lang.String) throws org.apache.commons.codec.DecoderException, java.io.UnsupportedEncodingException;
-    method public java.lang.String decode(java.lang.String) throws org.apache.commons.codec.DecoderException;
-    method public java.lang.Object decode(java.lang.Object) throws org.apache.commons.codec.DecoderException;
-    method public static final byte[] decodeUrl(byte[]) throws org.apache.commons.codec.DecoderException;
-    method public byte[] encode(byte[]);
-    method public java.lang.String encode(java.lang.String, java.lang.String) throws java.io.UnsupportedEncodingException;
-    method public java.lang.String encode(java.lang.String) throws org.apache.commons.codec.EncoderException;
-    method public java.lang.Object encode(java.lang.Object) throws org.apache.commons.codec.EncoderException;
-    method public static final byte[] encodeUrl(java.util.BitSet, byte[]);
-    method public java.lang.String getDefaultCharset();
-    method public deprecated java.lang.String getEncoding();
-    field protected static byte ESCAPE_CHAR;
-    field protected static final java.util.BitSet WWW_FORM_URL;
-    field protected java.lang.String charset;
+  @Deprecated public class BCodec implements org.apache.commons.codec.StringDecoder org.apache.commons.codec.StringEncoder {
+    ctor @Deprecated public BCodec();
+    ctor @Deprecated public BCodec(String);
+    method @Deprecated public String decode(String) throws org.apache.commons.codec.DecoderException;
+    method @Deprecated public Object decode(Object) throws org.apache.commons.codec.DecoderException;
+    method @Deprecated protected byte[] doDecoding(byte[]) throws org.apache.commons.codec.DecoderException;
+    method @Deprecated protected byte[] doEncoding(byte[]) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public String encode(String, String) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public String encode(String) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public Object encode(Object) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public String getDefaultCharset();
+    method @Deprecated protected String getEncoding();
+  }
+
+  @Deprecated public class QCodec implements org.apache.commons.codec.StringDecoder org.apache.commons.codec.StringEncoder {
+    ctor @Deprecated public QCodec();
+    ctor @Deprecated public QCodec(String);
+    method @Deprecated public String decode(String) throws org.apache.commons.codec.DecoderException;
+    method @Deprecated public Object decode(Object) throws org.apache.commons.codec.DecoderException;
+    method @Deprecated protected byte[] doDecoding(byte[]) throws org.apache.commons.codec.DecoderException;
+    method @Deprecated protected byte[] doEncoding(byte[]) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public String encode(String, String) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public String encode(String) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public Object encode(Object) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public String getDefaultCharset();
+    method @Deprecated protected String getEncoding();
+    method @Deprecated public boolean isEncodeBlanks();
+    method @Deprecated public void setEncodeBlanks(boolean);
+  }
+
+  @Deprecated public class QuotedPrintableCodec implements org.apache.commons.codec.BinaryDecoder org.apache.commons.codec.BinaryEncoder org.apache.commons.codec.StringDecoder org.apache.commons.codec.StringEncoder {
+    ctor @Deprecated public QuotedPrintableCodec();
+    ctor @Deprecated public QuotedPrintableCodec(String);
+    method @Deprecated public byte[] decode(byte[]) throws org.apache.commons.codec.DecoderException;
+    method @Deprecated public String decode(String, String) throws org.apache.commons.codec.DecoderException, java.io.UnsupportedEncodingException;
+    method @Deprecated public String decode(String) throws org.apache.commons.codec.DecoderException;
+    method @Deprecated public Object decode(Object) throws org.apache.commons.codec.DecoderException;
+    method @Deprecated public static final byte[] decodeQuotedPrintable(byte[]) throws org.apache.commons.codec.DecoderException;
+    method @Deprecated public byte[] encode(byte[]);
+    method @Deprecated public String encode(String) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public Object encode(Object) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public String encode(String, String) throws java.io.UnsupportedEncodingException;
+    method @Deprecated public static final byte[] encodeQuotedPrintable(java.util.BitSet, byte[]);
+    method @Deprecated public String getDefaultCharset();
+  }
+
+  @Deprecated public class URLCodec implements org.apache.commons.codec.BinaryDecoder org.apache.commons.codec.BinaryEncoder org.apache.commons.codec.StringDecoder org.apache.commons.codec.StringEncoder {
+    ctor @Deprecated public URLCodec();
+    ctor @Deprecated public URLCodec(String);
+    method @Deprecated public byte[] decode(byte[]) throws org.apache.commons.codec.DecoderException;
+    method @Deprecated public String decode(String, String) throws org.apache.commons.codec.DecoderException, java.io.UnsupportedEncodingException;
+    method @Deprecated public String decode(String) throws org.apache.commons.codec.DecoderException;
+    method @Deprecated public Object decode(Object) throws org.apache.commons.codec.DecoderException;
+    method @Deprecated public static final byte[] decodeUrl(byte[]) throws org.apache.commons.codec.DecoderException;
+    method @Deprecated public byte[] encode(byte[]);
+    method @Deprecated public String encode(String, String) throws java.io.UnsupportedEncodingException;
+    method @Deprecated public String encode(String) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public Object encode(Object) throws org.apache.commons.codec.EncoderException;
+    method @Deprecated public static final byte[] encodeUrl(java.util.BitSet, byte[]);
+    method @Deprecated public String getDefaultCharset();
+    method @Deprecated public String getEncoding();
+    field @Deprecated protected static byte ESCAPE_CHAR;
+    field @Deprecated protected static final java.util.BitSet WWW_FORM_URL;
+    field @Deprecated protected String charset;
   }
 
 }
 
 package org.apache.commons.logging {
 
-  public abstract deprecated interface Log {
-    method public abstract void debug(java.lang.Object);
-    method public abstract void debug(java.lang.Object, java.lang.Throwable);
-    method public abstract void error(java.lang.Object);
-    method public abstract void error(java.lang.Object, java.lang.Throwable);
-    method public abstract void fatal(java.lang.Object);
-    method public abstract void fatal(java.lang.Object, java.lang.Throwable);
-    method public abstract void info(java.lang.Object);
-    method public abstract void info(java.lang.Object, java.lang.Throwable);
-    method public abstract boolean isDebugEnabled();
-    method public abstract boolean isErrorEnabled();
-    method public abstract boolean isFatalEnabled();
-    method public abstract boolean isInfoEnabled();
-    method public abstract boolean isTraceEnabled();
-    method public abstract boolean isWarnEnabled();
-    method public abstract void trace(java.lang.Object);
-    method public abstract void trace(java.lang.Object, java.lang.Throwable);
-    method public abstract void warn(java.lang.Object);
-    method public abstract void warn(java.lang.Object, java.lang.Throwable);
-  }
-
-  public deprecated class LogConfigurationException extends java.lang.RuntimeException {
-    ctor public LogConfigurationException();
-    ctor public LogConfigurationException(java.lang.String);
-    ctor public LogConfigurationException(java.lang.Throwable);
-    ctor public LogConfigurationException(java.lang.String, java.lang.Throwable);
-    method public java.lang.Throwable getCause();
-    field protected java.lang.Throwable cause;
-  }
-
-  public abstract deprecated class LogFactory {
-    ctor protected LogFactory();
-    method protected static java.lang.Object createFactory(java.lang.String, java.lang.ClassLoader);
-    method protected static java.lang.ClassLoader directGetContextClassLoader() throws org.apache.commons.logging.LogConfigurationException;
-    method public abstract java.lang.Object getAttribute(java.lang.String);
-    method public abstract java.lang.String[] getAttributeNames();
-    method protected static java.lang.ClassLoader getClassLoader(java.lang.Class);
-    method protected static java.lang.ClassLoader getContextClassLoader() throws org.apache.commons.logging.LogConfigurationException;
-    method public static org.apache.commons.logging.LogFactory getFactory() throws org.apache.commons.logging.LogConfigurationException;
-    method public abstract org.apache.commons.logging.Log getInstance(java.lang.Class) throws org.apache.commons.logging.LogConfigurationException;
-    method public abstract org.apache.commons.logging.Log getInstance(java.lang.String) throws org.apache.commons.logging.LogConfigurationException;
-    method public static org.apache.commons.logging.Log getLog(java.lang.Class) throws org.apache.commons.logging.LogConfigurationException;
-    method public static org.apache.commons.logging.Log getLog(java.lang.String) throws org.apache.commons.logging.LogConfigurationException;
-    method protected static boolean isDiagnosticsEnabled();
-    method protected static final void logRawDiagnostic(java.lang.String);
-    method protected static org.apache.commons.logging.LogFactory newFactory(java.lang.String, java.lang.ClassLoader, java.lang.ClassLoader) throws org.apache.commons.logging.LogConfigurationException;
-    method protected static org.apache.commons.logging.LogFactory newFactory(java.lang.String, java.lang.ClassLoader);
-    method public static java.lang.String objectId(java.lang.Object);
-    method public abstract void release();
-    method public static void release(java.lang.ClassLoader);
-    method public static void releaseAll();
-    method public abstract void removeAttribute(java.lang.String);
-    method public abstract void setAttribute(java.lang.String, java.lang.Object);
-    field public static final java.lang.String DIAGNOSTICS_DEST_PROPERTY = "org.apache.commons.logging.diagnostics.dest";
-    field public static final java.lang.String FACTORY_DEFAULT = "org.apache.commons.logging.impl.LogFactoryImpl";
-    field public static final java.lang.String FACTORY_PROPERTIES = "commons-logging.properties";
-    field public static final java.lang.String FACTORY_PROPERTY = "org.apache.commons.logging.LogFactory";
-    field public static final java.lang.String HASHTABLE_IMPLEMENTATION_PROPERTY = "org.apache.commons.logging.LogFactory.HashtableImpl";
-    field public static final java.lang.String PRIORITY_KEY = "priority";
-    field protected static final java.lang.String SERVICE_ID = "META-INF/services/org.apache.commons.logging.LogFactory";
-    field public static final java.lang.String TCCL_KEY = "use_tccl";
-    field protected static java.util.Hashtable factories;
-    field protected static org.apache.commons.logging.LogFactory nullClassLoaderFactory;
-  }
-
-  public deprecated class LogSource {
-    method public static org.apache.commons.logging.Log getInstance(java.lang.String);
-    method public static org.apache.commons.logging.Log getInstance(java.lang.Class);
-    method public static java.lang.String[] getLogNames();
-    method public static org.apache.commons.logging.Log makeNewLogInstance(java.lang.String);
-    method public static void setLogImplementation(java.lang.String) throws java.lang.ClassNotFoundException, java.lang.ExceptionInInitializerError, java.lang.LinkageError, java.lang.NoSuchMethodException, java.lang.SecurityException;
-    method public static void setLogImplementation(java.lang.Class) throws java.lang.ExceptionInInitializerError, java.lang.LinkageError, java.lang.NoSuchMethodException, java.lang.SecurityException;
-    field protected static boolean jdk14IsAvailable;
-    field protected static boolean log4jIsAvailable;
-    field protected static java.lang.reflect.Constructor logImplctor;
-    field protected static java.util.Hashtable logs;
+  @Deprecated public interface Log {
+    method @Deprecated public void debug(Object);
+    method @Deprecated public void debug(Object, Throwable);
+    method @Deprecated public void error(Object);
+    method @Deprecated public void error(Object, Throwable);
+    method @Deprecated public void fatal(Object);
+    method @Deprecated public void fatal(Object, Throwable);
+    method @Deprecated public void info(Object);
+    method @Deprecated public void info(Object, Throwable);
+    method @Deprecated public boolean isDebugEnabled();
+    method @Deprecated public boolean isErrorEnabled();
+    method @Deprecated public boolean isFatalEnabled();
+    method @Deprecated public boolean isInfoEnabled();
+    method @Deprecated public boolean isTraceEnabled();
+    method @Deprecated public boolean isWarnEnabled();
+    method @Deprecated public void trace(Object);
+    method @Deprecated public void trace(Object, Throwable);
+    method @Deprecated public void warn(Object);
+    method @Deprecated public void warn(Object, Throwable);
+  }
+
+  @Deprecated public class LogConfigurationException extends java.lang.RuntimeException {
+    ctor @Deprecated public LogConfigurationException();
+    ctor @Deprecated public LogConfigurationException(String);
+    ctor @Deprecated public LogConfigurationException(Throwable);
+    ctor @Deprecated public LogConfigurationException(String, Throwable);
+    field @Deprecated protected Throwable cause;
+  }
+
+  @Deprecated public abstract class LogFactory {
+    ctor @Deprecated protected LogFactory();
+    method @Deprecated protected static Object createFactory(String, ClassLoader);
+    method @Deprecated protected static ClassLoader directGetContextClassLoader() throws org.apache.commons.logging.LogConfigurationException;
+    method @Deprecated public abstract Object getAttribute(String);
+    method @Deprecated public abstract String[] getAttributeNames();
+    method @Deprecated protected static ClassLoader getClassLoader(Class);
+    method @Deprecated protected static ClassLoader getContextClassLoader() throws org.apache.commons.logging.LogConfigurationException;
+    method @Deprecated public static org.apache.commons.logging.LogFactory getFactory() throws org.apache.commons.logging.LogConfigurationException;
+    method @Deprecated public abstract org.apache.commons.logging.Log getInstance(Class) throws org.apache.commons.logging.LogConfigurationException;
+    method @Deprecated public abstract org.apache.commons.logging.Log getInstance(String) throws org.apache.commons.logging.LogConfigurationException;
+    method @Deprecated public static org.apache.commons.logging.Log getLog(Class) throws org.apache.commons.logging.LogConfigurationException;
+    method @Deprecated public static org.apache.commons.logging.Log getLog(String) throws org.apache.commons.logging.LogConfigurationException;
+    method @Deprecated protected static boolean isDiagnosticsEnabled();
+    method @Deprecated protected static final void logRawDiagnostic(String);
+    method @Deprecated protected static org.apache.commons.logging.LogFactory newFactory(String, ClassLoader, ClassLoader) throws org.apache.commons.logging.LogConfigurationException;
+    method @Deprecated protected static org.apache.commons.logging.LogFactory newFactory(String, ClassLoader);
+    method @Deprecated public static String objectId(Object);
+    method @Deprecated public abstract void release();
+    method @Deprecated public static void release(ClassLoader);
+    method @Deprecated public static void releaseAll();
+    method @Deprecated public abstract void removeAttribute(String);
+    method @Deprecated public abstract void setAttribute(String, Object);
+    field @Deprecated public static final String DIAGNOSTICS_DEST_PROPERTY = "org.apache.commons.logging.diagnostics.dest";
+    field @Deprecated public static final String FACTORY_DEFAULT = "org.apache.commons.logging.impl.LogFactoryImpl";
+    field @Deprecated public static final String FACTORY_PROPERTIES = "commons-logging.properties";
+    field @Deprecated public static final String FACTORY_PROPERTY = "org.apache.commons.logging.LogFactory";
+    field @Deprecated public static final String HASHTABLE_IMPLEMENTATION_PROPERTY = "org.apache.commons.logging.LogFactory.HashtableImpl";
+    field @Deprecated public static final String PRIORITY_KEY = "priority";
+    field @Deprecated protected static final String SERVICE_ID = "META-INF/services/org.apache.commons.logging.LogFactory";
+    field @Deprecated public static final String TCCL_KEY = "use_tccl";
+    field @Deprecated protected static java.util.Hashtable factories;
+    field @Deprecated protected static org.apache.commons.logging.LogFactory nullClassLoaderFactory;
+  }
+
+  @Deprecated public class LogSource {
+    method @Deprecated public static org.apache.commons.logging.Log getInstance(String);
+    method @Deprecated public static org.apache.commons.logging.Log getInstance(Class);
+    method @Deprecated public static String[] getLogNames();
+    method @Deprecated public static org.apache.commons.logging.Log makeNewLogInstance(String);
+    method @Deprecated public static void setLogImplementation(String) throws java.lang.ClassNotFoundException, java.lang.ExceptionInInitializerError, java.lang.LinkageError, java.lang.NoSuchMethodException, java.lang.SecurityException;
+    method @Deprecated public static void setLogImplementation(Class) throws java.lang.ExceptionInInitializerError, java.lang.LinkageError, java.lang.NoSuchMethodException, java.lang.SecurityException;
+    field @Deprecated protected static boolean jdk14IsAvailable;
+    field @Deprecated protected static boolean log4jIsAvailable;
+    field @Deprecated protected static java.lang.reflect.Constructor logImplctor;
+    field @Deprecated protected static java.util.Hashtable logs;
   }
 
 }
 
 package org.apache.commons.logging.impl {
 
-  public deprecated class Jdk14Logger implements org.apache.commons.logging.Log java.io.Serializable {
-    ctor public Jdk14Logger(java.lang.String);
-    method public void debug(java.lang.Object);
-    method public void debug(java.lang.Object, java.lang.Throwable);
-    method public void error(java.lang.Object);
-    method public void error(java.lang.Object, java.lang.Throwable);
-    method public void fatal(java.lang.Object);
-    method public void fatal(java.lang.Object, java.lang.Throwable);
-    method public java.util.logging.Logger getLogger();
-    method public void info(java.lang.Object);
-    method public void info(java.lang.Object, java.lang.Throwable);
-    method public boolean isDebugEnabled();
-    method public boolean isErrorEnabled();
-    method public boolean isFatalEnabled();
-    method public boolean isInfoEnabled();
-    method public boolean isTraceEnabled();
-    method public boolean isWarnEnabled();
-    method public void trace(java.lang.Object);
-    method public void trace(java.lang.Object, java.lang.Throwable);
-    method public void warn(java.lang.Object);
-    method public void warn(java.lang.Object, java.lang.Throwable);
-    field protected static final java.util.logging.Level dummyLevel;
-    field protected transient java.util.logging.Logger logger;
-    field protected java.lang.String name;
-  }
-
-  public deprecated class LogFactoryImpl extends org.apache.commons.logging.LogFactory {
-    ctor public LogFactoryImpl();
-    method public java.lang.Object getAttribute(java.lang.String);
-    method public java.lang.String[] getAttributeNames();
-    method protected static java.lang.ClassLoader getClassLoader(java.lang.Class);
-    method protected static java.lang.ClassLoader getContextClassLoader() throws org.apache.commons.logging.LogConfigurationException;
-    method public org.apache.commons.logging.Log getInstance(java.lang.Class) throws org.apache.commons.logging.LogConfigurationException;
-    method public org.apache.commons.logging.Log getInstance(java.lang.String) throws org.apache.commons.logging.LogConfigurationException;
-    method protected deprecated java.lang.String getLogClassName();
-    method protected deprecated java.lang.reflect.Constructor getLogConstructor() throws org.apache.commons.logging.LogConfigurationException;
-    method protected static boolean isDiagnosticsEnabled();
-    method protected deprecated boolean isJdk13LumberjackAvailable();
-    method protected deprecated boolean isJdk14Available();
-    method protected deprecated boolean isLog4JAvailable();
-    method protected void logDiagnostic(java.lang.String);
-    method protected org.apache.commons.logging.Log newInstance(java.lang.String) throws org.apache.commons.logging.LogConfigurationException;
-    method public void release();
-    method public void removeAttribute(java.lang.String);
-    method public void setAttribute(java.lang.String, java.lang.Object);
-    field public static final java.lang.String ALLOW_FLAWED_CONTEXT_PROPERTY = "org.apache.commons.logging.Log.allowFlawedContext";
-    field public static final java.lang.String ALLOW_FLAWED_DISCOVERY_PROPERTY = "org.apache.commons.logging.Log.allowFlawedDiscovery";
-    field public static final java.lang.String ALLOW_FLAWED_HIERARCHY_PROPERTY = "org.apache.commons.logging.Log.allowFlawedHierarchy";
-    field public static final java.lang.String LOG_PROPERTY = "org.apache.commons.logging.Log";
-    field protected static final java.lang.String LOG_PROPERTY_OLD = "org.apache.commons.logging.log";
-    field protected java.util.Hashtable attributes;
-    field protected java.util.Hashtable instances;
-    field protected java.lang.reflect.Constructor logConstructor;
-    field protected java.lang.Class[] logConstructorSignature;
-    field protected java.lang.reflect.Method logMethod;
-    field protected java.lang.Class[] logMethodSignature;
-  }
-
-  public deprecated class NoOpLog implements org.apache.commons.logging.Log java.io.Serializable {
-    ctor public NoOpLog();
-    ctor public NoOpLog(java.lang.String);
-    method public void debug(java.lang.Object);
-    method public void debug(java.lang.Object, java.lang.Throwable);
-    method public void error(java.lang.Object);
-    method public void error(java.lang.Object, java.lang.Throwable);
-    method public void fatal(java.lang.Object);
-    method public void fatal(java.lang.Object, java.lang.Throwable);
-    method public void info(java.lang.Object);
-    method public void info(java.lang.Object, java.lang.Throwable);
-    method public final boolean isDebugEnabled();
-    method public final boolean isErrorEnabled();
-    method public final boolean isFatalEnabled();
-    method public final boolean isInfoEnabled();
-    method public final boolean isTraceEnabled();
-    method public final boolean isWarnEnabled();
-    method public void trace(java.lang.Object);
-    method public void trace(java.lang.Object, java.lang.Throwable);
-    method public void warn(java.lang.Object);
-    method public void warn(java.lang.Object, java.lang.Throwable);
-  }
-
-  public deprecated class SimpleLog implements org.apache.commons.logging.Log java.io.Serializable {
-    ctor public SimpleLog(java.lang.String);
-    method public final void debug(java.lang.Object);
-    method public final void debug(java.lang.Object, java.lang.Throwable);
-    method public final void error(java.lang.Object);
-    method public final void error(java.lang.Object, java.lang.Throwable);
-    method public final void fatal(java.lang.Object);
-    method public final void fatal(java.lang.Object, java.lang.Throwable);
-    method public int getLevel();
-    method public final void info(java.lang.Object);
-    method public final void info(java.lang.Object, java.lang.Throwable);
-    method public final boolean isDebugEnabled();
-    method public final boolean isErrorEnabled();
-    method public final boolean isFatalEnabled();
-    method public final boolean isInfoEnabled();
-    method protected boolean isLevelEnabled(int);
-    method public final boolean isTraceEnabled();
-    method public final boolean isWarnEnabled();
-    method protected void log(int, java.lang.Object, java.lang.Throwable);
-    method public void setLevel(int);
-    method public final void trace(java.lang.Object);
-    method public final void trace(java.lang.Object, java.lang.Throwable);
-    method public final void warn(java.lang.Object);
-    method public final void warn(java.lang.Object, java.lang.Throwable);
-    method protected void write(java.lang.StringBuffer);
-    field protected static final java.lang.String DEFAULT_DATE_TIME_FORMAT = "yyyy/MM/dd HH:mm:ss:SSS zzz";
-    field public static final int LOG_LEVEL_ALL = 0; // 0x0
-    field public static final int LOG_LEVEL_DEBUG = 2; // 0x2
-    field public static final int LOG_LEVEL_ERROR = 5; // 0x5
-    field public static final int LOG_LEVEL_FATAL = 6; // 0x6
-    field public static final int LOG_LEVEL_INFO = 3; // 0x3
-    field public static final int LOG_LEVEL_OFF = 7; // 0x7
-    field public static final int LOG_LEVEL_TRACE = 1; // 0x1
-    field public static final int LOG_LEVEL_WARN = 4; // 0x4
-    field protected int currentLogLevel;
-    field protected static java.text.DateFormat dateFormatter;
-    field protected static java.lang.String dateTimeFormat;
-    field protected java.lang.String logName;
-    field protected static boolean showDateTime;
-    field protected static boolean showLogName;
-    field protected static boolean showShortName;
-    field protected static final java.util.Properties simpleLogProps;
-    field protected static final java.lang.String systemPrefix = "org.apache.commons.logging.simplelog.";
-  }
-
-  public final deprecated class WeakHashtable extends java.util.Hashtable {
-    ctor public WeakHashtable();
-    method public boolean containsKey(java.lang.Object);
-    method public java.util.Enumeration elements();
-    method public java.util.Set entrySet();
-    method public java.lang.Object get(java.lang.Object);
-    method public boolean isEmpty();
-    method public java.util.Set keySet();
-    method public java.util.Enumeration keys();
-    method public java.lang.Object put(java.lang.Object, java.lang.Object);
-    method public void putAll(java.util.Map);
-    method public java.lang.Object remove(java.lang.Object);
-    method public int size();
-    method public java.util.Collection values();
+  @Deprecated public class Jdk14Logger implements org.apache.commons.logging.Log java.io.Serializable {
+    ctor @Deprecated public Jdk14Logger(String);
+    method @Deprecated public void debug(Object);
+    method @Deprecated public void debug(Object, Throwable);
+    method @Deprecated public void error(Object);
+    method @Deprecated public void error(Object, Throwable);
+    method @Deprecated public void fatal(Object);
+    method @Deprecated public void fatal(Object, Throwable);
+    method @Deprecated public java.util.logging.Logger getLogger();
+    method @Deprecated public void info(Object);
+    method @Deprecated public void info(Object, Throwable);
+    method @Deprecated public boolean isDebugEnabled();
+    method @Deprecated public boolean isErrorEnabled();
+    method @Deprecated public boolean isFatalEnabled();
+    method @Deprecated public boolean isInfoEnabled();
+    method @Deprecated public boolean isTraceEnabled();
+    method @Deprecated public boolean isWarnEnabled();
+    method @Deprecated public void trace(Object);
+    method @Deprecated public void trace(Object, Throwable);
+    method @Deprecated public void warn(Object);
+    method @Deprecated public void warn(Object, Throwable);
+    field @Deprecated protected static final java.util.logging.Level dummyLevel;
+    field @Deprecated protected transient java.util.logging.Logger logger;
+    field @Deprecated protected String name;
+  }
+
+  @Deprecated public class LogFactoryImpl extends org.apache.commons.logging.LogFactory {
+    ctor @Deprecated public LogFactoryImpl();
+    method @Deprecated public Object getAttribute(String);
+    method @Deprecated public String[] getAttributeNames();
+    method @Deprecated protected static ClassLoader getClassLoader(Class);
+    method @Deprecated protected static ClassLoader getContextClassLoader() throws org.apache.commons.logging.LogConfigurationException;
+    method @Deprecated public org.apache.commons.logging.Log getInstance(Class) throws org.apache.commons.logging.LogConfigurationException;
+    method @Deprecated public org.apache.commons.logging.Log getInstance(String) throws org.apache.commons.logging.LogConfigurationException;
+    method @Deprecated protected String getLogClassName();
+    method @Deprecated protected java.lang.reflect.Constructor getLogConstructor() throws org.apache.commons.logging.LogConfigurationException;
+    method @Deprecated protected static boolean isDiagnosticsEnabled();
+    method @Deprecated protected boolean isJdk13LumberjackAvailable();
+    method @Deprecated protected boolean isJdk14Available();
+    method @Deprecated protected boolean isLog4JAvailable();
+    method @Deprecated protected void logDiagnostic(String);
+    method @Deprecated protected org.apache.commons.logging.Log newInstance(String) throws org.apache.commons.logging.LogConfigurationException;
+    method @Deprecated public void release();
+    method @Deprecated public void removeAttribute(String);
+    method @Deprecated public void setAttribute(String, Object);
+    field @Deprecated public static final String ALLOW_FLAWED_CONTEXT_PROPERTY = "org.apache.commons.logging.Log.allowFlawedContext";
+    field @Deprecated public static final String ALLOW_FLAWED_DISCOVERY_PROPERTY = "org.apache.commons.logging.Log.allowFlawedDiscovery";
+    field @Deprecated public static final String ALLOW_FLAWED_HIERARCHY_PROPERTY = "org.apache.commons.logging.Log.allowFlawedHierarchy";
+    field @Deprecated public static final String LOG_PROPERTY = "org.apache.commons.logging.Log";
+    field @Deprecated protected static final String LOG_PROPERTY_OLD = "org.apache.commons.logging.log";
+    field @Deprecated protected java.util.Hashtable attributes;
+    field @Deprecated protected java.util.Hashtable instances;
+    field @Deprecated protected java.lang.reflect.Constructor logConstructor;
+    field @Deprecated protected Class[] logConstructorSignature;
+    field @Deprecated protected java.lang.reflect.Method logMethod;
+    field @Deprecated protected Class[] logMethodSignature;
+  }
+
+  @Deprecated public class NoOpLog implements org.apache.commons.logging.Log java.io.Serializable {
+    ctor @Deprecated public NoOpLog();
+    ctor @Deprecated public NoOpLog(String);
+    method @Deprecated public void debug(Object);
+    method @Deprecated public void debug(Object, Throwable);
+    method @Deprecated public void error(Object);
+    method @Deprecated public void error(Object, Throwable);
+    method @Deprecated public void fatal(Object);
+    method @Deprecated public void fatal(Object, Throwable);
+    method @Deprecated public void info(Object);
+    method @Deprecated public void info(Object, Throwable);
+    method @Deprecated public final boolean isDebugEnabled();
+    method @Deprecated public final boolean isErrorEnabled();
+    method @Deprecated public final boolean isFatalEnabled();
+    method @Deprecated public final boolean isInfoEnabled();
+    method @Deprecated public final boolean isTraceEnabled();
+    method @Deprecated public final boolean isWarnEnabled();
+    method @Deprecated public void trace(Object);
+    method @Deprecated public void trace(Object, Throwable);
+    method @Deprecated public void warn(Object);
+    method @Deprecated public void warn(Object, Throwable);
+  }
+
+  @Deprecated public class SimpleLog implements org.apache.commons.logging.Log java.io.Serializable {
+    ctor @Deprecated public SimpleLog(String);
+    method @Deprecated public final void debug(Object);
+    method @Deprecated public final void debug(Object, Throwable);
+    method @Deprecated public final void error(Object);
+    method @Deprecated public final void error(Object, Throwable);
+    method @Deprecated public final void fatal(Object);
+    method @Deprecated public final void fatal(Object, Throwable);
+    method @Deprecated public int getLevel();
+    method @Deprecated public final void info(Object);
+    method @Deprecated public final void info(Object, Throwable);
+    method @Deprecated public final boolean isDebugEnabled();
+    method @Deprecated public final boolean isErrorEnabled();
+    method @Deprecated public final boolean isFatalEnabled();
+    method @Deprecated public final boolean isInfoEnabled();
+    method @Deprecated protected boolean isLevelEnabled(int);
+    method @Deprecated public final boolean isTraceEnabled();
+    method @Deprecated public final boolean isWarnEnabled();
+    method @Deprecated protected void log(int, Object, Throwable);
+    method @Deprecated public void setLevel(int);
+    method @Deprecated public final void trace(Object);
+    method @Deprecated public final void trace(Object, Throwable);
+    method @Deprecated public final void warn(Object);
+    method @Deprecated public final void warn(Object, Throwable);
+    method @Deprecated protected void write(StringBuffer);
+    field @Deprecated protected static final String DEFAULT_DATE_TIME_FORMAT = "yyyy/MM/dd HH:mm:ss:SSS zzz";
+    field @Deprecated public static final int LOG_LEVEL_ALL = 0; // 0x0
+    field @Deprecated public static final int LOG_LEVEL_DEBUG = 2; // 0x2
+    field @Deprecated public static final int LOG_LEVEL_ERROR = 5; // 0x5
+    field @Deprecated public static final int LOG_LEVEL_FATAL = 6; // 0x6
+    field @Deprecated public static final int LOG_LEVEL_INFO = 3; // 0x3
+    field @Deprecated public static final int LOG_LEVEL_OFF = 7; // 0x7
+    field @Deprecated public static final int LOG_LEVEL_TRACE = 1; // 0x1
+    field @Deprecated public static final int LOG_LEVEL_WARN = 4; // 0x4
+    field @Deprecated protected int currentLogLevel;
+    field @Deprecated protected static java.text.DateFormat dateFormatter;
+    field @Deprecated protected static String dateTimeFormat;
+    field @Deprecated protected String logName;
+    field @Deprecated protected static boolean showDateTime;
+    field @Deprecated protected static boolean showLogName;
+    field @Deprecated protected static boolean showShortName;
+    field @Deprecated protected static final java.util.Properties simpleLogProps;
+    field @Deprecated protected static final String systemPrefix = "org.apache.commons.logging.simplelog.";
+  }
+
+  @Deprecated public final class WeakHashtable extends java.util.Hashtable {
+    ctor @Deprecated public WeakHashtable();
+    method @Deprecated public java.util.Enumeration elements();
+    method @Deprecated public java.util.Set entrySet();
+    method @Deprecated public Object get(Object);
+    method @Deprecated public java.util.Set keySet();
+    method @Deprecated public java.util.Enumeration keys();
+    method @Deprecated public Object put(Object, Object);
+    method @Deprecated public void putAll(java.util.Map);
+    method @Deprecated public Object remove(Object);
+    method @Deprecated public java.util.Collection values();
   }
 
 }
 
 package org.apache.http {
 
-  public deprecated class ConnectionClosedException extends java.io.IOException {
-    ctor public ConnectionClosedException(java.lang.String);
+  @Deprecated public class ConnectionClosedException extends java.io.IOException {
+    ctor @Deprecated public ConnectionClosedException(String);
   }
 
-  public abstract deprecated interface ConnectionReuseStrategy {
-    method public abstract boolean keepAlive(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext);
+  @Deprecated public interface ConnectionReuseStrategy {
+    method @Deprecated public boolean keepAlive(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext);
   }
 
-  public abstract deprecated interface FormattedHeader implements org.apache.http.Header {
-    method public abstract org.apache.http.util.CharArrayBuffer getBuffer();
-    method public abstract int getValuePos();
+  @Deprecated public interface FormattedHeader extends org.apache.http.Header {
+    method @Deprecated public org.apache.http.util.CharArrayBuffer getBuffer();
+    method @Deprecated public int getValuePos();
   }
 
-  public abstract deprecated interface Header {
-    method public abstract org.apache.http.HeaderElement[] getElements() throws org.apache.http.ParseException;
-    method public abstract java.lang.String getName();
-    method public abstract java.lang.String getValue();
+  @Deprecated public interface Header {
+    method @Deprecated public org.apache.http.HeaderElement[] getElements() throws org.apache.http.ParseException;
+    method @Deprecated public String getName();
+    method @Deprecated public String getValue();
   }
 
-  public abstract deprecated interface HeaderElement {
-    method public abstract java.lang.String getName();
-    method public abstract org.apache.http.NameValuePair getParameter(int);
-    method public abstract org.apache.http.NameValuePair getParameterByName(java.lang.String);
-    method public abstract int getParameterCount();
-    method public abstract org.apache.http.NameValuePair[] getParameters();
-    method public abstract java.lang.String getValue();
-  }
+  @Deprecated public interface HeaderElement {
+    method @Deprecated public String getName();
+    method @Deprecated public org.apache.http.NameValuePair getParameter(int);
+    method @Deprecated public org.apache.http.NameValuePair getParameterByName(String);
+    method @Deprecated public int getParameterCount();
+    method @Deprecated public org.apache.http.NameValuePair[] getParameters();
+    method @Deprecated public String getValue();
+  }
+
+  @Deprecated public interface HeaderElementIterator extends java.util.Iterator {
+    method @Deprecated public org.apache.http.HeaderElement nextElement();
+  }
+
+  @Deprecated public interface HeaderIterator extends java.util.Iterator {
+    method @Deprecated public org.apache.http.Header nextHeader();
+  }
 
-  public abstract deprecated interface HeaderElementIterator implements java.util.Iterator {
-    method public abstract org.apache.http.HeaderElement nextElement();
+  @Deprecated public interface HttpClientConnection extends org.apache.http.HttpConnection {
+    method @Deprecated public void flush() throws java.io.IOException;
+    method @Deprecated public boolean isResponseAvailable(int) throws java.io.IOException;
+    method @Deprecated public void receiveResponseEntity(org.apache.http.HttpResponse) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public org.apache.http.HttpResponse receiveResponseHeader() throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public void sendRequestEntity(org.apache.http.HttpEntityEnclosingRequest) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public void sendRequestHeader(org.apache.http.HttpRequest) throws org.apache.http.HttpException, java.io.IOException;
   }
 
-  public abstract deprecated interface HeaderIterator implements java.util.Iterator {
-    method public abstract org.apache.http.Header nextHeader();
+  @Deprecated public interface HttpConnection {
+    method @Deprecated public void close() throws java.io.IOException;
+    method @Deprecated public org.apache.http.HttpConnectionMetrics getMetrics();
+    method @Deprecated public int getSocketTimeout();
+    method @Deprecated public boolean isOpen();
+    method @Deprecated public boolean isStale();
+    method @Deprecated public void setSocketTimeout(int);
+    method @Deprecated public void shutdown() throws java.io.IOException;
   }
 
-  public abstract deprecated interface HttpClientConnection implements org.apache.http.HttpConnection {
-    method public abstract void flush() throws java.io.IOException;
-    method public abstract boolean isResponseAvailable(int) throws java.io.IOException;
-    method public abstract void receiveResponseEntity(org.apache.http.HttpResponse) throws org.apache.http.HttpException, java.io.IOException;
-    method public abstract org.apache.http.HttpResponse receiveResponseHeader() throws org.apache.http.HttpException, java.io.IOException;
-    method public abstract void sendRequestEntity(org.apache.http.HttpEntityEnclosingRequest) throws org.apache.http.HttpException, java.io.IOException;
-    method public abstract void sendRequestHeader(org.apache.http.HttpRequest) throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public interface HttpConnectionMetrics {
+    method @Deprecated public Object getMetric(String);
+    method @Deprecated public long getReceivedBytesCount();
+    method @Deprecated public long getRequestCount();
+    method @Deprecated public long getResponseCount();
+    method @Deprecated public long getSentBytesCount();
+    method @Deprecated public void reset();
   }
 
-  public abstract deprecated interface HttpConnection {
-    method public abstract void close() throws java.io.IOException;
-    method public abstract org.apache.http.HttpConnectionMetrics getMetrics();
-    method public abstract int getSocketTimeout();
-    method public abstract boolean isOpen();
-    method public abstract boolean isStale();
-    method public abstract void setSocketTimeout(int);
-    method public abstract void shutdown() throws java.io.IOException;
+  @Deprecated public interface HttpEntity {
+    method @Deprecated public void consumeContent() throws java.io.IOException;
+    method @Deprecated public java.io.InputStream getContent() throws java.io.IOException, java.lang.IllegalStateException;
+    method @Deprecated public org.apache.http.Header getContentEncoding();
+    method @Deprecated public long getContentLength();
+    method @Deprecated public org.apache.http.Header getContentType();
+    method @Deprecated public boolean isChunked();
+    method @Deprecated public boolean isRepeatable();
+    method @Deprecated public boolean isStreaming();
+    method @Deprecated public void writeTo(java.io.OutputStream) throws java.io.IOException;
   }
 
-  public abstract deprecated interface HttpConnectionMetrics {
-    method public abstract java.lang.Object getMetric(java.lang.String);
-    method public abstract long getReceivedBytesCount();
-    method public abstract long getRequestCount();
-    method public abstract long getResponseCount();
-    method public abstract long getSentBytesCount();
-    method public abstract void reset();
+  @Deprecated public interface HttpEntityEnclosingRequest extends org.apache.http.HttpRequest {
+    method @Deprecated public boolean expectContinue();
+    method @Deprecated public org.apache.http.HttpEntity getEntity();
+    method @Deprecated public void setEntity(org.apache.http.HttpEntity);
   }
 
-  public abstract deprecated interface HttpEntity {
-    method public abstract void consumeContent() throws java.io.IOException;
-    method public abstract java.io.InputStream getContent() throws java.io.IOException, java.lang.IllegalStateException;
-    method public abstract org.apache.http.Header getContentEncoding();
-    method public abstract long getContentLength();
-    method public abstract org.apache.http.Header getContentType();
-    method public abstract boolean isChunked();
-    method public abstract boolean isRepeatable();
-    method public abstract boolean isStreaming();
-    method public abstract void writeTo(java.io.OutputStream) throws java.io.IOException;
+  @Deprecated public class HttpException extends java.lang.Exception {
+    ctor @Deprecated public HttpException();
+    ctor @Deprecated public HttpException(String);
+    ctor @Deprecated public HttpException(String, Throwable);
   }
 
-  public abstract deprecated interface HttpEntityEnclosingRequest implements org.apache.http.HttpRequest {
-    method public abstract boolean expectContinue();
-    method public abstract org.apache.http.HttpEntity getEntity();
-    method public abstract void setEntity(org.apache.http.HttpEntity);
+  @Deprecated public final class HttpHost implements java.lang.Cloneable {
+    ctor @Deprecated public HttpHost(String, int, String);
+    ctor @Deprecated public HttpHost(String, int);
+    ctor @Deprecated public HttpHost(String);
+    ctor @Deprecated public HttpHost(org.apache.http.HttpHost);
+    method @Deprecated public Object clone() throws java.lang.CloneNotSupportedException;
+    method @Deprecated public String getHostName();
+    method @Deprecated public int getPort();
+    method @Deprecated public String getSchemeName();
+    method @Deprecated public String toHostString();
+    method @Deprecated public String toURI();
+    field @Deprecated public static final String DEFAULT_SCHEME_NAME = "http";
+    field @Deprecated protected final String hostname;
+    field @Deprecated protected final String lcHostname;
+    field @Deprecated protected final int port;
+    field @Deprecated protected final String schemeName;
+  }
+
+  @Deprecated public interface HttpInetConnection extends org.apache.http.HttpConnection {
+    method @Deprecated public java.net.InetAddress getLocalAddress();
+    method @Deprecated public int getLocalPort();
+    method @Deprecated public java.net.InetAddress getRemoteAddress();
+    method @Deprecated public int getRemotePort();
+  }
+
+  @Deprecated public interface HttpMessage {
+    method @Deprecated public void addHeader(org.apache.http.Header);
+    method @Deprecated public void addHeader(String, String);
+    method @Deprecated public boolean containsHeader(String);
+    method @Deprecated public org.apache.http.Header[] getAllHeaders();
+    method @Deprecated public org.apache.http.Header getFirstHeader(String);
+    method @Deprecated public org.apache.http.Header[] getHeaders(String);
+    method @Deprecated public org.apache.http.Header getLastHeader(String);
+    method @Deprecated public org.apache.http.params.HttpParams getParams();
+    method @Deprecated public org.apache.http.ProtocolVersion getProtocolVersion();
+    method @Deprecated public org.apache.http.HeaderIterator headerIterator();
+    method @Deprecated public org.apache.http.HeaderIterator headerIterator(String);
+    method @Deprecated public void removeHeader(org.apache.http.Header);
+    method @Deprecated public void removeHeaders(String);
+    method @Deprecated public void setHeader(org.apache.http.Header);
+    method @Deprecated public void setHeader(String, String);
+    method @Deprecated public void setHeaders(org.apache.http.Header[]);
+    method @Deprecated public void setParams(org.apache.http.params.HttpParams);
+  }
+
+  @Deprecated public interface HttpRequest extends org.apache.http.HttpMessage {
+    method @Deprecated public org.apache.http.RequestLine getRequestLine();
+  }
+
+  @Deprecated public interface HttpRequestFactory {
+    method @Deprecated public org.apache.http.HttpRequest newHttpRequest(org.apache.http.RequestLine) throws org.apache.http.MethodNotSupportedException;
+    method @Deprecated public org.apache.http.HttpRequest newHttpRequest(String, String) throws org.apache.http.MethodNotSupportedException;
+  }
+
+  @Deprecated public interface HttpRequestInterceptor {
+    method @Deprecated public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+  }
+
+  @Deprecated public interface HttpResponse extends org.apache.http.HttpMessage {
+    method @Deprecated public org.apache.http.HttpEntity getEntity();
+    method @Deprecated public java.util.Locale getLocale();
+    method @Deprecated public org.apache.http.StatusLine getStatusLine();
+    method @Deprecated public void setEntity(org.apache.http.HttpEntity);
+    method @Deprecated public void setLocale(java.util.Locale);
+    method @Deprecated public void setReasonPhrase(String) throws java.lang.IllegalStateException;
+    method @Deprecated public void setStatusCode(int) throws java.lang.IllegalStateException;
+    method @Deprecated public void setStatusLine(org.apache.http.StatusLine);
+    method @Deprecated public void setStatusLine(org.apache.http.ProtocolVersion, int);
+    method @Deprecated public void setStatusLine(org.apache.http.ProtocolVersion, int, String);
+  }
+
+  @Deprecated public interface HttpResponseFactory {
+    method @Deprecated public org.apache.http.HttpResponse newHttpResponse(org.apache.http.ProtocolVersion, int, org.apache.http.protocol.HttpContext);
+    method @Deprecated public org.apache.http.HttpResponse newHttpResponse(org.apache.http.StatusLine, org.apache.http.protocol.HttpContext);
+  }
+
+  @Deprecated public interface HttpResponseInterceptor {
+    method @Deprecated public void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+  }
+
+  @Deprecated public interface HttpServerConnection extends org.apache.http.HttpConnection {
+    method @Deprecated public void flush() throws java.io.IOException;
+    method @Deprecated public void receiveRequestEntity(org.apache.http.HttpEntityEnclosingRequest) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public org.apache.http.HttpRequest receiveRequestHeader() throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public void sendResponseEntity(org.apache.http.HttpResponse) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public void sendResponseHeader(org.apache.http.HttpResponse) throws org.apache.http.HttpException, java.io.IOException;
+  }
+
+  @Deprecated public interface HttpStatus {
+    field @Deprecated public static final int SC_ACCEPTED = 202; // 0xca
+    field @Deprecated public static final int SC_BAD_GATEWAY = 502; // 0x1f6
+    field @Deprecated public static final int SC_BAD_REQUEST = 400; // 0x190
+    field @Deprecated public static final int SC_CONFLICT = 409; // 0x199
+    field @Deprecated public static final int SC_CONTINUE = 100; // 0x64
+    field @Deprecated public static final int SC_CREATED = 201; // 0xc9
+    field @Deprecated public static final int SC_EXPECTATION_FAILED = 417; // 0x1a1
+    field @Deprecated public static final int SC_FAILED_DEPENDENCY = 424; // 0x1a8
+    field @Deprecated public static final int SC_FORBIDDEN = 403; // 0x193
+    field @Deprecated public static final int SC_GATEWAY_TIMEOUT = 504; // 0x1f8
+    field @Deprecated public static final int SC_GONE = 410; // 0x19a
+    field @Deprecated public static final int SC_HTTP_VERSION_NOT_SUPPORTED = 505; // 0x1f9
+    field @Deprecated public static final int SC_INSUFFICIENT_SPACE_ON_RESOURCE = 419; // 0x1a3
+    field @Deprecated public static final int SC_INSUFFICIENT_STORAGE = 507; // 0x1fb
+    field @Deprecated public static final int SC_INTERNAL_SERVER_ERROR = 500; // 0x1f4
+    field @Deprecated public static final int SC_LENGTH_REQUIRED = 411; // 0x19b
+    field @Deprecated public static final int SC_LOCKED = 423; // 0x1a7
+    field @Deprecated public static final int SC_METHOD_FAILURE = 420; // 0x1a4
+    field @Deprecated public static final int SC_METHOD_NOT_ALLOWED = 405; // 0x195
+    field @Deprecated public static final int SC_MOVED_PERMANENTLY = 301; // 0x12d
+    field @Deprecated public static final int SC_MOVED_TEMPORARILY = 302; // 0x12e
+    field @Deprecated public static final int SC_MULTIPLE_CHOICES = 300; // 0x12c
+    field @Deprecated public static final int SC_MULTI_STATUS = 207; // 0xcf
+    field @Deprecated public static final int SC_NON_AUTHORITATIVE_INFORMATION = 203; // 0xcb
+    field @Deprecated public static final int SC_NOT_ACCEPTABLE = 406; // 0x196
+    field @Deprecated public static final int SC_NOT_FOUND = 404; // 0x194
+    field @Deprecated public static final int SC_NOT_IMPLEMENTED = 501; // 0x1f5
+    field @Deprecated public static final int SC_NOT_MODIFIED = 304; // 0x130
+    field @Deprecated public static final int SC_NO_CONTENT = 204; // 0xcc
+    field @Deprecated public static final int SC_OK = 200; // 0xc8
+    field @Deprecated public static final int SC_PARTIAL_CONTENT = 206; // 0xce
+    field @Deprecated public static final int SC_PAYMENT_REQUIRED = 402; // 0x192
+    field @Deprecated public static final int SC_PRECONDITION_FAILED = 412; // 0x19c
+    field @Deprecated public static final int SC_PROCESSING = 102; // 0x66
+    field @Deprecated public static final int SC_PROXY_AUTHENTICATION_REQUIRED = 407; // 0x197
+    field @Deprecated public static final int SC_REQUESTED_RANGE_NOT_SATISFIABLE = 416; // 0x1a0
+    field @Deprecated public static final int SC_REQUEST_TIMEOUT = 408; // 0x198
+    field @Deprecated public static final int SC_REQUEST_TOO_LONG = 413; // 0x19d
+    field @Deprecated public static final int SC_REQUEST_URI_TOO_LONG = 414; // 0x19e
+    field @Deprecated public static final int SC_RESET_CONTENT = 205; // 0xcd
+    field @Deprecated public static final int SC_SEE_OTHER = 303; // 0x12f
+    field @Deprecated public static final int SC_SERVICE_UNAVAILABLE = 503; // 0x1f7
+    field @Deprecated public static final int SC_SWITCHING_PROTOCOLS = 101; // 0x65
+    field @Deprecated public static final int SC_TEMPORARY_REDIRECT = 307; // 0x133
+    field @Deprecated public static final int SC_UNAUTHORIZED = 401; // 0x191
+    field @Deprecated public static final int SC_UNPROCESSABLE_ENTITY = 422; // 0x1a6
+    field @Deprecated public static final int SC_UNSUPPORTED_MEDIA_TYPE = 415; // 0x19f
+    field @Deprecated public static final int SC_USE_PROXY = 305; // 0x131
+  }
+
+  @Deprecated public final class HttpVersion extends org.apache.http.ProtocolVersion implements java.io.Serializable {
+    ctor @Deprecated public HttpVersion(int, int);
+    field @Deprecated public static final String HTTP = "HTTP";
+    field @Deprecated public static final org.apache.http.HttpVersion HTTP_0_9;
+    field @Deprecated public static final org.apache.http.HttpVersion HTTP_1_0;
+    field @Deprecated public static final org.apache.http.HttpVersion HTTP_1_1;
+  }
+
+  @Deprecated public class MalformedChunkCodingException extends java.io.IOException {
+    ctor @Deprecated public MalformedChunkCodingException();
+    ctor @Deprecated public MalformedChunkCodingException(String);
+  }
+
+  @Deprecated public class MethodNotSupportedException extends org.apache.http.HttpException {
+    ctor @Deprecated public MethodNotSupportedException(String);
+    ctor @Deprecated public MethodNotSupportedException(String, Throwable);
+  }
+
+  @Deprecated public interface NameValuePair {
+    method @Deprecated public String getName();
+    method @Deprecated public String getValue();
+  }
+
+  @Deprecated public class NoHttpResponseException extends java.io.IOException {
+    ctor @Deprecated public NoHttpResponseException(String);
+  }
+
+  @Deprecated public class ParseException extends java.lang.RuntimeException {
+    ctor @Deprecated public ParseException();
+    ctor @Deprecated public ParseException(String);
+  }
+
+  @Deprecated public class ProtocolException extends org.apache.http.HttpException {
+    ctor @Deprecated public ProtocolException();
+    ctor @Deprecated public ProtocolException(String);
+    ctor @Deprecated public ProtocolException(String, Throwable);
+  }
+
+  @Deprecated public class ProtocolVersion implements java.lang.Cloneable java.io.Serializable {
+    ctor @Deprecated public ProtocolVersion(String, int, int);
+    method @Deprecated public Object clone() throws java.lang.CloneNotSupportedException;
+    method @Deprecated public int compareToVersion(org.apache.http.ProtocolVersion);
+    method @Deprecated public final boolean equals(Object);
+    method @Deprecated public org.apache.http.ProtocolVersion forVersion(int, int);
+    method @Deprecated public final int getMajor();
+    method @Deprecated public final int getMinor();
+    method @Deprecated public final String getProtocol();
+    method @Deprecated public final boolean greaterEquals(org.apache.http.ProtocolVersion);
+    method @Deprecated public final int hashCode();
+    method @Deprecated public boolean isComparable(org.apache.http.ProtocolVersion);
+    method @Deprecated public final boolean lessEquals(org.apache.http.ProtocolVersion);
+    field @Deprecated protected final int major;
+    field @Deprecated protected final int minor;
+    field @Deprecated protected final String protocol;
+  }
+
+  @Deprecated public interface ReasonPhraseCatalog {
+    method @Deprecated public String getReason(int, java.util.Locale);
+  }
+
+  @Deprecated public interface RequestLine {
+    method @Deprecated public String getMethod();
+    method @Deprecated public org.apache.http.ProtocolVersion getProtocolVersion();
+    method @Deprecated public String getUri();
+  }
+
+  @Deprecated public interface StatusLine {
+    method @Deprecated public org.apache.http.ProtocolVersion getProtocolVersion();
+    method @Deprecated public String getReasonPhrase();
+    method @Deprecated public int getStatusCode();
   }
 
-  public deprecated class HttpException extends java.lang.Exception {
-    ctor public HttpException();
-    ctor public HttpException(java.lang.String);
-    ctor public HttpException(java.lang.String, java.lang.Throwable);
+  @Deprecated public interface TokenIterator extends java.util.Iterator {
+    method @Deprecated public String nextToken();
   }
 
-  public final deprecated class HttpHost implements java.lang.Cloneable {
-    ctor public HttpHost(java.lang.String, int, java.lang.String);
-    ctor public HttpHost(java.lang.String, int);
-    ctor public HttpHost(java.lang.String);
-    ctor public HttpHost(org.apache.http.HttpHost);
-    method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
-    method public java.lang.String getHostName();
-    method public int getPort();
-    method public java.lang.String getSchemeName();
-    method public java.lang.String toHostString();
-    method public java.lang.String toURI();
-    field public static final java.lang.String DEFAULT_SCHEME_NAME = "http";
-    field protected final java.lang.String hostname;
-    field protected final java.lang.String lcHostname;
-    field protected final int port;
-    field protected final java.lang.String schemeName;
-  }
-
-  public abstract deprecated interface HttpInetConnection implements org.apache.http.HttpConnection {
-    method public abstract java.net.InetAddress getLocalAddress();
-    method public abstract int getLocalPort();
-    method public abstract java.net.InetAddress getRemoteAddress();
-    method public abstract int getRemotePort();
-  }
-
-  public abstract deprecated interface HttpMessage {
-    method public abstract void addHeader(org.apache.http.Header);
-    method public abstract void addHeader(java.lang.String, java.lang.String);
-    method public abstract boolean containsHeader(java.lang.String);
-    method public abstract org.apache.http.Header[] getAllHeaders();
-    method public abstract org.apache.http.Header getFirstHeader(java.lang.String);
-    method public abstract org.apache.http.Header[] getHeaders(java.lang.String);
-    method public abstract org.apache.http.Header getLastHeader(java.lang.String);
-    method public abstract org.apache.http.params.HttpParams getParams();
-    method public abstract org.apache.http.ProtocolVersion getProtocolVersion();
-    method public abstract org.apache.http.HeaderIterator headerIterator();
-    method public abstract org.apache.http.HeaderIterator headerIterator(java.lang.String);
-    method public abstract void removeHeader(org.apache.http.Header);
-    method public abstract void removeHeaders(java.lang.String);
-    method public abstract void setHeader(org.apache.http.Header);
-    method public abstract void setHeader(java.lang.String, java.lang.String);
-    method public abstract void setHeaders(org.apache.http.Header[]);
-    method public abstract void setParams(org.apache.http.params.HttpParams);
-  }
-
-  public abstract deprecated interface HttpRequest implements org.apache.http.HttpMessage {
-    method public abstract org.apache.http.RequestLine getRequestLine();
-  }
-
-  public abstract deprecated interface HttpRequestFactory {
-    method public abstract org.apache.http.HttpRequest newHttpRequest(org.apache.http.RequestLine) throws org.apache.http.MethodNotSupportedException;
-    method public abstract org.apache.http.HttpRequest newHttpRequest(java.lang.String, java.lang.String) throws org.apache.http.MethodNotSupportedException;
-  }
-
-  public abstract deprecated interface HttpRequestInterceptor {
-    method public abstract void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
-  }
-
-  public abstract deprecated interface HttpResponse implements org.apache.http.HttpMessage {
-    method public abstract org.apache.http.HttpEntity getEntity();
-    method public abstract java.util.Locale getLocale();
-    method public abstract org.apache.http.StatusLine getStatusLine();
-    method public abstract void setEntity(org.apache.http.HttpEntity);
-    method public abstract void setLocale(java.util.Locale);
-    method public abstract void setReasonPhrase(java.lang.String) throws java.lang.IllegalStateException;
-    method public abstract void setStatusCode(int) throws java.lang.IllegalStateException;
-    method public abstract void setStatusLine(org.apache.http.StatusLine);
-    method public abstract void setStatusLine(org.apache.http.ProtocolVersion, int);
-    method public abstract void setStatusLine(org.apache.http.ProtocolVersion, int, java.lang.String);
-  }
-
-  public abstract deprecated interface HttpResponseFactory {
-    method public abstract org.apache.http.HttpResponse newHttpResponse(org.apache.http.ProtocolVersion, int, org.apache.http.protocol.HttpContext);
-    method public abstract org.apache.http.HttpResponse newHttpResponse(org.apache.http.StatusLine, org.apache.http.protocol.HttpContext);
-  }
-
-  public abstract deprecated interface HttpResponseInterceptor {
-    method public abstract void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
-  }
-
-  public abstract deprecated interface HttpServerConnection implements org.apache.http.HttpConnection {
-    method public abstract void flush() throws java.io.IOException;
-    method public abstract void receiveRequestEntity(org.apache.http.HttpEntityEnclosingRequest) throws org.apache.http.HttpException, java.io.IOException;
-    method public abstract org.apache.http.HttpRequest receiveRequestHeader() throws org.apache.http.HttpException, java.io.IOException;
-    method public abstract void sendResponseEntity(org.apache.http.HttpResponse) throws org.apache.http.HttpException, java.io.IOException;
-    method public abstract void sendResponseHeader(org.apache.http.HttpResponse) throws org.apache.http.HttpException, java.io.IOException;
-  }
-
-  public abstract deprecated interface HttpStatus {
-    field public static final int SC_ACCEPTED = 202; // 0xca
-    field public static final int SC_BAD_GATEWAY = 502; // 0x1f6
-    field public static final int SC_BAD_REQUEST = 400; // 0x190
-    field public static final int SC_CONFLICT = 409; // 0x199
-    field public static final int SC_CONTINUE = 100; // 0x64
-    field public static final int SC_CREATED = 201; // 0xc9
-    field public static final int SC_EXPECTATION_FAILED = 417; // 0x1a1
-    field public static final int SC_FAILED_DEPENDENCY = 424; // 0x1a8
-    field public static final int SC_FORBIDDEN = 403; // 0x193
-    field public static final int SC_GATEWAY_TIMEOUT = 504; // 0x1f8
-    field public static final int SC_GONE = 410; // 0x19a
-    field public static final int SC_HTTP_VERSION_NOT_SUPPORTED = 505; // 0x1f9
-    field public static final int SC_INSUFFICIENT_SPACE_ON_RESOURCE = 419; // 0x1a3
-    field public static final int SC_INSUFFICIENT_STORAGE = 507; // 0x1fb
-    field public static final int SC_INTERNAL_SERVER_ERROR = 500; // 0x1f4
-    field public static final int SC_LENGTH_REQUIRED = 411; // 0x19b
-    field public static final int SC_LOCKED = 423; // 0x1a7
-    field public static final int SC_METHOD_FAILURE = 420; // 0x1a4
-    field public static final int SC_METHOD_NOT_ALLOWED = 405; // 0x195
-    field public static final int SC_MOVED_PERMANENTLY = 301; // 0x12d
-    field public static final int SC_MOVED_TEMPORARILY = 302; // 0x12e
-    field public static final int SC_MULTIPLE_CHOICES = 300; // 0x12c
-    field public static final int SC_MULTI_STATUS = 207; // 0xcf
-    field public static final int SC_NON_AUTHORITATIVE_INFORMATION = 203; // 0xcb
-    field public static final int SC_NOT_ACCEPTABLE = 406; // 0x196
-    field public static final int SC_NOT_FOUND = 404; // 0x194
-    field public static final int SC_NOT_IMPLEMENTED = 501; // 0x1f5
-    field public static final int SC_NOT_MODIFIED = 304; // 0x130
-    field public static final int SC_NO_CONTENT = 204; // 0xcc
-    field public static final int SC_OK = 200; // 0xc8
-    field public static final int SC_PARTIAL_CONTENT = 206; // 0xce
-    field public static final int SC_PAYMENT_REQUIRED = 402; // 0x192
-    field public static final int SC_PRECONDITION_FAILED = 412; // 0x19c
-    field public static final int SC_PROCESSING = 102; // 0x66
-    field public static final int SC_PROXY_AUTHENTICATION_REQUIRED = 407; // 0x197
-    field public static final int SC_REQUESTED_RANGE_NOT_SATISFIABLE = 416; // 0x1a0
-    field public static final int SC_REQUEST_TIMEOUT = 408; // 0x198
-    field public static final int SC_REQUEST_TOO_LONG = 413; // 0x19d
-    field public static final int SC_REQUEST_URI_TOO_LONG = 414; // 0x19e
-    field public static final int SC_RESET_CONTENT = 205; // 0xcd
-    field public static final int SC_SEE_OTHER = 303; // 0x12f
-    field public static final int SC_SERVICE_UNAVAILABLE = 503; // 0x1f7
-    field public static final int SC_SWITCHING_PROTOCOLS = 101; // 0x65
-    field public static final int SC_TEMPORARY_REDIRECT = 307; // 0x133
-    field public static final int SC_UNAUTHORIZED = 401; // 0x191
-    field public static final int SC_UNPROCESSABLE_ENTITY = 422; // 0x1a6
-    field public static final int SC_UNSUPPORTED_MEDIA_TYPE = 415; // 0x19f
-    field public static final int SC_USE_PROXY = 305; // 0x131
-  }
-
-  public final deprecated class HttpVersion extends org.apache.http.ProtocolVersion implements java.io.Serializable {
-    ctor public HttpVersion(int, int);
-    field public static final java.lang.String HTTP = "HTTP";
-    field public static final org.apache.http.HttpVersion HTTP_0_9;
-    field public static final org.apache.http.HttpVersion HTTP_1_0;
-    field public static final org.apache.http.HttpVersion HTTP_1_1;
-  }
-
-  public deprecated class MalformedChunkCodingException extends java.io.IOException {
-    ctor public MalformedChunkCodingException();
-    ctor public MalformedChunkCodingException(java.lang.String);
-  }
-
-  public deprecated class MethodNotSupportedException extends org.apache.http.HttpException {
-    ctor public MethodNotSupportedException(java.lang.String);
-    ctor public MethodNotSupportedException(java.lang.String, java.lang.Throwable);
-  }
-
-  public abstract deprecated interface NameValuePair {
-    method public abstract java.lang.String getName();
-    method public abstract java.lang.String getValue();
-  }
-
-  public deprecated class NoHttpResponseException extends java.io.IOException {
-    ctor public NoHttpResponseException(java.lang.String);
-  }
-
-  public deprecated class ParseException extends java.lang.RuntimeException {
-    ctor public ParseException();
-    ctor public ParseException(java.lang.String);
-  }
-
-  public deprecated class ProtocolException extends org.apache.http.HttpException {
-    ctor public ProtocolException();
-    ctor public ProtocolException(java.lang.String);
-    ctor public ProtocolException(java.lang.String, java.lang.Throwable);
-  }
-
-  public deprecated class ProtocolVersion implements java.lang.Cloneable java.io.Serializable {
-    ctor public ProtocolVersion(java.lang.String, int, int);
-    method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
-    method public int compareToVersion(org.apache.http.ProtocolVersion);
-    method public final boolean equals(java.lang.Object);
-    method public org.apache.http.ProtocolVersion forVersion(int, int);
-    method public final int getMajor();
-    method public final int getMinor();
-    method public final java.lang.String getProtocol();
-    method public final boolean greaterEquals(org.apache.http.ProtocolVersion);
-    method public final int hashCode();
-    method public boolean isComparable(org.apache.http.ProtocolVersion);
-    method public final boolean lessEquals(org.apache.http.ProtocolVersion);
-    field protected final int major;
-    field protected final int minor;
-    field protected final java.lang.String protocol;
-  }
-
-  public abstract deprecated interface ReasonPhraseCatalog {
-    method public abstract java.lang.String getReason(int, java.util.Locale);
-  }
-
-  public abstract deprecated interface RequestLine {
-    method public abstract java.lang.String getMethod();
-    method public abstract org.apache.http.ProtocolVersion getProtocolVersion();
-    method public abstract java.lang.String getUri();
-  }
-
-  public abstract deprecated interface StatusLine {
-    method public abstract org.apache.http.ProtocolVersion getProtocolVersion();
-    method public abstract java.lang.String getReasonPhrase();
-    method public abstract int getStatusCode();
-  }
-
-  public abstract deprecated interface TokenIterator implements java.util.Iterator {
-    method public abstract java.lang.String nextToken();
-  }
-
-  public deprecated class UnsupportedHttpVersionException extends org.apache.http.ProtocolException {
-    ctor public UnsupportedHttpVersionException();
-    ctor public UnsupportedHttpVersionException(java.lang.String);
+  @Deprecated public class UnsupportedHttpVersionException extends org.apache.http.ProtocolException {
+    ctor @Deprecated public UnsupportedHttpVersionException();
+    ctor @Deprecated public UnsupportedHttpVersionException(String);
   }
 
 }
 
 package org.apache.http.auth {
 
-  public final deprecated class AUTH {
-    field public static final java.lang.String PROXY_AUTH = "Proxy-Authenticate";
-    field public static final java.lang.String PROXY_AUTH_RESP = "Proxy-Authorization";
-    field public static final java.lang.String WWW_AUTH = "WWW-Authenticate";
-    field public static final java.lang.String WWW_AUTH_RESP = "Authorization";
+  @Deprecated public final class AUTH {
+    field @Deprecated public static final String PROXY_AUTH = "Proxy-Authenticate";
+    field @Deprecated public static final String PROXY_AUTH_RESP = "Proxy-Authorization";
+    field @Deprecated public static final String WWW_AUTH = "WWW-Authenticate";
+    field @Deprecated public static final String WWW_AUTH_RESP = "Authorization";
   }
 
-  public abstract deprecated interface AuthScheme {
-    method public abstract org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest) throws org.apache.http.auth.AuthenticationException;
-    method public abstract java.lang.String getParameter(java.lang.String);
-    method public abstract java.lang.String getRealm();
-    method public abstract java.lang.String getSchemeName();
-    method public abstract boolean isComplete();
-    method public abstract boolean isConnectionBased();
-    method public abstract void processChallenge(org.apache.http.Header) throws org.apache.http.auth.MalformedChallengeException;
+  @Deprecated public interface AuthScheme {
+    method @Deprecated public org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest) throws org.apache.http.auth.AuthenticationException;
+    method @Deprecated public String getParameter(String);
+    method @Deprecated public String getRealm();
+    method @Deprecated public String getSchemeName();
+    method @Deprecated public boolean isComplete();
+    method @Deprecated public boolean isConnectionBased();
+    method @Deprecated public void processChallenge(org.apache.http.Header) throws org.apache.http.auth.MalformedChallengeException;
   }
 
-  public abstract deprecated interface AuthSchemeFactory {
-    method public abstract org.apache.http.auth.AuthScheme newInstance(org.apache.http.params.HttpParams);
+  @Deprecated public interface AuthSchemeFactory {
+    method @Deprecated public org.apache.http.auth.AuthScheme newInstance(org.apache.http.params.HttpParams);
   }
 
-  public final deprecated class AuthSchemeRegistry {
-    ctor public AuthSchemeRegistry();
-    method public synchronized org.apache.http.auth.AuthScheme getAuthScheme(java.lang.String, org.apache.http.params.HttpParams) throws java.lang.IllegalStateException;
-    method public synchronized java.util.List<java.lang.String> getSchemeNames();
-    method public synchronized void register(java.lang.String, org.apache.http.auth.AuthSchemeFactory);
-    method public synchronized void setItems(java.util.Map<java.lang.String, org.apache.http.auth.AuthSchemeFactory>);
-    method public synchronized void unregister(java.lang.String);
+  @Deprecated public final class AuthSchemeRegistry {
+    ctor @Deprecated public AuthSchemeRegistry();
+    method @Deprecated public org.apache.http.auth.AuthScheme getAuthScheme(String, org.apache.http.params.HttpParams) throws java.lang.IllegalStateException;
+    method @Deprecated public java.util.List<java.lang.String> getSchemeNames();
+    method @Deprecated public void register(String, org.apache.http.auth.AuthSchemeFactory);
+    method @Deprecated public void setItems(java.util.Map<java.lang.String,org.apache.http.auth.AuthSchemeFactory>);
+    method @Deprecated public void unregister(String);
   }
 
-  public deprecated class AuthScope {
-    ctor public AuthScope(java.lang.String, int, java.lang.String, java.lang.String);
-    ctor public AuthScope(java.lang.String, int, java.lang.String);
-    ctor public AuthScope(java.lang.String, int);
-    ctor public AuthScope(org.apache.http.auth.AuthScope);
-    method public java.lang.String getHost();
-    method public int getPort();
-    method public java.lang.String getRealm();
-    method public java.lang.String getScheme();
-    method public int match(org.apache.http.auth.AuthScope);
-    field public static final org.apache.http.auth.AuthScope ANY;
-    field public static final java.lang.String ANY_HOST;
-    field public static final int ANY_PORT = -1; // 0xffffffff
-    field public static final java.lang.String ANY_REALM;
-    field public static final java.lang.String ANY_SCHEME;
-  }
-
-  public deprecated class AuthState {
-    ctor public AuthState();
-    method public org.apache.http.auth.AuthScheme getAuthScheme();
-    method public org.apache.http.auth.AuthScope getAuthScope();
-    method public org.apache.http.auth.Credentials getCredentials();
-    method public void invalidate();
-    method public boolean isValid();
-    method public void setAuthScheme(org.apache.http.auth.AuthScheme);
-    method public void setAuthScope(org.apache.http.auth.AuthScope);
-    method public void setCredentials(org.apache.http.auth.Credentials);
+  @Deprecated public class AuthScope {
+    ctor @Deprecated public AuthScope(String, int, String, String);
+    ctor @Deprecated public AuthScope(String, int, String);
+    ctor @Deprecated public AuthScope(String, int);
+    ctor @Deprecated public AuthScope(org.apache.http.auth.AuthScope);
+    method @Deprecated public String getHost();
+    method @Deprecated public int getPort();
+    method @Deprecated public String getRealm();
+    method @Deprecated public String getScheme();
+    method @Deprecated public int match(org.apache.http.auth.AuthScope);
+    field @Deprecated public static final org.apache.http.auth.AuthScope ANY;
+    field @Deprecated public static final String ANY_HOST;
+    field @Deprecated public static final int ANY_PORT = -1; // 0xffffffff
+    field @Deprecated public static final String ANY_REALM;
+    field @Deprecated public static final String ANY_SCHEME;
   }
 
-  public deprecated class AuthenticationException extends org.apache.http.ProtocolException {
-    ctor public AuthenticationException();
-    ctor public AuthenticationException(java.lang.String);
-    ctor public AuthenticationException(java.lang.String, java.lang.Throwable);
+  @Deprecated public class AuthState {
+    ctor @Deprecated public AuthState();
+    method @Deprecated public org.apache.http.auth.AuthScheme getAuthScheme();
+    method @Deprecated public org.apache.http.auth.AuthScope getAuthScope();
+    method @Deprecated public org.apache.http.auth.Credentials getCredentials();
+    method @Deprecated public void invalidate();
+    method @Deprecated public boolean isValid();
+    method @Deprecated public void setAuthScheme(org.apache.http.auth.AuthScheme);
+    method @Deprecated public void setAuthScope(org.apache.http.auth.AuthScope);
+    method @Deprecated public void setCredentials(org.apache.http.auth.Credentials);
   }
 
-  public final deprecated class BasicUserPrincipal implements java.security.Principal {
-    ctor public BasicUserPrincipal(java.lang.String);
-    method public java.lang.String getName();
+  @Deprecated public class AuthenticationException extends org.apache.http.ProtocolException {
+    ctor @Deprecated public AuthenticationException();
+    ctor @Deprecated public AuthenticationException(String);
+    ctor @Deprecated public AuthenticationException(String, Throwable);
   }
 
-  public abstract deprecated interface Credentials {
-    method public abstract java.lang.String getPassword();
-    method public abstract java.security.Principal getUserPrincipal();
+  @Deprecated public final class BasicUserPrincipal implements java.security.Principal {
+    ctor @Deprecated public BasicUserPrincipal(String);
+    method @Deprecated public String getName();
   }
 
-  public deprecated class InvalidCredentialsException extends org.apache.http.auth.AuthenticationException {
-    ctor public InvalidCredentialsException();
-    ctor public InvalidCredentialsException(java.lang.String);
-    ctor public InvalidCredentialsException(java.lang.String, java.lang.Throwable);
+  @Deprecated public interface Credentials {
+    method @Deprecated public String getPassword();
+    method @Deprecated public java.security.Principal getUserPrincipal();
   }
 
-  public deprecated class MalformedChallengeException extends org.apache.http.ProtocolException {
-    ctor public MalformedChallengeException();
-    ctor public MalformedChallengeException(java.lang.String);
-    ctor public MalformedChallengeException(java.lang.String, java.lang.Throwable);
+  @Deprecated public class InvalidCredentialsException extends org.apache.http.auth.AuthenticationException {
+    ctor @Deprecated public InvalidCredentialsException();
+    ctor @Deprecated public InvalidCredentialsException(String);
+    ctor @Deprecated public InvalidCredentialsException(String, Throwable);
   }
 
-  public deprecated class NTCredentials implements org.apache.http.auth.Credentials {
-    ctor public NTCredentials(java.lang.String);
-    ctor public NTCredentials(java.lang.String, java.lang.String, java.lang.String, java.lang.String);
-    method public java.lang.String getDomain();
-    method public java.lang.String getPassword();
-    method public java.lang.String getUserName();
-    method public java.security.Principal getUserPrincipal();
-    method public java.lang.String getWorkstation();
+  @Deprecated public class MalformedChallengeException extends org.apache.http.ProtocolException {
+    ctor @Deprecated public MalformedChallengeException();
+    ctor @Deprecated public MalformedChallengeException(String);
+    ctor @Deprecated public MalformedChallengeException(String, Throwable);
   }
 
-  public deprecated class NTUserPrincipal implements java.security.Principal {
-    ctor public NTUserPrincipal(java.lang.String, java.lang.String);
-    method public java.lang.String getDomain();
-    method public java.lang.String getName();
-    method public java.lang.String getUsername();
+  @Deprecated public class NTCredentials implements org.apache.http.auth.Credentials {
+    ctor @Deprecated public NTCredentials(String);
+    ctor @Deprecated public NTCredentials(String, String, String, String);
+    method @Deprecated public String getDomain();
+    method @Deprecated public String getPassword();
+    method @Deprecated public String getUserName();
+    method @Deprecated public java.security.Principal getUserPrincipal();
+    method @Deprecated public String getWorkstation();
   }
 
-  public deprecated class UsernamePasswordCredentials implements org.apache.http.auth.Credentials {
-    ctor public UsernamePasswordCredentials(java.lang.String);
-    ctor public UsernamePasswordCredentials(java.lang.String, java.lang.String);
-    method public java.lang.String getPassword();
-    method public java.lang.String getUserName();
-    method public java.security.Principal getUserPrincipal();
+  @Deprecated public class NTUserPrincipal implements java.security.Principal {
+    ctor @Deprecated public NTUserPrincipal(String, String);
+    method @Deprecated public String getDomain();
+    method @Deprecated public String getName();
+    method @Deprecated public String getUsername();
+  }
+
+  @Deprecated public class UsernamePasswordCredentials implements org.apache.http.auth.Credentials {
+    ctor @Deprecated public UsernamePasswordCredentials(String);
+    ctor @Deprecated public UsernamePasswordCredentials(String, String);
+    method @Deprecated public String getPassword();
+    method @Deprecated public String getUserName();
+    method @Deprecated public java.security.Principal getUserPrincipal();
   }
 
 }
 
 package org.apache.http.auth.params {
 
-  public abstract deprecated interface AuthPNames {
-    field public static final java.lang.String CREDENTIAL_CHARSET = "http.auth.credential-charset";
+  @Deprecated public interface AuthPNames {
+    field @Deprecated public static final String CREDENTIAL_CHARSET = "http.auth.credential-charset";
   }
 
-  public deprecated class AuthParamBean extends org.apache.http.params.HttpAbstractParamBean {
-    ctor public AuthParamBean(org.apache.http.params.HttpParams);
-    method public void setCredentialCharset(java.lang.String);
+  @Deprecated public class AuthParamBean extends org.apache.http.params.HttpAbstractParamBean {
+    ctor @Deprecated public AuthParamBean(org.apache.http.params.HttpParams);
+    method @Deprecated public void setCredentialCharset(String);
   }
 
-  public final deprecated class AuthParams {
-    method public static java.lang.String getCredentialCharset(org.apache.http.params.HttpParams);
-    method public static void setCredentialCharset(org.apache.http.params.HttpParams, java.lang.String);
+  @Deprecated public final class AuthParams {
+    method @Deprecated public static String getCredentialCharset(org.apache.http.params.HttpParams);
+    method @Deprecated public static void setCredentialCharset(org.apache.http.params.HttpParams, String);
   }
 
 }
 
 package org.apache.http.client {
 
-  public abstract deprecated interface AuthenticationHandler {
-    method public abstract java.util.Map<java.lang.String, org.apache.http.Header> getChallenges(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.auth.MalformedChallengeException;
-    method public abstract boolean isAuthenticationRequested(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext);
-    method public abstract org.apache.http.auth.AuthScheme selectScheme(java.util.Map<java.lang.String, org.apache.http.Header>, org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.auth.AuthenticationException;
+  @Deprecated public interface AuthenticationHandler {
+    method @Deprecated public java.util.Map<java.lang.String,org.apache.http.Header> getChallenges(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.auth.MalformedChallengeException;
+    method @Deprecated public boolean isAuthenticationRequested(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext);
+    method @Deprecated public org.apache.http.auth.AuthScheme selectScheme(java.util.Map<java.lang.String,org.apache.http.Header>, org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.auth.AuthenticationException;
   }
 
-  public deprecated class CircularRedirectException extends org.apache.http.client.RedirectException {
-    ctor public CircularRedirectException();
-    ctor public CircularRedirectException(java.lang.String);
-    ctor public CircularRedirectException(java.lang.String, java.lang.Throwable);
+  @Deprecated public class CircularRedirectException extends org.apache.http.client.RedirectException {
+    ctor @Deprecated public CircularRedirectException();
+    ctor @Deprecated public CircularRedirectException(String);
+    ctor @Deprecated public CircularRedirectException(String, Throwable);
   }
 
-  public deprecated class ClientProtocolException extends java.io.IOException {
-    ctor public ClientProtocolException();
-    ctor public ClientProtocolException(java.lang.String);
-    ctor public ClientProtocolException(java.lang.Throwable);
-    ctor public ClientProtocolException(java.lang.String, java.lang.Throwable);
+  @Deprecated public class ClientProtocolException extends java.io.IOException {
+    ctor @Deprecated public ClientProtocolException();
+    ctor @Deprecated public ClientProtocolException(String);
+    ctor @Deprecated public ClientProtocolException(Throwable);
+    ctor @Deprecated public ClientProtocolException(String, Throwable);
   }
 
-  public abstract deprecated interface CookieStore {
-    method public abstract void addCookie(org.apache.http.cookie.Cookie);
-    method public abstract void clear();
-    method public abstract boolean clearExpired(java.util.Date);
-    method public abstract java.util.List<org.apache.http.cookie.Cookie> getCookies();
+  @Deprecated public interface CookieStore {
+    method @Deprecated public void addCookie(org.apache.http.cookie.Cookie);
+    method @Deprecated public void clear();
+    method @Deprecated public boolean clearExpired(java.util.Date);
+    method @Deprecated public java.util.List<org.apache.http.cookie.Cookie> getCookies();
   }
 
-  public abstract deprecated interface CredentialsProvider {
-    method public abstract void clear();
-    method public abstract org.apache.http.auth.Credentials getCredentials(org.apache.http.auth.AuthScope);
-    method public abstract void setCredentials(org.apache.http.auth.AuthScope, org.apache.http.auth.Credentials);
+  @Deprecated public interface CredentialsProvider {
+    method @Deprecated public void clear();
+    method @Deprecated public org.apache.http.auth.Credentials getCredentials(org.apache.http.auth.AuthScope);
+    method @Deprecated public void setCredentials(org.apache.http.auth.AuthScope, org.apache.http.auth.Credentials);
   }
 
-  public abstract deprecated interface HttpClient {
-    method public abstract org.apache.http.HttpResponse execute(org.apache.http.client.methods.HttpUriRequest) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
-    method public abstract org.apache.http.HttpResponse execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
-    method public abstract org.apache.http.HttpResponse execute(org.apache.http.HttpHost, org.apache.http.HttpRequest) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
-    method public abstract org.apache.http.HttpResponse execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
-    method public abstract <T> T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler<? extends T>) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
-    method public abstract <T> T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler<? extends T>, org.apache.http.protocol.HttpContext) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
-    method public abstract <T> T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler<? extends T>) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
-    method public abstract <T> T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler<? extends T>, org.apache.http.protocol.HttpContext) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
-    method public abstract org.apache.http.conn.ClientConnectionManager getConnectionManager();
-    method public abstract org.apache.http.params.HttpParams getParams();
+  @Deprecated public interface HttpClient {
+    method @Deprecated public org.apache.http.HttpResponse execute(org.apache.http.client.methods.HttpUriRequest) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
+    method @Deprecated public org.apache.http.HttpResponse execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
+    method @Deprecated public org.apache.http.HttpResponse execute(org.apache.http.HttpHost, org.apache.http.HttpRequest) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
+    method @Deprecated public org.apache.http.HttpResponse execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
+    method @Deprecated public <T> T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler<? extends T>) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
+    method @Deprecated public <T> T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler<? extends T>, org.apache.http.protocol.HttpContext) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
+    method @Deprecated public <T> T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler<? extends T>) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
+    method @Deprecated public <T> T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler<? extends T>, org.apache.http.protocol.HttpContext) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
+    method @Deprecated public org.apache.http.conn.ClientConnectionManager getConnectionManager();
+    method @Deprecated public org.apache.http.params.HttpParams getParams();
   }
 
-  public abstract deprecated interface HttpRequestRetryHandler {
-    method public abstract boolean retryRequest(java.io.IOException, int, org.apache.http.protocol.HttpContext);
+  @Deprecated public interface HttpRequestRetryHandler {
+    method @Deprecated public boolean retryRequest(java.io.IOException, int, org.apache.http.protocol.HttpContext);
   }
 
-  public deprecated class HttpResponseException extends org.apache.http.client.ClientProtocolException {
-    ctor public HttpResponseException(int, java.lang.String);
-    method public int getStatusCode();
+  @Deprecated public class HttpResponseException extends org.apache.http.client.ClientProtocolException {
+    ctor @Deprecated public HttpResponseException(int, String);
+    method @Deprecated public int getStatusCode();
   }
 
-  public deprecated class NonRepeatableRequestException extends org.apache.http.ProtocolException {
-    ctor public NonRepeatableRequestException();
-    ctor public NonRepeatableRequestException(java.lang.String);
+  @Deprecated public class NonRepeatableRequestException extends org.apache.http.ProtocolException {
+    ctor @Deprecated public NonRepeatableRequestException();
+    ctor @Deprecated public NonRepeatableRequestException(String);
   }
 
-  public deprecated class RedirectException extends org.apache.http.ProtocolException {
-    ctor public RedirectException();
-    ctor public RedirectException(java.lang.String);
-    ctor public RedirectException(java.lang.String, java.lang.Throwable);
+  @Deprecated public class RedirectException extends org.apache.http.ProtocolException {
+    ctor @Deprecated public RedirectException();
+    ctor @Deprecated public RedirectException(String);
+    ctor @Deprecated public RedirectException(String, Throwable);
   }
 
-  public abstract deprecated interface RedirectHandler {
-    method public abstract java.net.URI getLocationURI(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.ProtocolException;
-    method public abstract boolean isRedirectRequested(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext);
+  @Deprecated public interface RedirectHandler {
+    method @Deprecated public java.net.URI getLocationURI(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.ProtocolException;
+    method @Deprecated public boolean isRedirectRequested(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext);
   }
 
-  public abstract deprecated interface RequestDirector {
-    method public abstract org.apache.http.HttpResponse execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public interface RequestDirector {
+    method @Deprecated public org.apache.http.HttpResponse execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
   }
 
-  public abstract deprecated interface ResponseHandler<T> {
-    method public abstract T handleResponse(org.apache.http.HttpResponse) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
+  @Deprecated public interface ResponseHandler<T> {
+    method @Deprecated public T handleResponse(org.apache.http.HttpResponse) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
   }
 
-  public abstract deprecated interface UserTokenHandler {
-    method public abstract java.lang.Object getUserToken(org.apache.http.protocol.HttpContext);
+  @Deprecated public interface UserTokenHandler {
+    method @Deprecated public Object getUserToken(org.apache.http.protocol.HttpContext);
   }
 
 }
 
 package org.apache.http.client.entity {
 
-  public deprecated class UrlEncodedFormEntity extends org.apache.http.entity.StringEntity {
-    ctor public UrlEncodedFormEntity(java.util.List<? extends org.apache.http.NameValuePair>, java.lang.String) throws java.io.UnsupportedEncodingException;
-    ctor public UrlEncodedFormEntity(java.util.List<? extends org.apache.http.NameValuePair>) throws java.io.UnsupportedEncodingException;
+  @Deprecated public class UrlEncodedFormEntity extends org.apache.http.entity.StringEntity {
+    ctor @Deprecated public UrlEncodedFormEntity(java.util.List<? extends org.apache.http.NameValuePair>, String) throws java.io.UnsupportedEncodingException;
+    ctor @Deprecated public UrlEncodedFormEntity(java.util.List<? extends org.apache.http.NameValuePair>) throws java.io.UnsupportedEncodingException;
   }
 
 }
 
 package org.apache.http.client.methods {
 
-  public abstract deprecated interface AbortableHttpRequest {
-    method public abstract void abort();
-    method public abstract void setConnectionRequest(org.apache.http.conn.ClientConnectionRequest) throws java.io.IOException;
-    method public abstract void setReleaseTrigger(org.apache.http.conn.ConnectionReleaseTrigger) throws java.io.IOException;
+  @Deprecated public interface AbortableHttpRequest {
+    method @Deprecated public void abort();
+    method @Deprecated public void setConnectionRequest(org.apache.http.conn.ClientConnectionRequest) throws java.io.IOException;
+    method @Deprecated public void setReleaseTrigger(org.apache.http.conn.ConnectionReleaseTrigger) throws java.io.IOException;
   }
 
-  public deprecated class HttpDelete extends org.apache.http.client.methods.HttpRequestBase {
-    ctor public HttpDelete();
-    ctor public HttpDelete(java.net.URI);
-    ctor public HttpDelete(java.lang.String);
-    method public java.lang.String getMethod();
-    field public static final java.lang.String METHOD_NAME = "DELETE";
+  @Deprecated public class HttpDelete extends org.apache.http.client.methods.HttpRequestBase {
+    ctor @Deprecated public HttpDelete();
+    ctor @Deprecated public HttpDelete(java.net.URI);
+    ctor @Deprecated public HttpDelete(String);
+    method @Deprecated public String getMethod();
+    field @Deprecated public static final String METHOD_NAME = "DELETE";
   }
 
-  public abstract deprecated class HttpEntityEnclosingRequestBase extends org.apache.http.client.methods.HttpRequestBase implements org.apache.http.HttpEntityEnclosingRequest {
-    ctor public HttpEntityEnclosingRequestBase();
-    method public boolean expectContinue();
-    method public org.apache.http.HttpEntity getEntity();
-    method public void setEntity(org.apache.http.HttpEntity);
+  @Deprecated public abstract class HttpEntityEnclosingRequestBase extends org.apache.http.client.methods.HttpRequestBase implements org.apache.http.HttpEntityEnclosingRequest {
+    ctor @Deprecated public HttpEntityEnclosingRequestBase();
+    method @Deprecated public boolean expectContinue();
+    method @Deprecated public org.apache.http.HttpEntity getEntity();
+    method @Deprecated public void setEntity(org.apache.http.HttpEntity);
   }
 
-  public deprecated class HttpGet extends org.apache.http.client.methods.HttpRequestBase {
-    ctor public HttpGet();
-    ctor public HttpGet(java.net.URI);
-    ctor public HttpGet(java.lang.String);
-    method public java.lang.String getMethod();
-    field public static final java.lang.String METHOD_NAME = "GET";
+  @Deprecated public class HttpGet extends org.apache.http.client.methods.HttpRequestBase {
+    ctor @Deprecated public HttpGet();
+    ctor @Deprecated public HttpGet(java.net.URI);
+    ctor @Deprecated public HttpGet(String);
+    method @Deprecated public String getMethod();
+    field @Deprecated public static final String METHOD_NAME = "GET";
   }
 
-  public deprecated class HttpHead extends org.apache.http.client.methods.HttpRequestBase {
-    ctor public HttpHead();
-    ctor public HttpHead(java.net.URI);
-    ctor public HttpHead(java.lang.String);
-    method public java.lang.String getMethod();
-    field public static final java.lang.String METHOD_NAME = "HEAD";
+  @Deprecated public class HttpHead extends org.apache.http.client.methods.HttpRequestBase {
+    ctor @Deprecated public HttpHead();
+    ctor @Deprecated public HttpHead(java.net.URI);
+    ctor @Deprecated public HttpHead(String);
+    method @Deprecated public String getMethod();
+    field @Deprecated public static final String METHOD_NAME = "HEAD";
   }
 
-  public deprecated class HttpOptions extends org.apache.http.client.methods.HttpRequestBase {
-    ctor public HttpOptions();
-    ctor public HttpOptions(java.net.URI);
-    ctor public HttpOptions(java.lang.String);
-    method public java.util.Set<java.lang.String> getAllowedMethods(org.apache.http.HttpResponse);
-    method public java.lang.String getMethod();
-    field public static final java.lang.String METHOD_NAME = "OPTIONS";
+  @Deprecated public class HttpOptions extends org.apache.http.client.methods.HttpRequestBase {
+    ctor @Deprecated public HttpOptions();
+    ctor @Deprecated public HttpOptions(java.net.URI);
+    ctor @Deprecated public HttpOptions(String);
+    method @Deprecated public java.util.Set<java.lang.String> getAllowedMethods(org.apache.http.HttpResponse);
+    method @Deprecated public String getMethod();
+    field @Deprecated public static final String METHOD_NAME = "OPTIONS";
   }
 
-  public deprecated class HttpPost extends org.apache.http.client.methods.HttpEntityEnclosingRequestBase {
-    ctor public HttpPost();
-    ctor public HttpPost(java.net.URI);
-    ctor public HttpPost(java.lang.String);
-    method public java.lang.String getMethod();
-    field public static final java.lang.String METHOD_NAME = "POST";
+  @Deprecated public class HttpPost extends org.apache.http.client.methods.HttpEntityEnclosingRequestBase {
+    ctor @Deprecated public HttpPost();
+    ctor @Deprecated public HttpPost(java.net.URI);
+    ctor @Deprecated public HttpPost(String);
+    method @Deprecated public String getMethod();
+    field @Deprecated public static final String METHOD_NAME = "POST";
   }
 
-  public deprecated class HttpPut extends org.apache.http.client.methods.HttpEntityEnclosingRequestBase {
-    ctor public HttpPut();
-    ctor public HttpPut(java.net.URI);
-    ctor public HttpPut(java.lang.String);
-    method public java.lang.String getMethod();
-    field public static final java.lang.String METHOD_NAME = "PUT";
+  @Deprecated public class HttpPut extends org.apache.http.client.methods.HttpEntityEnclosingRequestBase {
+    ctor @Deprecated public HttpPut();
+    ctor @Deprecated public HttpPut(java.net.URI);
+    ctor @Deprecated public HttpPut(String);
+    method @Deprecated public String getMethod();
+    field @Deprecated public static final String METHOD_NAME = "PUT";
   }
 
-  public abstract deprecated class HttpRequestBase extends org.apache.http.message.AbstractHttpMessage implements org.apache.http.client.methods.AbortableHttpRequest java.lang.Cloneable org.apache.http.client.methods.HttpUriRequest {
-    ctor public HttpRequestBase();
-    method public void abort();
-    method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
-    method public org.apache.http.ProtocolVersion getProtocolVersion();
-    method public org.apache.http.RequestLine getRequestLine();
-    method public java.net.URI getURI();
-    method public boolean isAborted();
-    method public void setConnectionRequest(org.apache.http.conn.ClientConnectionRequest) throws java.io.IOException;
-    method public void setReleaseTrigger(org.apache.http.conn.ConnectionReleaseTrigger) throws java.io.IOException;
-    method public void setURI(java.net.URI);
+  @Deprecated public abstract class HttpRequestBase extends org.apache.http.message.AbstractHttpMessage implements org.apache.http.client.methods.AbortableHttpRequest java.lang.Cloneable org.apache.http.client.methods.HttpUriRequest {
+    ctor @Deprecated public HttpRequestBase();
+    method @Deprecated public void abort();
+    method @Deprecated public Object clone() throws java.lang.CloneNotSupportedException;
+    method @Deprecated public org.apache.http.ProtocolVersion getProtocolVersion();
+    method @Deprecated public org.apache.http.RequestLine getRequestLine();
+    method @Deprecated public java.net.URI getURI();
+    method @Deprecated public boolean isAborted();
+    method @Deprecated public void setConnectionRequest(org.apache.http.conn.ClientConnectionRequest) throws java.io.IOException;
+    method @Deprecated public void setReleaseTrigger(org.apache.http.conn.ConnectionReleaseTrigger) throws java.io.IOException;
+    method @Deprecated public void setURI(java.net.URI);
   }
 
-  public deprecated class HttpTrace extends org.apache.http.client.methods.HttpRequestBase {
-    ctor public HttpTrace();
-    ctor public HttpTrace(java.net.URI);
-    ctor public HttpTrace(java.lang.String);
-    method public java.lang.String getMethod();
-    field public static final java.lang.String METHOD_NAME = "TRACE";
+  @Deprecated public class HttpTrace extends org.apache.http.client.methods.HttpRequestBase {
+    ctor @Deprecated public HttpTrace();
+    ctor @Deprecated public HttpTrace(java.net.URI);
+    ctor @Deprecated public HttpTrace(String);
+    method @Deprecated public String getMethod();
+    field @Deprecated public static final String METHOD_NAME = "TRACE";
   }
 
-  public abstract deprecated interface HttpUriRequest implements org.apache.http.HttpRequest {
-    method public abstract void abort() throws java.lang.UnsupportedOperationException;
-    method public abstract java.lang.String getMethod();
-    method public abstract java.net.URI getURI();
-    method public abstract boolean isAborted();
+  @Deprecated public interface HttpUriRequest extends org.apache.http.HttpRequest {
+    method @Deprecated public void abort() throws java.lang.UnsupportedOperationException;
+    method @Deprecated public String getMethod();
+    method @Deprecated public java.net.URI getURI();
+    method @Deprecated public boolean isAborted();
   }
 
 }
 
 package org.apache.http.client.params {
 
-  public abstract deprecated interface AllClientPNames implements org.apache.http.auth.params.AuthPNames org.apache.http.client.params.ClientPNames org.apache.http.conn.params.ConnConnectionPNames org.apache.http.conn.params.ConnManagerPNames org.apache.http.conn.params.ConnRoutePNames org.apache.http.cookie.params.CookieSpecPNames org.apache.http.params.CoreConnectionPNames org.apache.http.params.CoreProtocolPNames {
-  }
-
-  public final deprecated class AuthPolicy {
-    field public static final java.lang.String BASIC = "Basic";
-    field public static final java.lang.String DIGEST = "Digest";
-    field public static final java.lang.String NTLM = "NTLM";
-  }
-
-  public abstract deprecated interface ClientPNames {
-    field public static final java.lang.String ALLOW_CIRCULAR_REDIRECTS = "http.protocol.allow-circular-redirects";
-    field public static final java.lang.String CONNECTION_MANAGER_FACTORY = "http.connection-manager.factory-object";
-    field public static final java.lang.String CONNECTION_MANAGER_FACTORY_CLASS_NAME = "http.connection-manager.factory-class-name";
-    field public static final java.lang.String COOKIE_POLICY = "http.protocol.cookie-policy";
-    field public static final java.lang.String DEFAULT_HEADERS = "http.default-headers";
-    field public static final java.lang.String DEFAULT_HOST = "http.default-host";
-    field public static final java.lang.String HANDLE_AUTHENTICATION = "http.protocol.handle-authentication";
-    field public static final java.lang.String HANDLE_REDIRECTS = "http.protocol.handle-redirects";
-    field public static final java.lang.String MAX_REDIRECTS = "http.protocol.max-redirects";
-    field public static final java.lang.String REJECT_RELATIVE_REDIRECT = "http.protocol.reject-relative-redirect";
-    field public static final java.lang.String VIRTUAL_HOST = "http.virtual-host";
-  }
-
-  public deprecated class ClientParamBean extends org.apache.http.params.HttpAbstractParamBean {
-    ctor public ClientParamBean(org.apache.http.params.HttpParams);
-    method public void setAllowCircularRedirects(boolean);
-    method public void setConnectionManagerFactory(org.apache.http.conn.ClientConnectionManagerFactory);
-    method public void setConnectionManagerFactoryClassName(java.lang.String);
-    method public void setCookiePolicy(java.lang.String);
-    method public void setDefaultHeaders(java.util.Collection<org.apache.http.Header>);
-    method public void setDefaultHost(org.apache.http.HttpHost);
-    method public void setHandleAuthentication(boolean);
-    method public void setHandleRedirects(boolean);
-    method public void setMaxRedirects(int);
-    method public void setRejectRelativeRedirect(boolean);
-    method public void setVirtualHost(org.apache.http.HttpHost);
-  }
-
-  public final deprecated class CookiePolicy {
-    field public static final java.lang.String BEST_MATCH = "best-match";
-    field public static final java.lang.String BROWSER_COMPATIBILITY = "compatibility";
-    field public static final java.lang.String NETSCAPE = "netscape";
-    field public static final java.lang.String RFC_2109 = "rfc2109";
-    field public static final java.lang.String RFC_2965 = "rfc2965";
-  }
-
-  public deprecated class HttpClientParams {
-    method public static java.lang.String getCookiePolicy(org.apache.http.params.HttpParams);
-    method public static boolean isAuthenticating(org.apache.http.params.HttpParams);
-    method public static boolean isRedirecting(org.apache.http.params.HttpParams);
-    method public static void setAuthenticating(org.apache.http.params.HttpParams, boolean);
-    method public static void setCookiePolicy(org.apache.http.params.HttpParams, java.lang.String);
-    method public static void setRedirecting(org.apache.http.params.HttpParams, boolean);
+  @Deprecated public interface AllClientPNames extends org.apache.http.params.CoreConnectionPNames org.apache.http.auth.params.AuthPNames org.apache.http.client.params.ClientPNames org.apache.http.conn.params.ConnConnectionPNames org.apache.http.conn.params.ConnManagerPNames org.apache.http.conn.params.ConnRoutePNames org.apache.http.cookie.params.CookieSpecPNames org.apache.http.params.CoreProtocolPNames {
+  }
+
+  @Deprecated public final class AuthPolicy {
+    field @Deprecated public static final String BASIC = "Basic";
+    field @Deprecated public static final String DIGEST = "Digest";
+    field @Deprecated public static final String NTLM = "NTLM";
+  }
+
+  @Deprecated public interface ClientPNames {
+    field @Deprecated public static final String ALLOW_CIRCULAR_REDIRECTS = "http.protocol.allow-circular-redirects";
+    field @Deprecated public static final String CONNECTION_MANAGER_FACTORY = "http.connection-manager.factory-object";
+    field @Deprecated public static final String CONNECTION_MANAGER_FACTORY_CLASS_NAME = "http.connection-manager.factory-class-name";
+    field @Deprecated public static final String COOKIE_POLICY = "http.protocol.cookie-policy";
+    field @Deprecated public static final String DEFAULT_HEADERS = "http.default-headers";
+    field @Deprecated public static final String DEFAULT_HOST = "http.default-host";
+    field @Deprecated public static final String HANDLE_AUTHENTICATION = "http.protocol.handle-authentication";
+    field @Deprecated public static final String HANDLE_REDIRECTS = "http.protocol.handle-redirects";
+    field @Deprecated public static final String MAX_REDIRECTS = "http.protocol.max-redirects";
+    field @Deprecated public static final String REJECT_RELATIVE_REDIRECT = "http.protocol.reject-relative-redirect";
+    field @Deprecated public static final String VIRTUAL_HOST = "http.virtual-host";
+  }
+
+  @Deprecated public class ClientParamBean extends org.apache.http.params.HttpAbstractParamBean {
+    ctor @Deprecated public ClientParamBean(org.apache.http.params.HttpParams);
+    method @Deprecated public void setAllowCircularRedirects(boolean);
+    method @Deprecated public void setConnectionManagerFactory(org.apache.http.conn.ClientConnectionManagerFactory);
+    method @Deprecated public void setConnectionManagerFactoryClassName(String);
+    method @Deprecated public void setCookiePolicy(String);
+    method @Deprecated public void setDefaultHeaders(java.util.Collection<org.apache.http.Header>);
+    method @Deprecated public void setDefaultHost(org.apache.http.HttpHost);
+    method @Deprecated public void setHandleAuthentication(boolean);
+    method @Deprecated public void setHandleRedirects(boolean);
+    method @Deprecated public void setMaxRedirects(int);
+    method @Deprecated public void setRejectRelativeRedirect(boolean);
+    method @Deprecated public void setVirtualHost(org.apache.http.HttpHost);
+  }
+
+  @Deprecated public final class CookiePolicy {
+    field @Deprecated public static final String BEST_MATCH = "best-match";
+    field @Deprecated public static final String BROWSER_COMPATIBILITY = "compatibility";
+    field @Deprecated public static final String NETSCAPE = "netscape";
+    field @Deprecated public static final String RFC_2109 = "rfc2109";
+    field @Deprecated public static final String RFC_2965 = "rfc2965";
+  }
+
+  @Deprecated public class HttpClientParams {
+    method @Deprecated public static String getCookiePolicy(org.apache.http.params.HttpParams);
+    method @Deprecated public static boolean isAuthenticating(org.apache.http.params.HttpParams);
+    method @Deprecated public static boolean isRedirecting(org.apache.http.params.HttpParams);
+    method @Deprecated public static void setAuthenticating(org.apache.http.params.HttpParams, boolean);
+    method @Deprecated public static void setCookiePolicy(org.apache.http.params.HttpParams, String);
+    method @Deprecated public static void setRedirecting(org.apache.http.params.HttpParams, boolean);
   }
 
 }
 
 package org.apache.http.client.protocol {
 
-  public abstract deprecated interface ClientContext {
-    field public static final java.lang.String AUTHSCHEME_REGISTRY = "http.authscheme-registry";
-    field public static final java.lang.String AUTH_SCHEME_PREF = "http.auth.scheme-pref";
-    field public static final java.lang.String COOKIESPEC_REGISTRY = "http.cookiespec-registry";
-    field public static final java.lang.String COOKIE_ORIGIN = "http.cookie-origin";
-    field public static final java.lang.String COOKIE_SPEC = "http.cookie-spec";
-    field public static final java.lang.String COOKIE_STORE = "http.cookie-store";
-    field public static final java.lang.String CREDS_PROVIDER = "http.auth.credentials-provider";
-    field public static final java.lang.String PROXY_AUTH_STATE = "http.auth.proxy-scope";
-    field public static final java.lang.String TARGET_AUTH_STATE = "http.auth.target-scope";
-    field public static final java.lang.String USER_TOKEN = "http.user-token";
+  @Deprecated public interface ClientContext {
+    field @Deprecated public static final String AUTHSCHEME_REGISTRY = "http.authscheme-registry";
+    field @Deprecated public static final String AUTH_SCHEME_PREF = "http.auth.scheme-pref";
+    field @Deprecated public static final String COOKIESPEC_REGISTRY = "http.cookiespec-registry";
+    field @Deprecated public static final String COOKIE_ORIGIN = "http.cookie-origin";
+    field @Deprecated public static final String COOKIE_SPEC = "http.cookie-spec";
+    field @Deprecated public static final String COOKIE_STORE = "http.cookie-store";
+    field @Deprecated public static final String CREDS_PROVIDER = "http.auth.credentials-provider";
+    field @Deprecated public static final String PROXY_AUTH_STATE = "http.auth.proxy-scope";
+    field @Deprecated public static final String TARGET_AUTH_STATE = "http.auth.target-scope";
+    field @Deprecated public static final String USER_TOKEN = "http.user-token";
   }
 
-  public deprecated class ClientContextConfigurer implements org.apache.http.client.protocol.ClientContext {
-    ctor public ClientContextConfigurer(org.apache.http.protocol.HttpContext);
-    method public void setAuthSchemePref(java.util.List<java.lang.String>);
-    method public void setAuthSchemeRegistry(org.apache.http.auth.AuthSchemeRegistry);
-    method public void setCookieSpecRegistry(org.apache.http.cookie.CookieSpecRegistry);
-    method public void setCookieStore(org.apache.http.client.CookieStore);
-    method public void setCredentialsProvider(org.apache.http.client.CredentialsProvider);
+  @Deprecated public class ClientContextConfigurer implements org.apache.http.client.protocol.ClientContext {
+    ctor @Deprecated public ClientContextConfigurer(org.apache.http.protocol.HttpContext);
+    method @Deprecated public void setAuthSchemePref(java.util.List<java.lang.String>);
+    method @Deprecated public void setAuthSchemeRegistry(org.apache.http.auth.AuthSchemeRegistry);
+    method @Deprecated public void setCookieSpecRegistry(org.apache.http.cookie.CookieSpecRegistry);
+    method @Deprecated public void setCookieStore(org.apache.http.client.CookieStore);
+    method @Deprecated public void setCredentialsProvider(org.apache.http.client.CredentialsProvider);
   }
 
-  public deprecated class RequestAddCookies implements org.apache.http.HttpRequestInterceptor {
-    ctor public RequestAddCookies();
-    method public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public class RequestAddCookies implements org.apache.http.HttpRequestInterceptor {
+    ctor @Deprecated public RequestAddCookies();
+    method @Deprecated public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
   }
 
-  public deprecated class RequestDefaultHeaders implements org.apache.http.HttpRequestInterceptor {
-    ctor public RequestDefaultHeaders();
-    method public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public class RequestDefaultHeaders implements org.apache.http.HttpRequestInterceptor {
+    ctor @Deprecated public RequestDefaultHeaders();
+    method @Deprecated public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
   }
 
-  public deprecated class RequestProxyAuthentication implements org.apache.http.HttpRequestInterceptor {
-    ctor public RequestProxyAuthentication();
-    method public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public class RequestProxyAuthentication implements org.apache.http.HttpRequestInterceptor {
+    ctor @Deprecated public RequestProxyAuthentication();
+    method @Deprecated public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
   }
 
-  public deprecated class RequestTargetAuthentication implements org.apache.http.HttpRequestInterceptor {
-    ctor public RequestTargetAuthentication();
-    method public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public class RequestTargetAuthentication implements org.apache.http.HttpRequestInterceptor {
+    ctor @Deprecated public RequestTargetAuthentication();
+    method @Deprecated public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
   }
 
-  public deprecated class ResponseProcessCookies implements org.apache.http.HttpResponseInterceptor {
-    ctor public ResponseProcessCookies();
-    method public void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public class ResponseProcessCookies implements org.apache.http.HttpResponseInterceptor {
+    ctor @Deprecated public ResponseProcessCookies();
+    method @Deprecated public void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
   }
 
 }
 
 package org.apache.http.client.utils {
 
-  public deprecated class CloneUtils {
-    method public static java.lang.Object clone(java.lang.Object) throws java.lang.CloneNotSupportedException;
+  @Deprecated public class CloneUtils {
+    method @Deprecated public static Object clone(Object) throws java.lang.CloneNotSupportedException;
   }
 
-  public deprecated class URIUtils {
-    method public static java.net.URI createURI(java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, java.lang.String) throws java.net.URISyntaxException;
-    method public static java.net.URI resolve(java.net.URI, java.lang.String);
-    method public static java.net.URI resolve(java.net.URI, java.net.URI);
-    method public static java.net.URI rewriteURI(java.net.URI, org.apache.http.HttpHost, boolean) throws java.net.URISyntaxException;
-    method public static java.net.URI rewriteURI(java.net.URI, org.apache.http.HttpHost) throws java.net.URISyntaxException;
+  @Deprecated public class URIUtils {
+    method @Deprecated public static java.net.URI createURI(String, String, int, String, String, String) throws java.net.URISyntaxException;
+    method @Deprecated public static java.net.URI resolve(java.net.URI, String);
+    method @Deprecated public static java.net.URI resolve(java.net.URI, java.net.URI);
+    method @Deprecated public static java.net.URI rewriteURI(java.net.URI, org.apache.http.HttpHost, boolean) throws java.net.URISyntaxException;
+    method @Deprecated public static java.net.URI rewriteURI(java.net.URI, org.apache.http.HttpHost) throws java.net.URISyntaxException;
   }
 
-  public deprecated class URLEncodedUtils {
-    ctor public URLEncodedUtils();
-    method public static java.lang.String format(java.util.List<? extends org.apache.http.NameValuePair>, java.lang.String);
-    method public static boolean isEncoded(org.apache.http.HttpEntity);
-    method public static java.util.List<org.apache.http.NameValuePair> parse(java.net.URI, java.lang.String);
-    method public static java.util.List<org.apache.http.NameValuePair> parse(org.apache.http.HttpEntity) throws java.io.IOException;
-    method public static void parse(java.util.List<org.apache.http.NameValuePair>, java.util.Scanner, java.lang.String);
-    field public static final java.lang.String CONTENT_TYPE = "application/x-www-form-urlencoded";
+  @Deprecated public class URLEncodedUtils {
+    ctor @Deprecated public URLEncodedUtils();
+    method @Deprecated public static String format(java.util.List<? extends org.apache.http.NameValuePair>, String);
+    method @Deprecated public static boolean isEncoded(org.apache.http.HttpEntity);
+    method @Deprecated public static java.util.List<org.apache.http.NameValuePair> parse(java.net.URI, String);
+    method @Deprecated public static java.util.List<org.apache.http.NameValuePair> parse(org.apache.http.HttpEntity) throws java.io.IOException;
+    method @Deprecated public static void parse(java.util.List<org.apache.http.NameValuePair>, java.util.Scanner, String);
+    field @Deprecated public static final String CONTENT_TYPE = "application/x-www-form-urlencoded";
   }
 
 }
 
 package org.apache.http.conn {
 
-  public deprecated class BasicEofSensorWatcher implements org.apache.http.conn.EofSensorWatcher {
-    ctor public BasicEofSensorWatcher(org.apache.http.conn.ManagedClientConnection, boolean);
-    method public boolean eofDetected(java.io.InputStream) throws java.io.IOException;
-    method public boolean streamAbort(java.io.InputStream) throws java.io.IOException;
-    method public boolean streamClosed(java.io.InputStream) throws java.io.IOException;
-    field protected boolean attemptReuse;
-    field protected org.apache.http.conn.ManagedClientConnection managedConn;
+  @Deprecated public class BasicEofSensorWatcher implements org.apache.http.conn.EofSensorWatcher {
+    ctor @Deprecated public BasicEofSensorWatcher(org.apache.http.conn.ManagedClientConnection, boolean);
+    method @Deprecated public boolean eofDetected(java.io.InputStream) throws java.io.IOException;
+    method @Deprecated public boolean streamAbort(java.io.InputStream) throws java.io.IOException;
+    method @Deprecated public boolean streamClosed(java.io.InputStream) throws java.io.IOException;
+    field @Deprecated protected boolean attemptReuse;
+    field @Deprecated protected org.apache.http.conn.ManagedClientConnection managedConn;
   }
 
-  public deprecated class BasicManagedEntity extends org.apache.http.entity.HttpEntityWrapper implements org.apache.http.conn.ConnectionReleaseTrigger org.apache.http.conn.EofSensorWatcher {
-    ctor public BasicManagedEntity(org.apache.http.HttpEntity, org.apache.http.conn.ManagedClientConnection, boolean);
-    method public void abortConnection() throws java.io.IOException;
-    method public boolean eofDetected(java.io.InputStream) throws java.io.IOException;
-    method public void releaseConnection() throws java.io.IOException;
-    method protected void releaseManagedConnection() throws java.io.IOException;
-    method public boolean streamAbort(java.io.InputStream) throws java.io.IOException;
-    method public boolean streamClosed(java.io.InputStream) throws java.io.IOException;
-    field protected final boolean attemptReuse;
-    field protected org.apache.http.conn.ManagedClientConnection managedConn;
+  @Deprecated public class BasicManagedEntity extends org.apache.http.entity.HttpEntityWrapper implements org.apache.http.conn.ConnectionReleaseTrigger org.apache.http.conn.EofSensorWatcher {
+    ctor @Deprecated public BasicManagedEntity(org.apache.http.HttpEntity, org.apache.http.conn.ManagedClientConnection, boolean);
+    method @Deprecated public void abortConnection() throws java.io.IOException;
+    method @Deprecated public boolean eofDetected(java.io.InputStream) throws java.io.IOException;
+    method @Deprecated public void releaseConnection() throws java.io.IOException;
+    method @Deprecated protected void releaseManagedConnection() throws java.io.IOException;
+    method @Deprecated public boolean streamAbort(java.io.InputStream) throws java.io.IOException;
+    method @Deprecated public boolean streamClosed(java.io.InputStream) throws java.io.IOException;
+    field @Deprecated protected final boolean attemptReuse;
+    field @Deprecated protected org.apache.http.conn.ManagedClientConnection managedConn;
   }
 
-  public abstract deprecated interface ClientConnectionManager {
-    method public abstract void closeExpiredConnections();
-    method public abstract void closeIdleConnections(long, java.util.concurrent.TimeUnit);
-    method public abstract org.apache.http.conn.scheme.SchemeRegistry getSchemeRegistry();
-    method public abstract void releaseConnection(org.apache.http.conn.ManagedClientConnection, long, java.util.concurrent.TimeUnit);
-    method public abstract org.apache.http.conn.ClientConnectionRequest requestConnection(org.apache.http.conn.routing.HttpRoute, java.lang.Object);
-    method public abstract void shutdown();
+  @Deprecated public interface ClientConnectionManager {
+    method @Deprecated public void closeExpiredConnections();
+    method @Deprecated public void closeIdleConnections(long, java.util.concurrent.TimeUnit);
+    method @Deprecated public org.apache.http.conn.scheme.SchemeRegistry getSchemeRegistry();
+    method @Deprecated public void releaseConnection(org.apache.http.conn.ManagedClientConnection, long, java.util.concurrent.TimeUnit);
+    method @Deprecated public org.apache.http.conn.ClientConnectionRequest requestConnection(org.apache.http.conn.routing.HttpRoute, Object);
+    method @Deprecated public void shutdown();
   }
 
-  public abstract deprecated interface ClientConnectionManagerFactory {
-    method public abstract org.apache.http.conn.ClientConnectionManager newInstance(org.apache.http.params.HttpParams, org.apache.http.conn.scheme.SchemeRegistry);
+  @Deprecated public interface ClientConnectionManagerFactory {
+    method @Deprecated public org.apache.http.conn.ClientConnectionManager newInstance(org.apache.http.params.HttpParams, org.apache.http.conn.scheme.SchemeRegistry);
   }
 
-  public abstract deprecated interface ClientConnectionOperator {
-    method public abstract org.apache.http.conn.OperatedClientConnection createConnection();
-    method public abstract void openConnection(org.apache.http.conn.OperatedClientConnection, org.apache.http.HttpHost, java.net.InetAddress, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public abstract void updateSecureConnection(org.apache.http.conn.OperatedClientConnection, org.apache.http.HttpHost, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
+  @Deprecated public interface ClientConnectionOperator {
+    method @Deprecated public org.apache.http.conn.OperatedClientConnection createConnection();
+    method @Deprecated public void openConnection(org.apache.http.conn.OperatedClientConnection, org.apache.http.HttpHost, java.net.InetAddress, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public void updateSecureConnection(org.apache.http.conn.OperatedClientConnection, org.apache.http.HttpHost, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
   }
 
-  public abstract deprecated interface ClientConnectionRequest {
-    method public abstract void abortRequest();
-    method public abstract org.apache.http.conn.ManagedClientConnection getConnection(long, java.util.concurrent.TimeUnit) throws org.apache.http.conn.ConnectionPoolTimeoutException, java.lang.InterruptedException;
+  @Deprecated public interface ClientConnectionRequest {
+    method @Deprecated public void abortRequest();
+    method @Deprecated public org.apache.http.conn.ManagedClientConnection getConnection(long, java.util.concurrent.TimeUnit) throws org.apache.http.conn.ConnectionPoolTimeoutException, java.lang.InterruptedException;
   }
 
-  public deprecated class ConnectTimeoutException extends java.io.InterruptedIOException {
-    ctor public ConnectTimeoutException();
-    ctor public ConnectTimeoutException(java.lang.String);
+  @Deprecated public class ConnectTimeoutException extends java.io.InterruptedIOException {
+    ctor @Deprecated public ConnectTimeoutException();
+    ctor @Deprecated public ConnectTimeoutException(String);
   }
 
-  public abstract deprecated interface ConnectionKeepAliveStrategy {
-    method public abstract long getKeepAliveDuration(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext);
+  @Deprecated public interface ConnectionKeepAliveStrategy {
+    method @Deprecated public long getKeepAliveDuration(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext);
   }
 
-  public deprecated class ConnectionPoolTimeoutException extends org.apache.http.conn.ConnectTimeoutException {
-    ctor public ConnectionPoolTimeoutException();
-    ctor public ConnectionPoolTimeoutException(java.lang.String);
+  @Deprecated public class ConnectionPoolTimeoutException extends org.apache.http.conn.ConnectTimeoutException {
+    ctor @Deprecated public ConnectionPoolTimeoutException();
+    ctor @Deprecated public ConnectionPoolTimeoutException(String);
   }
 
-  public abstract deprecated interface ConnectionReleaseTrigger {
-    method public abstract void abortConnection() throws java.io.IOException;
-    method public abstract void releaseConnection() throws java.io.IOException;
+  @Deprecated public interface ConnectionReleaseTrigger {
+    method @Deprecated public void abortConnection() throws java.io.IOException;
+    method @Deprecated public void releaseConnection() throws java.io.IOException;
   }
 
-  public deprecated class EofSensorInputStream extends java.io.InputStream implements org.apache.http.conn.ConnectionReleaseTrigger {
-    ctor public EofSensorInputStream(java.io.InputStream, org.apache.http.conn.EofSensorWatcher);
-    method public void abortConnection() throws java.io.IOException;
-    method protected void checkAbort() throws java.io.IOException;
-    method protected void checkClose() throws java.io.IOException;
-    method protected void checkEOF(int) throws java.io.IOException;
-    method protected boolean isReadAllowed() throws java.io.IOException;
-    method public int read() throws java.io.IOException;
-    method public void releaseConnection() throws java.io.IOException;
-    field protected java.io.InputStream wrappedStream;
+  @Deprecated public class EofSensorInputStream extends java.io.InputStream implements org.apache.http.conn.ConnectionReleaseTrigger {
+    ctor @Deprecated public EofSensorInputStream(java.io.InputStream, org.apache.http.conn.EofSensorWatcher);
+    method @Deprecated public void abortConnection() throws java.io.IOException;
+    method @Deprecated protected void checkAbort() throws java.io.IOException;
+    method @Deprecated protected void checkClose() throws java.io.IOException;
+    method @Deprecated protected void checkEOF(int) throws java.io.IOException;
+    method @Deprecated protected boolean isReadAllowed() throws java.io.IOException;
+    method @Deprecated public int read() throws java.io.IOException;
+    method @Deprecated public void releaseConnection() throws java.io.IOException;
+    field @Deprecated protected java.io.InputStream wrappedStream;
   }
 
-  public abstract deprecated interface EofSensorWatcher {
-    method public abstract boolean eofDetected(java.io.InputStream) throws java.io.IOException;
-    method public abstract boolean streamAbort(java.io.InputStream) throws java.io.IOException;
-    method public abstract boolean streamClosed(java.io.InputStream) throws java.io.IOException;
+  @Deprecated public interface EofSensorWatcher {
+    method @Deprecated public boolean eofDetected(java.io.InputStream) throws java.io.IOException;
+    method @Deprecated public boolean streamAbort(java.io.InputStream) throws java.io.IOException;
+    method @Deprecated public boolean streamClosed(java.io.InputStream) throws java.io.IOException;
   }
 
-  public deprecated class HttpHostConnectException extends java.net.ConnectException {
-    ctor public HttpHostConnectException(org.apache.http.HttpHost, java.net.ConnectException);
-    method public org.apache.http.HttpHost getHost();
+  @Deprecated public class HttpHostConnectException extends java.net.ConnectException {
+    ctor @Deprecated public HttpHostConnectException(org.apache.http.HttpHost, java.net.ConnectException);
+    method @Deprecated public org.apache.http.HttpHost getHost();
   }
 
-  public abstract deprecated interface ManagedClientConnection implements org.apache.http.conn.ConnectionReleaseTrigger org.apache.http.HttpClientConnection org.apache.http.HttpInetConnection {
-    method public abstract org.apache.http.conn.routing.HttpRoute getRoute();
-    method public abstract javax.net.ssl.SSLSession getSSLSession();
-    method public abstract java.lang.Object getState();
-    method public abstract boolean isMarkedReusable();
-    method public abstract boolean isSecure();
-    method public abstract void layerProtocol(org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public abstract void markReusable();
-    method public abstract void open(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public abstract void setIdleDuration(long, java.util.concurrent.TimeUnit);
-    method public abstract void setState(java.lang.Object);
-    method public abstract void tunnelProxy(org.apache.http.HttpHost, boolean, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public abstract void tunnelTarget(boolean, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public abstract void unmarkReusable();
+  @Deprecated public interface ManagedClientConnection extends org.apache.http.HttpClientConnection org.apache.http.conn.ConnectionReleaseTrigger org.apache.http.HttpInetConnection {
+    method @Deprecated public org.apache.http.conn.routing.HttpRoute getRoute();
+    method @Deprecated public javax.net.ssl.SSLSession getSSLSession();
+    method @Deprecated public Object getState();
+    method @Deprecated public boolean isMarkedReusable();
+    method @Deprecated public boolean isSecure();
+    method @Deprecated public void layerProtocol(org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public void markReusable();
+    method @Deprecated public void open(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public void setIdleDuration(long, java.util.concurrent.TimeUnit);
+    method @Deprecated public void setState(Object);
+    method @Deprecated public void tunnelProxy(org.apache.http.HttpHost, boolean, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public void tunnelTarget(boolean, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public void unmarkReusable();
   }
 
-  public final deprecated class MultihomePlainSocketFactory implements org.apache.http.conn.scheme.SocketFactory {
-    method public java.net.Socket connectSocket(java.net.Socket, java.lang.String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public java.net.Socket createSocket();
-    method public static org.apache.http.conn.MultihomePlainSocketFactory getSocketFactory();
-    method public boolean isSecure(java.net.Socket) throws java.lang.IllegalArgumentException;
+  @Deprecated public final class MultihomePlainSocketFactory implements org.apache.http.conn.scheme.SocketFactory {
+    method @Deprecated public java.net.Socket connectSocket(java.net.Socket, String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public java.net.Socket createSocket();
+    method @Deprecated public static org.apache.http.conn.MultihomePlainSocketFactory getSocketFactory();
+    method @Deprecated public boolean isSecure(java.net.Socket) throws java.lang.IllegalArgumentException;
   }
 
-  public abstract deprecated interface OperatedClientConnection implements org.apache.http.HttpClientConnection org.apache.http.HttpInetConnection {
-    method public abstract java.net.Socket getSocket();
-    method public abstract org.apache.http.HttpHost getTargetHost();
-    method public abstract boolean isSecure();
-    method public abstract void openCompleted(boolean, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public abstract void opening(java.net.Socket, org.apache.http.HttpHost) throws java.io.IOException;
-    method public abstract void update(java.net.Socket, org.apache.http.HttpHost, boolean, org.apache.http.params.HttpParams) throws java.io.IOException;
+  @Deprecated public interface OperatedClientConnection extends org.apache.http.HttpClientConnection org.apache.http.HttpInetConnection {
+    method @Deprecated public java.net.Socket getSocket();
+    method @Deprecated public org.apache.http.HttpHost getTargetHost();
+    method @Deprecated public boolean isSecure();
+    method @Deprecated public void openCompleted(boolean, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public void opening(java.net.Socket, org.apache.http.HttpHost) throws java.io.IOException;
+    method @Deprecated public void update(java.net.Socket, org.apache.http.HttpHost, boolean, org.apache.http.params.HttpParams) throws java.io.IOException;
   }
 
 }
 
 package org.apache.http.conn.params {
 
-  public abstract deprecated interface ConnConnectionPNames {
-    field public static final java.lang.String MAX_STATUS_LINE_GARBAGE = "http.connection.max-status-line-garbage";
+  @Deprecated public interface ConnConnectionPNames {
+    field @Deprecated public static final String MAX_STATUS_LINE_GARBAGE = "http.connection.max-status-line-garbage";
   }
 
-  public deprecated class ConnConnectionParamBean extends org.apache.http.params.HttpAbstractParamBean {
-    ctor public ConnConnectionParamBean(org.apache.http.params.HttpParams);
-    method public void setMaxStatusLineGarbage(int);
+  @Deprecated public class ConnConnectionParamBean extends org.apache.http.params.HttpAbstractParamBean {
+    ctor @Deprecated public ConnConnectionParamBean(org.apache.http.params.HttpParams);
+    method @Deprecated public void setMaxStatusLineGarbage(int);
   }
 
-  public abstract deprecated interface ConnManagerPNames {
-    field public static final java.lang.String MAX_CONNECTIONS_PER_ROUTE = "http.conn-manager.max-per-route";
-    field public static final java.lang.String MAX_TOTAL_CONNECTIONS = "http.conn-manager.max-total";
-    field public static final java.lang.String TIMEOUT = "http.conn-manager.timeout";
+  @Deprecated public interface ConnManagerPNames {
+    field @Deprecated public static final String MAX_CONNECTIONS_PER_ROUTE = "http.conn-manager.max-per-route";
+    field @Deprecated public static final String MAX_TOTAL_CONNECTIONS = "http.conn-manager.max-total";
+    field @Deprecated public static final String TIMEOUT = "http.conn-manager.timeout";
   }
 
-  public deprecated class ConnManagerParamBean extends org.apache.http.params.HttpAbstractParamBean {
-    ctor public ConnManagerParamBean(org.apache.http.params.HttpParams);
-    method public void setConnectionsPerRoute(org.apache.http.conn.params.ConnPerRouteBean);
-    method public void setMaxTotalConnections(int);
-    method public void setTimeout(long);
+  @Deprecated public class ConnManagerParamBean extends org.apache.http.params.HttpAbstractParamBean {
+    ctor @Deprecated public ConnManagerParamBean(org.apache.http.params.HttpParams);
+    method @Deprecated public void setConnectionsPerRoute(org.apache.http.conn.params.ConnPerRouteBean);
+    method @Deprecated public void setMaxTotalConnections(int);
+    method @Deprecated public void setTimeout(long);
   }
 
-  public final deprecated class ConnManagerParams implements org.apache.http.conn.params.ConnManagerPNames {
-    ctor public ConnManagerParams();
-    method public static org.apache.http.conn.params.ConnPerRoute getMaxConnectionsPerRoute(org.apache.http.params.HttpParams);
-    method public static int getMaxTotalConnections(org.apache.http.params.HttpParams);
-    method public static long getTimeout(org.apache.http.params.HttpParams);
-    method public static void setMaxConnectionsPerRoute(org.apache.http.params.HttpParams, org.apache.http.conn.params.ConnPerRoute);
-    method public static void setMaxTotalConnections(org.apache.http.params.HttpParams, int);
-    method public static void setTimeout(org.apache.http.params.HttpParams, long);
-    field public static final int DEFAULT_MAX_TOTAL_CONNECTIONS = 20; // 0x14
+  @Deprecated public final class ConnManagerParams implements org.apache.http.conn.params.ConnManagerPNames {
+    ctor @Deprecated public ConnManagerParams();
+    method @Deprecated public static org.apache.http.conn.params.ConnPerRoute getMaxConnectionsPerRoute(org.apache.http.params.HttpParams);
+    method @Deprecated public static int getMaxTotalConnections(org.apache.http.params.HttpParams);
+    method @Deprecated public static long getTimeout(org.apache.http.params.HttpParams);
+    method @Deprecated public static void setMaxConnectionsPerRoute(org.apache.http.params.HttpParams, org.apache.http.conn.params.ConnPerRoute);
+    method @Deprecated public static void setMaxTotalConnections(org.apache.http.params.HttpParams, int);
+    method @Deprecated public static void setTimeout(org.apache.http.params.HttpParams, long);
+    field @Deprecated public static final int DEFAULT_MAX_TOTAL_CONNECTIONS = 20; // 0x14
   }
 
-  public abstract deprecated interface ConnPerRoute {
-    method public abstract int getMaxForRoute(org.apache.http.conn.routing.HttpRoute);
+  @Deprecated public interface ConnPerRoute {
+    method @Deprecated public int getMaxForRoute(org.apache.http.conn.routing.HttpRoute);
   }
 
-  public final deprecated class ConnPerRouteBean implements org.apache.http.conn.params.ConnPerRoute {
-    ctor public ConnPerRouteBean(int);
-    ctor public ConnPerRouteBean();
-    method public int getDefaultMax();
-    method public int getMaxForRoute(org.apache.http.conn.routing.HttpRoute);
-    method public void setDefaultMaxPerRoute(int);
-    method public void setMaxForRoute(org.apache.http.conn.routing.HttpRoute, int);
-    method public void setMaxForRoutes(java.util.Map<org.apache.http.conn.routing.HttpRoute, java.lang.Integer>);
-    field public static final int DEFAULT_MAX_CONNECTIONS_PER_ROUTE = 2; // 0x2
+  @Deprecated public final class ConnPerRouteBean implements org.apache.http.conn.params.ConnPerRoute {
+    ctor @Deprecated public ConnPerRouteBean(int);
+    ctor @Deprecated public ConnPerRouteBean();
+    method @Deprecated public int getDefaultMax();
+    method @Deprecated public int getMaxForRoute(org.apache.http.conn.routing.HttpRoute);
+    method @Deprecated public void setDefaultMaxPerRoute(int);
+    method @Deprecated public void setMaxForRoute(org.apache.http.conn.routing.HttpRoute, int);
+    method @Deprecated public void setMaxForRoutes(java.util.Map<org.apache.http.conn.routing.HttpRoute,java.lang.Integer>);
+    field @Deprecated public static final int DEFAULT_MAX_CONNECTIONS_PER_ROUTE = 2; // 0x2
   }
 
-  public abstract deprecated interface ConnRoutePNames {
-    field public static final java.lang.String DEFAULT_PROXY = "http.route.default-proxy";
-    field public static final java.lang.String FORCED_ROUTE = "http.route.forced-route";
-    field public static final java.lang.String LOCAL_ADDRESS = "http.route.local-address";
+  @Deprecated public interface ConnRoutePNames {
+    field @Deprecated public static final String DEFAULT_PROXY = "http.route.default-proxy";
+    field @Deprecated public static final String FORCED_ROUTE = "http.route.forced-route";
+    field @Deprecated public static final String LOCAL_ADDRESS = "http.route.local-address";
   }
 
-  public deprecated class ConnRouteParamBean extends org.apache.http.params.HttpAbstractParamBean {
-    ctor public ConnRouteParamBean(org.apache.http.params.HttpParams);
-    method public void setDefaultProxy(org.apache.http.HttpHost);
-    method public void setForcedRoute(org.apache.http.conn.routing.HttpRoute);
-    method public void setLocalAddress(java.net.InetAddress);
+  @Deprecated public class ConnRouteParamBean extends org.apache.http.params.HttpAbstractParamBean {
+    ctor @Deprecated public ConnRouteParamBean(org.apache.http.params.HttpParams);
+    method @Deprecated public void setDefaultProxy(org.apache.http.HttpHost);
+    method @Deprecated public void setForcedRoute(org.apache.http.conn.routing.HttpRoute);
+    method @Deprecated public void setLocalAddress(java.net.InetAddress);
   }
 
-  public deprecated class ConnRouteParams implements org.apache.http.conn.params.ConnRoutePNames {
-    method public static org.apache.http.HttpHost getDefaultProxy(org.apache.http.params.HttpParams);
-    method public static org.apache.http.conn.routing.HttpRoute getForcedRoute(org.apache.http.params.HttpParams);
-    method public static java.net.InetAddress getLocalAddress(org.apache.http.params.HttpParams);
-    method public static void setDefaultProxy(org.apache.http.params.HttpParams, org.apache.http.HttpHost);
-    method public static void setForcedRoute(org.apache.http.params.HttpParams, org.apache.http.conn.routing.HttpRoute);
-    method public static void setLocalAddress(org.apache.http.params.HttpParams, java.net.InetAddress);
-    field public static final org.apache.http.HttpHost NO_HOST;
-    field public static final org.apache.http.conn.routing.HttpRoute NO_ROUTE;
+  @Deprecated public class ConnRouteParams implements org.apache.http.conn.params.ConnRoutePNames {
+    method @Deprecated public static org.apache.http.HttpHost getDefaultProxy(org.apache.http.params.HttpParams);
+    method @Deprecated public static org.apache.http.conn.routing.HttpRoute getForcedRoute(org.apache.http.params.HttpParams);
+    method @Deprecated public static java.net.InetAddress getLocalAddress(org.apache.http.params.HttpParams);
+    method @Deprecated public static void setDefaultProxy(org.apache.http.params.HttpParams, org.apache.http.HttpHost);
+    method @Deprecated public static void setForcedRoute(org.apache.http.params.HttpParams, org.apache.http.conn.routing.HttpRoute);
+    method @Deprecated public static void setLocalAddress(org.apache.http.params.HttpParams, java.net.InetAddress);
+    field @Deprecated public static final org.apache.http.HttpHost NO_HOST;
+    field @Deprecated public static final org.apache.http.conn.routing.HttpRoute NO_ROUTE;
   }
 
 }
 
 package org.apache.http.conn.routing {
 
-  public deprecated class BasicRouteDirector implements org.apache.http.conn.routing.HttpRouteDirector {
-    ctor public BasicRouteDirector();
-    method protected int directStep(org.apache.http.conn.routing.RouteInfo, org.apache.http.conn.routing.RouteInfo);
-    method protected int firstStep(org.apache.http.conn.routing.RouteInfo);
-    method public int nextStep(org.apache.http.conn.routing.RouteInfo, org.apache.http.conn.routing.RouteInfo);
-    method protected int proxiedStep(org.apache.http.conn.routing.RouteInfo, org.apache.http.conn.routing.RouteInfo);
-  }
-
-  public final deprecated class HttpRoute implements java.lang.Cloneable org.apache.http.conn.routing.RouteInfo {
-    ctor public HttpRoute(org.apache.http.HttpHost, java.net.InetAddress, org.apache.http.HttpHost[], boolean, org.apache.http.conn.routing.RouteInfo.TunnelType, org.apache.http.conn.routing.RouteInfo.LayerType);
-    ctor public HttpRoute(org.apache.http.HttpHost, java.net.InetAddress, org.apache.http.HttpHost, boolean, org.apache.http.conn.routing.RouteInfo.TunnelType, org.apache.http.conn.routing.RouteInfo.LayerType);
-    ctor public HttpRoute(org.apache.http.HttpHost, java.net.InetAddress, boolean);
-    ctor public HttpRoute(org.apache.http.HttpHost);
-    ctor public HttpRoute(org.apache.http.HttpHost, java.net.InetAddress, org.apache.http.HttpHost, boolean);
-    method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
-    method public int getHopCount();
-    method public org.apache.http.HttpHost getHopTarget(int);
-    method public org.apache.http.conn.routing.RouteInfo.LayerType getLayerType();
-    method public java.net.InetAddress getLocalAddress();
-    method public org.apache.http.HttpHost getProxyHost();
-    method public org.apache.http.HttpHost getTargetHost();
-    method public org.apache.http.conn.routing.RouteInfo.TunnelType getTunnelType();
-    method public boolean isLayered();
-    method public boolean isSecure();
-    method public boolean isTunnelled();
-  }
-
-  public abstract deprecated interface HttpRouteDirector {
-    method public abstract int nextStep(org.apache.http.conn.routing.RouteInfo, org.apache.http.conn.routing.RouteInfo);
-    field public static final int COMPLETE = 0; // 0x0
-    field public static final int CONNECT_PROXY = 2; // 0x2
-    field public static final int CONNECT_TARGET = 1; // 0x1
-    field public static final int LAYER_PROTOCOL = 5; // 0x5
-    field public static final int TUNNEL_PROXY = 4; // 0x4
-    field public static final int TUNNEL_TARGET = 3; // 0x3
-    field public static final int UNREACHABLE = -1; // 0xffffffff
-  }
-
-  public abstract deprecated interface HttpRoutePlanner {
-    method public abstract org.apache.http.conn.routing.HttpRoute determineRoute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException;
-  }
-
-  public abstract deprecated interface RouteInfo {
-    method public abstract int getHopCount();
-    method public abstract org.apache.http.HttpHost getHopTarget(int);
-    method public abstract org.apache.http.conn.routing.RouteInfo.LayerType getLayerType();
-    method public abstract java.net.InetAddress getLocalAddress();
-    method public abstract org.apache.http.HttpHost getProxyHost();
-    method public abstract org.apache.http.HttpHost getTargetHost();
-    method public abstract org.apache.http.conn.routing.RouteInfo.TunnelType getTunnelType();
-    method public abstract boolean isLayered();
-    method public abstract boolean isSecure();
-    method public abstract boolean isTunnelled();
-  }
-
-  public static final class RouteInfo.LayerType extends java.lang.Enum {
-    method public static org.apache.http.conn.routing.RouteInfo.LayerType valueOf(java.lang.String);
-    method public static final org.apache.http.conn.routing.RouteInfo.LayerType[] values();
-    enum_constant public static final org.apache.http.conn.routing.RouteInfo.LayerType LAYERED;
-    enum_constant public static final org.apache.http.conn.routing.RouteInfo.LayerType PLAIN;
-  }
-
-  public static final class RouteInfo.TunnelType extends java.lang.Enum {
-    method public static org.apache.http.conn.routing.RouteInfo.TunnelType valueOf(java.lang.String);
-    method public static final org.apache.http.conn.routing.RouteInfo.TunnelType[] values();
-    enum_constant public static final org.apache.http.conn.routing.RouteInfo.TunnelType PLAIN;
-    enum_constant public static final org.apache.http.conn.routing.RouteInfo.TunnelType TUNNELLED;
-  }
-
-  public final deprecated class RouteTracker implements java.lang.Cloneable org.apache.http.conn.routing.RouteInfo {
-    ctor public RouteTracker(org.apache.http.HttpHost, java.net.InetAddress);
-    ctor public RouteTracker(org.apache.http.conn.routing.HttpRoute);
-    method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
-    method public void connectProxy(org.apache.http.HttpHost, boolean);
-    method public void connectTarget(boolean);
-    method public int getHopCount();
-    method public org.apache.http.HttpHost getHopTarget(int);
-    method public org.apache.http.conn.routing.RouteInfo.LayerType getLayerType();
-    method public java.net.InetAddress getLocalAddress();
-    method public org.apache.http.HttpHost getProxyHost();
-    method public org.apache.http.HttpHost getTargetHost();
-    method public org.apache.http.conn.routing.RouteInfo.TunnelType getTunnelType();
-    method public boolean isConnected();
-    method public boolean isLayered();
-    method public boolean isSecure();
-    method public boolean isTunnelled();
-    method public void layerProtocol(boolean);
-    method public org.apache.http.conn.routing.HttpRoute toRoute();
-    method public void tunnelProxy(org.apache.http.HttpHost, boolean);
-    method public void tunnelTarget(boolean);
+  @Deprecated public class BasicRouteDirector implements org.apache.http.conn.routing.HttpRouteDirector {
+    ctor @Deprecated public BasicRouteDirector();
+    method @Deprecated protected int directStep(org.apache.http.conn.routing.RouteInfo, org.apache.http.conn.routing.RouteInfo);
+    method @Deprecated protected int firstStep(org.apache.http.conn.routing.RouteInfo);
+    method @Deprecated public int nextStep(org.apache.http.conn.routing.RouteInfo, org.apache.http.conn.routing.RouteInfo);
+    method @Deprecated protected int proxiedStep(org.apache.http.conn.routing.RouteInfo, org.apache.http.conn.routing.RouteInfo);
+  }
+
+  @Deprecated public final class HttpRoute implements java.lang.Cloneable org.apache.http.conn.routing.RouteInfo {
+    ctor @Deprecated public HttpRoute(org.apache.http.HttpHost, java.net.InetAddress, org.apache.http.HttpHost[], boolean, org.apache.http.conn.routing.RouteInfo.TunnelType, org.apache.http.conn.routing.RouteInfo.LayerType);
+    ctor @Deprecated public HttpRoute(org.apache.http.HttpHost, java.net.InetAddress, org.apache.http.HttpHost, boolean, org.apache.http.conn.routing.RouteInfo.TunnelType, org.apache.http.conn.routing.RouteInfo.LayerType);
+    ctor @Deprecated public HttpRoute(org.apache.http.HttpHost, java.net.InetAddress, boolean);
+    ctor @Deprecated public HttpRoute(org.apache.http.HttpHost);
+    ctor @Deprecated public HttpRoute(org.apache.http.HttpHost, java.net.InetAddress, org.apache.http.HttpHost, boolean);
+    method @Deprecated public Object clone() throws java.lang.CloneNotSupportedException;
+    method @Deprecated public int getHopCount();
+    method @Deprecated public org.apache.http.HttpHost getHopTarget(int);
+    method @Deprecated public org.apache.http.conn.routing.RouteInfo.LayerType getLayerType();
+    method @Deprecated public java.net.InetAddress getLocalAddress();
+    method @Deprecated public org.apache.http.HttpHost getProxyHost();
+    method @Deprecated public org.apache.http.HttpHost getTargetHost();
+    method @Deprecated public org.apache.http.conn.routing.RouteInfo.TunnelType getTunnelType();
+    method @Deprecated public boolean isLayered();
+    method @Deprecated public boolean isSecure();
+    method @Deprecated public boolean isTunnelled();
+  }
+
+  @Deprecated public interface HttpRouteDirector {
+    method @Deprecated public int nextStep(org.apache.http.conn.routing.RouteInfo, org.apache.http.conn.routing.RouteInfo);
+    field @Deprecated public static final int COMPLETE = 0; // 0x0
+    field @Deprecated public static final int CONNECT_PROXY = 2; // 0x2
+    field @Deprecated public static final int CONNECT_TARGET = 1; // 0x1
+    field @Deprecated public static final int LAYER_PROTOCOL = 5; // 0x5
+    field @Deprecated public static final int TUNNEL_PROXY = 4; // 0x4
+    field @Deprecated public static final int TUNNEL_TARGET = 3; // 0x3
+    field @Deprecated public static final int UNREACHABLE = -1; // 0xffffffff
+  }
+
+  @Deprecated public interface HttpRoutePlanner {
+    method @Deprecated public org.apache.http.conn.routing.HttpRoute determineRoute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException;
+  }
+
+  @Deprecated public interface RouteInfo {
+    method @Deprecated public int getHopCount();
+    method @Deprecated public org.apache.http.HttpHost getHopTarget(int);
+    method @Deprecated public org.apache.http.conn.routing.RouteInfo.LayerType getLayerType();
+    method @Deprecated public java.net.InetAddress getLocalAddress();
+    method @Deprecated public org.apache.http.HttpHost getProxyHost();
+    method @Deprecated public org.apache.http.HttpHost getTargetHost();
+    method @Deprecated public org.apache.http.conn.routing.RouteInfo.TunnelType getTunnelType();
+    method @Deprecated public boolean isLayered();
+    method @Deprecated public boolean isSecure();
+    method @Deprecated public boolean isTunnelled();
+  }
+
+  @Deprecated public enum RouteInfo.LayerType {
+    enum_constant @Deprecated public static final org.apache.http.conn.routing.RouteInfo.LayerType LAYERED;
+    enum_constant @Deprecated public static final org.apache.http.conn.routing.RouteInfo.LayerType PLAIN;
+  }
+
+  @Deprecated public enum RouteInfo.TunnelType {
+    enum_constant @Deprecated public static final org.apache.http.conn.routing.RouteInfo.TunnelType PLAIN;
+    enum_constant @Deprecated public static final org.apache.http.conn.routing.RouteInfo.TunnelType TUNNELLED;
+  }
+
+  @Deprecated public final class RouteTracker implements java.lang.Cloneable org.apache.http.conn.routing.RouteInfo {
+    ctor @Deprecated public RouteTracker(org.apache.http.HttpHost, java.net.InetAddress);
+    ctor @Deprecated public RouteTracker(org.apache.http.conn.routing.HttpRoute);
+    method @Deprecated public Object clone() throws java.lang.CloneNotSupportedException;
+    method @Deprecated public void connectProxy(org.apache.http.HttpHost, boolean);
+    method @Deprecated public void connectTarget(boolean);
+    method @Deprecated public int getHopCount();
+    method @Deprecated public org.apache.http.HttpHost getHopTarget(int);
+    method @Deprecated public org.apache.http.conn.routing.RouteInfo.LayerType getLayerType();
+    method @Deprecated public java.net.InetAddress getLocalAddress();
+    method @Deprecated public org.apache.http.HttpHost getProxyHost();
+    method @Deprecated public org.apache.http.HttpHost getTargetHost();
+    method @Deprecated public org.apache.http.conn.routing.RouteInfo.TunnelType getTunnelType();
+    method @Deprecated public boolean isConnected();
+    method @Deprecated public boolean isLayered();
+    method @Deprecated public boolean isSecure();
+    method @Deprecated public boolean isTunnelled();
+    method @Deprecated public void layerProtocol(boolean);
+    method @Deprecated public org.apache.http.conn.routing.HttpRoute toRoute();
+    method @Deprecated public void tunnelProxy(org.apache.http.HttpHost, boolean);
+    method @Deprecated public void tunnelTarget(boolean);
   }
 
 }
 
 package org.apache.http.conn.scheme {
 
-  public abstract deprecated interface HostNameResolver {
-    method public abstract java.net.InetAddress resolve(java.lang.String) throws java.io.IOException;
+  @Deprecated public interface HostNameResolver {
+    method @Deprecated public java.net.InetAddress resolve(String) throws java.io.IOException;
   }
 
-  public abstract deprecated interface LayeredSocketFactory implements org.apache.http.conn.scheme.SocketFactory {
-    method public abstract java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean) throws java.io.IOException, java.net.UnknownHostException;
+  @Deprecated public interface LayeredSocketFactory extends org.apache.http.conn.scheme.SocketFactory {
+    method @Deprecated public java.net.Socket createSocket(java.net.Socket, String, int, boolean) throws java.io.IOException, java.net.UnknownHostException;
   }
 
-  public final deprecated class PlainSocketFactory implements org.apache.http.conn.scheme.SocketFactory {
-    ctor public PlainSocketFactory(org.apache.http.conn.scheme.HostNameResolver);
-    ctor public PlainSocketFactory();
-    method public java.net.Socket connectSocket(java.net.Socket, java.lang.String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public java.net.Socket createSocket();
-    method public static org.apache.http.conn.scheme.PlainSocketFactory getSocketFactory();
-    method public boolean isSecure(java.net.Socket) throws java.lang.IllegalArgumentException;
+  @Deprecated public final class PlainSocketFactory implements org.apache.http.conn.scheme.SocketFactory {
+    ctor @Deprecated public PlainSocketFactory(org.apache.http.conn.scheme.HostNameResolver);
+    ctor @Deprecated public PlainSocketFactory();
+    method @Deprecated public java.net.Socket connectSocket(java.net.Socket, String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public java.net.Socket createSocket();
+    method @Deprecated public static org.apache.http.conn.scheme.PlainSocketFactory getSocketFactory();
+    method @Deprecated public boolean isSecure(java.net.Socket) throws java.lang.IllegalArgumentException;
   }
 
-  public final deprecated class Scheme {
-    ctor public Scheme(java.lang.String, org.apache.http.conn.scheme.SocketFactory, int);
-    method public int getDefaultPort();
-    method public java.lang.String getName();
-    method public org.apache.http.conn.scheme.SocketFactory getSocketFactory();
-    method public boolean isLayered();
-    method public int resolvePort(int);
+  @Deprecated public final class Scheme {
+    ctor @Deprecated public Scheme(String, org.apache.http.conn.scheme.SocketFactory, int);
+    method @Deprecated public int getDefaultPort();
+    method @Deprecated public String getName();
+    method @Deprecated public org.apache.http.conn.scheme.SocketFactory getSocketFactory();
+    method @Deprecated public boolean isLayered();
+    method @Deprecated public int resolvePort(int);
   }
 
-  public final deprecated class SchemeRegistry {
-    ctor public SchemeRegistry();
-    method public synchronized org.apache.http.conn.scheme.Scheme get(java.lang.String);
-    method public synchronized org.apache.http.conn.scheme.Scheme getScheme(java.lang.String);
-    method public synchronized org.apache.http.conn.scheme.Scheme getScheme(org.apache.http.HttpHost);
-    method public synchronized java.util.List<java.lang.String> getSchemeNames();
-    method public synchronized org.apache.http.conn.scheme.Scheme register(org.apache.http.conn.scheme.Scheme);
-    method public synchronized void setItems(java.util.Map<java.lang.String, org.apache.http.conn.scheme.Scheme>);
-    method public synchronized org.apache.http.conn.scheme.Scheme unregister(java.lang.String);
+  @Deprecated public final class SchemeRegistry {
+    ctor @Deprecated public SchemeRegistry();
+    method @Deprecated public org.apache.http.conn.scheme.Scheme get(String);
+    method @Deprecated public org.apache.http.conn.scheme.Scheme getScheme(String);
+    method @Deprecated public org.apache.http.conn.scheme.Scheme getScheme(org.apache.http.HttpHost);
+    method @Deprecated public java.util.List<java.lang.String> getSchemeNames();
+    method @Deprecated public org.apache.http.conn.scheme.Scheme register(org.apache.http.conn.scheme.Scheme);
+    method @Deprecated public void setItems(java.util.Map<java.lang.String,org.apache.http.conn.scheme.Scheme>);
+    method @Deprecated public org.apache.http.conn.scheme.Scheme unregister(String);
   }
 
-  public abstract deprecated interface SocketFactory {
-    method public abstract java.net.Socket connectSocket(java.net.Socket, java.lang.String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams) throws org.apache.http.conn.ConnectTimeoutException, java.io.IOException, java.net.UnknownHostException;
-    method public abstract java.net.Socket createSocket() throws java.io.IOException;
-    method public abstract boolean isSecure(java.net.Socket) throws java.lang.IllegalArgumentException;
+  @Deprecated public interface SocketFactory {
+    method @Deprecated public java.net.Socket connectSocket(java.net.Socket, String, int, java.net.InetAddress, int, org.apache.http.params.HttpParams) throws org.apache.http.conn.ConnectTimeoutException, java.io.IOException, java.net.UnknownHostException;
+    method @Deprecated public java.net.Socket createSocket() throws java.io.IOException;
+    method @Deprecated public boolean isSecure(java.net.Socket) throws java.lang.IllegalArgumentException;
   }
 
 }
 
 package org.apache.http.conn.util {
 
-  public deprecated class InetAddressUtils {
-    method public static boolean isIPv4Address(java.lang.String);
-    method public static boolean isIPv6Address(java.lang.String);
-    method public static boolean isIPv6HexCompressedAddress(java.lang.String);
-    method public static boolean isIPv6StdAddress(java.lang.String);
+  @Deprecated public class InetAddressUtils {
+    method @Deprecated public static boolean isIPv4Address(String);
+    method @Deprecated public static boolean isIPv6Address(String);
+    method @Deprecated public static boolean isIPv6HexCompressedAddress(String);
+    method @Deprecated public static boolean isIPv6StdAddress(String);
   }
 
 }
 
 package org.apache.http.cookie {
 
-  public abstract deprecated interface ClientCookie implements org.apache.http.cookie.Cookie {
-    method public abstract boolean containsAttribute(java.lang.String);
-    method public abstract java.lang.String getAttribute(java.lang.String);
-    field public static final java.lang.String COMMENTURL_ATTR = "commenturl";
-    field public static final java.lang.String COMMENT_ATTR = "comment";
-    field public static final java.lang.String DISCARD_ATTR = "discard";
-    field public static final java.lang.String DOMAIN_ATTR = "domain";
-    field public static final java.lang.String EXPIRES_ATTR = "expires";
-    field public static final java.lang.String MAX_AGE_ATTR = "max-age";
-    field public static final java.lang.String PATH_ATTR = "path";
-    field public static final java.lang.String PORT_ATTR = "port";
-    field public static final java.lang.String SECURE_ATTR = "secure";
-    field public static final java.lang.String VERSION_ATTR = "version";
-  }
-
-  public abstract deprecated interface Cookie {
-    method public abstract java.lang.String getComment();
-    method public abstract java.lang.String getCommentURL();
-    method public abstract java.lang.String getDomain();
-    method public abstract java.util.Date getExpiryDate();
-    method public abstract java.lang.String getName();
-    method public abstract java.lang.String getPath();
-    method public abstract int[] getPorts();
-    method public abstract java.lang.String getValue();
-    method public abstract int getVersion();
-    method public abstract boolean isExpired(java.util.Date);
-    method public abstract boolean isPersistent();
-    method public abstract boolean isSecure();
-  }
-
-  public abstract deprecated interface CookieAttributeHandler {
-    method public abstract boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
-    method public abstract void parse(org.apache.http.cookie.SetCookie, java.lang.String) throws org.apache.http.cookie.MalformedCookieException;
-    method public abstract void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
-  }
-
-  public deprecated class CookieIdentityComparator implements java.util.Comparator java.io.Serializable {
-    ctor public CookieIdentityComparator();
-    method public int compare(org.apache.http.cookie.Cookie, org.apache.http.cookie.Cookie);
-  }
-
-  public final deprecated class CookieOrigin {
-    ctor public CookieOrigin(java.lang.String, int, java.lang.String, boolean);
-    method public java.lang.String getHost();
-    method public java.lang.String getPath();
-    method public int getPort();
-    method public boolean isSecure();
+  @Deprecated public interface ClientCookie extends org.apache.http.cookie.Cookie {
+    method @Deprecated public boolean containsAttribute(String);
+    method @Deprecated public String getAttribute(String);
+    field @Deprecated public static final String COMMENTURL_ATTR = "commenturl";
+    field @Deprecated public static final String COMMENT_ATTR = "comment";
+    field @Deprecated public static final String DISCARD_ATTR = "discard";
+    field @Deprecated public static final String DOMAIN_ATTR = "domain";
+    field @Deprecated public static final String EXPIRES_ATTR = "expires";
+    field @Deprecated public static final String MAX_AGE_ATTR = "max-age";
+    field @Deprecated public static final String PATH_ATTR = "path";
+    field @Deprecated public static final String PORT_ATTR = "port";
+    field @Deprecated public static final String SECURE_ATTR = "secure";
+    field @Deprecated public static final String VERSION_ATTR = "version";
   }
 
-  public deprecated class CookiePathComparator implements java.util.Comparator java.io.Serializable {
-    ctor public CookiePathComparator();
-    method public int compare(org.apache.http.cookie.Cookie, org.apache.http.cookie.Cookie);
+  @Deprecated public interface Cookie {
+    method @Deprecated public String getComment();
+    method @Deprecated public String getCommentURL();
+    method @Deprecated public String getDomain();
+    method @Deprecated public java.util.Date getExpiryDate();
+    method @Deprecated public String getName();
+    method @Deprecated public String getPath();
+    method @Deprecated public int[] getPorts();
+    method @Deprecated public String getValue();
+    method @Deprecated public int getVersion();
+    method @Deprecated public boolean isExpired(java.util.Date);
+    method @Deprecated public boolean isPersistent();
+    method @Deprecated public boolean isSecure();
   }
 
-  public abstract deprecated interface CookieSpec {
-    method public abstract java.util.List<org.apache.http.Header> formatCookies(java.util.List<org.apache.http.cookie.Cookie>);
-    method public abstract int getVersion();
-    method public abstract org.apache.http.Header getVersionHeader();
-    method public abstract boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
-    method public abstract java.util.List<org.apache.http.cookie.Cookie> parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
-    method public abstract void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
+  @Deprecated public interface CookieAttributeHandler {
+    method @Deprecated public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
+    method @Deprecated public void parse(org.apache.http.cookie.SetCookie, String) throws org.apache.http.cookie.MalformedCookieException;
+    method @Deprecated public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
   }
 
-  public abstract deprecated interface CookieSpecFactory {
-    method public abstract org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams);
+  @Deprecated public class CookieIdentityComparator implements java.util.Comparator<org.apache.http.cookie.Cookie> java.io.Serializable {
+    ctor @Deprecated public CookieIdentityComparator();
+    method @Deprecated public int compare(org.apache.http.cookie.Cookie, org.apache.http.cookie.Cookie);
   }
 
-  public final deprecated class CookieSpecRegistry {
-    ctor public CookieSpecRegistry();
-    method public synchronized org.apache.http.cookie.CookieSpec getCookieSpec(java.lang.String, org.apache.http.params.HttpParams) throws java.lang.IllegalStateException;
-    method public synchronized org.apache.http.cookie.CookieSpec getCookieSpec(java.lang.String) throws java.lang.IllegalStateException;
-    method public synchronized java.util.List<java.lang.String> getSpecNames();
-    method public synchronized void register(java.lang.String, org.apache.http.cookie.CookieSpecFactory);
-    method public synchronized void setItems(java.util.Map<java.lang.String, org.apache.http.cookie.CookieSpecFactory>);
-    method public synchronized void unregister(java.lang.String);
+  @Deprecated public final class CookieOrigin {
+    ctor @Deprecated public CookieOrigin(String, int, String, boolean);
+    method @Deprecated public String getHost();
+    method @Deprecated public String getPath();
+    method @Deprecated public int getPort();
+    method @Deprecated public boolean isSecure();
   }
 
-  public deprecated class MalformedCookieException extends org.apache.http.ProtocolException {
-    ctor public MalformedCookieException();
-    ctor public MalformedCookieException(java.lang.String);
-    ctor public MalformedCookieException(java.lang.String, java.lang.Throwable);
+  @Deprecated public class CookiePathComparator implements java.util.Comparator<org.apache.http.cookie.Cookie> java.io.Serializable {
+    ctor @Deprecated public CookiePathComparator();
+    method @Deprecated public int compare(org.apache.http.cookie.Cookie, org.apache.http.cookie.Cookie);
   }
 
-  public abstract deprecated interface SM {
-    field public static final java.lang.String COOKIE = "Cookie";
-    field public static final java.lang.String COOKIE2 = "Cookie2";
-    field public static final java.lang.String SET_COOKIE = "Set-Cookie";
-    field public static final java.lang.String SET_COOKIE2 = "Set-Cookie2";
+  @Deprecated public interface CookieSpec {
+    method @Deprecated public java.util.List<org.apache.http.Header> formatCookies(java.util.List<org.apache.http.cookie.Cookie>);
+    method @Deprecated public int getVersion();
+    method @Deprecated public org.apache.http.Header getVersionHeader();
+    method @Deprecated public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
+    method @Deprecated public java.util.List<org.apache.http.cookie.Cookie> parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
+    method @Deprecated public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
   }
 
-  public abstract deprecated interface SetCookie implements org.apache.http.cookie.Cookie {
-    method public abstract void setComment(java.lang.String);
-    method public abstract void setDomain(java.lang.String);
-    method public abstract void setExpiryDate(java.util.Date);
-    method public abstract void setPath(java.lang.String);
-    method public abstract void setSecure(boolean);
-    method public abstract void setValue(java.lang.String);
-    method public abstract void setVersion(int);
+  @Deprecated public interface CookieSpecFactory {
+    method @Deprecated public org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams);
   }
 
-  public abstract deprecated interface SetCookie2 implements org.apache.http.cookie.SetCookie {
-    method public abstract void setCommentURL(java.lang.String);
-    method public abstract void setDiscard(boolean);
-    method public abstract void setPorts(int[]);
+  @Deprecated public final class CookieSpecRegistry {
+    ctor @Deprecated public CookieSpecRegistry();
+    method @Deprecated public org.apache.http.cookie.CookieSpec getCookieSpec(String, org.apache.http.params.HttpParams) throws java.lang.IllegalStateException;
+    method @Deprecated public org.apache.http.cookie.CookieSpec getCookieSpec(String) throws java.lang.IllegalStateException;
+    method @Deprecated public java.util.List<java.lang.String> getSpecNames();
+    method @Deprecated public void register(String, org.apache.http.cookie.CookieSpecFactory);
+    method @Deprecated public void setItems(java.util.Map<java.lang.String,org.apache.http.cookie.CookieSpecFactory>);
+    method @Deprecated public void unregister(String);
   }
 
-}
-
-package org.apache.http.cookie.params {
-
-  public abstract deprecated interface CookieSpecPNames {
-    field public static final java.lang.String DATE_PATTERNS = "http.protocol.cookie-datepatterns";
-    field public static final java.lang.String SINGLE_COOKIE_HEADER = "http.protocol.single-cookie-header";
+  @Deprecated public class MalformedCookieException extends org.apache.http.ProtocolException {
+    ctor @Deprecated public MalformedCookieException();
+    ctor @Deprecated public MalformedCookieException(String);
+    ctor @Deprecated public MalformedCookieException(String, Throwable);
   }
 
-  public deprecated class CookieSpecParamBean extends org.apache.http.params.HttpAbstractParamBean {
-    ctor public CookieSpecParamBean(org.apache.http.params.HttpParams);
-    method public void setDatePatterns(java.util.Collection<java.lang.String>);
-    method public void setSingleHeader(boolean);
+  @Deprecated public interface SM {
+    field @Deprecated public static final String COOKIE = "Cookie";
+    field @Deprecated public static final String COOKIE2 = "Cookie2";
+    field @Deprecated public static final String SET_COOKIE = "Set-Cookie";
+    field @Deprecated public static final String SET_COOKIE2 = "Set-Cookie2";
   }
 
-}
-
-package org.apache.http.entity {
-
-  public abstract deprecated class AbstractHttpEntity implements org.apache.http.HttpEntity {
-    ctor protected AbstractHttpEntity();
-    method public void consumeContent() throws java.io.IOException, java.lang.UnsupportedOperationException;
-    method public org.apache.http.Header getContentEncoding();
-    method public org.apache.http.Header getContentType();
-    method public boolean isChunked();
-    method public void setChunked(boolean);
-    method public void setContentEncoding(org.apache.http.Header);
-    method public void setContentEncoding(java.lang.String);
-    method public void setContentType(org.apache.http.Header);
-    method public void setContentType(java.lang.String);
-    field protected boolean chunked;
-    field protected org.apache.http.Header contentEncoding;
-    field protected org.apache.http.Header contentType;
-  }
-
-  public deprecated class BasicHttpEntity extends org.apache.http.entity.AbstractHttpEntity {
-    ctor public BasicHttpEntity();
-    method public void consumeContent() throws java.io.IOException;
-    method public java.io.InputStream getContent() throws java.lang.IllegalStateException;
-    method public long getContentLength();
-    method public boolean isRepeatable();
-    method public boolean isStreaming();
-    method public void setContent(java.io.InputStream);
-    method public void setContentLength(long);
-    method public void writeTo(java.io.OutputStream) throws java.io.IOException;
-  }
-
-  public deprecated class BufferedHttpEntity extends org.apache.http.entity.HttpEntityWrapper {
-    ctor public BufferedHttpEntity(org.apache.http.HttpEntity) throws java.io.IOException;
-  }
-
-  public deprecated class ByteArrayEntity extends org.apache.http.entity.AbstractHttpEntity implements java.lang.Cloneable {
-    ctor public ByteArrayEntity(byte[]);
-    method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
-    method public java.io.InputStream getContent();
-    method public long getContentLength();
-    method public boolean isRepeatable();
-    method public boolean isStreaming();
-    method public void writeTo(java.io.OutputStream) throws java.io.IOException;
-    field protected final byte[] content;
+  @Deprecated public interface SetCookie extends org.apache.http.cookie.Cookie {
+    method @Deprecated public void setComment(String);
+    method @Deprecated public void setDomain(String);
+    method @Deprecated public void setExpiryDate(java.util.Date);
+    method @Deprecated public void setPath(String);
+    method @Deprecated public void setSecure(boolean);
+    method @Deprecated public void setValue(String);
+    method @Deprecated public void setVersion(int);
   }
 
-  public abstract deprecated interface ContentLengthStrategy {
-    method public abstract long determineLength(org.apache.http.HttpMessage) throws org.apache.http.HttpException;
-    field public static final int CHUNKED = -2; // 0xfffffffe
-    field public static final int IDENTITY = -1; // 0xffffffff
+  @Deprecated public interface SetCookie2 extends org.apache.http.cookie.SetCookie {
+    method @Deprecated public void setCommentURL(String);
+    method @Deprecated public void setDiscard(boolean);
+    method @Deprecated public void setPorts(int[]);
   }
 
-  public abstract deprecated interface ContentProducer {
-    method public abstract void writeTo(java.io.OutputStream) throws java.io.IOException;
-  }
+}
 
-  public deprecated class EntityTemplate extends org.apache.http.entity.AbstractHttpEntity {
-    ctor public EntityTemplate(org.apache.http.entity.ContentProducer);
-    method public void consumeContent() throws java.io.IOException;
-    method public java.io.InputStream getContent();
-    method public long getContentLength();
-    method public boolean isRepeatable();
-    method public boolean isStreaming();
-    method public void writeTo(java.io.OutputStream) throws java.io.IOException;
-  }
+package org.apache.http.cookie.params {
 
-  public deprecated class FileEntity extends org.apache.http.entity.AbstractHttpEntity implements java.lang.Cloneable {
-    ctor public FileEntity(java.io.File, java.lang.String);
-    method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
-    method public java.io.InputStream getContent() throws java.io.IOException;
-    method public long getContentLength();
-    method public boolean isRepeatable();
-    method public boolean isStreaming();
-    method public void writeTo(java.io.OutputStream) throws java.io.IOException;
-    field protected final java.io.File file;
+  @Deprecated public interface CookieSpecPNames {
+    field @Deprecated public static final String DATE_PATTERNS = "http.protocol.cookie-datepatterns";
+    field @Deprecated public static final String SINGLE_COOKIE_HEADER = "http.protocol.single-cookie-header";
   }
 
-  public deprecated class HttpEntityWrapper implements org.apache.http.HttpEntity {
-    ctor public HttpEntityWrapper(org.apache.http.HttpEntity);
-    method public void consumeContent() throws java.io.IOException;
-    method public java.io.InputStream getContent() throws java.io.IOException;
-    method public org.apache.http.Header getContentEncoding();
-    method public long getContentLength();
-    method public org.apache.http.Header getContentType();
-    method public boolean isChunked();
-    method public boolean isRepeatable();
-    method public boolean isStreaming();
-    method public void writeTo(java.io.OutputStream) throws java.io.IOException;
-    field protected org.apache.http.HttpEntity wrappedEntity;
+  @Deprecated public class CookieSpecParamBean extends org.apache.http.params.HttpAbstractParamBean {
+    ctor @Deprecated public CookieSpecParamBean(org.apache.http.params.HttpParams);
+    method @Deprecated public void setDatePatterns(java.util.Collection<java.lang.String>);
+    method @Deprecated public void setSingleHeader(boolean);
   }
 
-  public deprecated class InputStreamEntity extends org.apache.http.entity.AbstractHttpEntity {
-    ctor public InputStreamEntity(java.io.InputStream, long);
-    method public void consumeContent() throws java.io.IOException;
-    method public java.io.InputStream getContent() throws java.io.IOException;
-    method public long getContentLength();
-    method public boolean isRepeatable();
-    method public boolean isStreaming();
-    method public void writeTo(java.io.OutputStream) throws java.io.IOException;
-  }
+}
 
-  public deprecated class SerializableEntity extends org.apache.http.entity.AbstractHttpEntity {
-    ctor public SerializableEntity(java.io.Serializable, boolean) throws java.io.IOException;
-    method public java.io.InputStream getContent() throws java.io.IOException, java.lang.IllegalStateException;
-    method public long getContentLength();
-    method public boolean isRepeatable();
-    method public boolean isStreaming();
-    method public void writeTo(java.io.OutputStream) throws java.io.IOException;
-  }
+package org.apache.http.entity {
 
-  public deprecated class StringEntity extends org.apache.http.entity.AbstractHttpEntity implements java.lang.Cloneable {
-    ctor public StringEntity(java.lang.String, java.lang.String) throws java.io.UnsupportedEncodingException;
-    ctor public StringEntity(java.lang.String) throws java.io.UnsupportedEncodingException;
-    method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
-    method public java.io.InputStream getContent() throws java.io.IOException;
-    method public long getContentLength();
-    method public boolean isRepeatable();
-    method public boolean isStreaming();
-    method public void writeTo(java.io.OutputStream) throws java.io.IOException;
-    field protected final byte[] content;
+  @Deprecated public abstract class AbstractHttpEntity implements org.apache.http.HttpEntity {
+    ctor @Deprecated protected AbstractHttpEntity();
+    method @Deprecated public void consumeContent() throws java.io.IOException, java.lang.UnsupportedOperationException;
+    method @Deprecated public org.apache.http.Header getContentEncoding();
+    method @Deprecated public org.apache.http.Header getContentType();
+    method @Deprecated public boolean isChunked();
+    method @Deprecated public void setChunked(boolean);
+    method @Deprecated public void setContentEncoding(org.apache.http.Header);
+    method @Deprecated public void setContentEncoding(String);
+    method @Deprecated public void setContentType(org.apache.http.Header);
+    method @Deprecated public void setContentType(String);
+    field @Deprecated protected boolean chunked;
+    field @Deprecated protected org.apache.http.Header contentEncoding;
+    field @Deprecated protected org.apache.http.Header contentType;
+  }
+
+  @Deprecated public class BasicHttpEntity extends org.apache.http.entity.AbstractHttpEntity {
+    ctor @Deprecated public BasicHttpEntity();
+    method @Deprecated public void consumeContent() throws java.io.IOException;
+    method @Deprecated public java.io.InputStream getContent() throws java.lang.IllegalStateException;
+    method @Deprecated public long getContentLength();
+    method @Deprecated public boolean isRepeatable();
+    method @Deprecated public boolean isStreaming();
+    method @Deprecated public void setContent(java.io.InputStream);
+    method @Deprecated public void setContentLength(long);
+    method @Deprecated public void writeTo(java.io.OutputStream) throws java.io.IOException;
+  }
+
+  @Deprecated public class BufferedHttpEntity extends org.apache.http.entity.HttpEntityWrapper {
+    ctor @Deprecated public BufferedHttpEntity(org.apache.http.HttpEntity) throws java.io.IOException;
+  }
+
+  @Deprecated public class ByteArrayEntity extends org.apache.http.entity.AbstractHttpEntity implements java.lang.Cloneable {
+    ctor @Deprecated public ByteArrayEntity(byte[]);
+    method @Deprecated public Object clone() throws java.lang.CloneNotSupportedException;
+    method @Deprecated public java.io.InputStream getContent();
+    method @Deprecated public long getContentLength();
+    method @Deprecated public boolean isRepeatable();
+    method @Deprecated public boolean isStreaming();
+    method @Deprecated public void writeTo(java.io.OutputStream) throws java.io.IOException;
+    field @Deprecated protected final byte[] content;
+  }
+
+  @Deprecated public interface ContentLengthStrategy {
+    method @Deprecated public long determineLength(org.apache.http.HttpMessage) throws org.apache.http.HttpException;
+    field @Deprecated public static final int CHUNKED = -2; // 0xfffffffe
+    field @Deprecated public static final int IDENTITY = -1; // 0xffffffff
+  }
+
+  @Deprecated public interface ContentProducer {
+    method @Deprecated public void writeTo(java.io.OutputStream) throws java.io.IOException;
+  }
+
+  @Deprecated public class EntityTemplate extends org.apache.http.entity.AbstractHttpEntity {
+    ctor @Deprecated public EntityTemplate(org.apache.http.entity.ContentProducer);
+    method @Deprecated public void consumeContent() throws java.io.IOException;
+    method @Deprecated public java.io.InputStream getContent();
+    method @Deprecated public long getContentLength();
+    method @Deprecated public boolean isRepeatable();
+    method @Deprecated public boolean isStreaming();
+    method @Deprecated public void writeTo(java.io.OutputStream) throws java.io.IOException;
+  }
+
+  @Deprecated public class FileEntity extends org.apache.http.entity.AbstractHttpEntity implements java.lang.Cloneable {
+    ctor @Deprecated public FileEntity(java.io.File, String);
+    method @Deprecated public Object clone() throws java.lang.CloneNotSupportedException;
+    method @Deprecated public java.io.InputStream getContent() throws java.io.IOException;
+    method @Deprecated public long getContentLength();
+    method @Deprecated public boolean isRepeatable();
+    method @Deprecated public boolean isStreaming();
+    method @Deprecated public void writeTo(java.io.OutputStream) throws java.io.IOException;
+    field @Deprecated protected final java.io.File file;
+  }
+
+  @Deprecated public class HttpEntityWrapper implements org.apache.http.HttpEntity {
+    ctor @Deprecated public HttpEntityWrapper(org.apache.http.HttpEntity);
+    method @Deprecated public void consumeContent() throws java.io.IOException;
+    method @Deprecated public java.io.InputStream getContent() throws java.io.IOException;
+    method @Deprecated public org.apache.http.Header getContentEncoding();
+    method @Deprecated public long getContentLength();
+    method @Deprecated public org.apache.http.Header getContentType();
+    method @Deprecated public boolean isChunked();
+    method @Deprecated public boolean isRepeatable();
+    method @Deprecated public boolean isStreaming();
+    method @Deprecated public void writeTo(java.io.OutputStream) throws java.io.IOException;
+    field @Deprecated protected org.apache.http.HttpEntity wrappedEntity;
+  }
+
+  @Deprecated public class InputStreamEntity extends org.apache.http.entity.AbstractHttpEntity {
+    ctor @Deprecated public InputStreamEntity(java.io.InputStream, long);
+    method @Deprecated public void consumeContent() throws java.io.IOException;
+    method @Deprecated public java.io.InputStream getContent() throws java.io.IOException;
+    method @Deprecated public long getContentLength();
+    method @Deprecated public boolean isRepeatable();
+    method @Deprecated public boolean isStreaming();
+    method @Deprecated public void writeTo(java.io.OutputStream) throws java.io.IOException;
+  }
+
+  @Deprecated public class SerializableEntity extends org.apache.http.entity.AbstractHttpEntity {
+    ctor @Deprecated public SerializableEntity(java.io.Serializable, boolean) throws java.io.IOException;
+    method @Deprecated public java.io.InputStream getContent() throws java.io.IOException, java.lang.IllegalStateException;
+    method @Deprecated public long getContentLength();
+    method @Deprecated public boolean isRepeatable();
+    method @Deprecated public boolean isStreaming();
+    method @Deprecated public void writeTo(java.io.OutputStream) throws java.io.IOException;
+  }
+
+  @Deprecated public class StringEntity extends org.apache.http.entity.AbstractHttpEntity implements java.lang.Cloneable {
+    ctor @Deprecated public StringEntity(String, String) throws java.io.UnsupportedEncodingException;
+    ctor @Deprecated public StringEntity(String) throws java.io.UnsupportedEncodingException;
+    method @Deprecated public Object clone() throws java.lang.CloneNotSupportedException;
+    method @Deprecated public java.io.InputStream getContent() throws java.io.IOException;
+    method @Deprecated public long getContentLength();
+    method @Deprecated public boolean isRepeatable();
+    method @Deprecated public boolean isStreaming();
+    method @Deprecated public void writeTo(java.io.OutputStream) throws java.io.IOException;
+    field @Deprecated protected final byte[] content;
   }
 
 }
 
 package org.apache.http.impl {
 
-  public abstract deprecated class AbstractHttpClientConnection implements org.apache.http.HttpClientConnection {
-    ctor public AbstractHttpClientConnection();
-    method protected abstract void assertOpen() throws java.lang.IllegalStateException;
-    method protected org.apache.http.impl.entity.EntityDeserializer createEntityDeserializer();
-    method protected org.apache.http.impl.entity.EntitySerializer createEntitySerializer();
-    method protected org.apache.http.HttpResponseFactory createHttpResponseFactory();
-    method protected org.apache.http.io.HttpMessageWriter createRequestWriter(org.apache.http.io.SessionOutputBuffer, org.apache.http.params.HttpParams);
-    method protected org.apache.http.io.HttpMessageParser createResponseParser(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpResponseFactory, org.apache.http.params.HttpParams);
-    method protected void doFlush() throws java.io.IOException;
-    method public void flush() throws java.io.IOException;
-    method public org.apache.http.HttpConnectionMetrics getMetrics();
-    method protected void init(org.apache.http.io.SessionInputBuffer, org.apache.http.io.SessionOutputBuffer, org.apache.http.params.HttpParams);
-    method public boolean isResponseAvailable(int) throws java.io.IOException;
-    method public boolean isStale();
-    method public void receiveResponseEntity(org.apache.http.HttpResponse) throws org.apache.http.HttpException, java.io.IOException;
-    method public org.apache.http.HttpResponse receiveResponseHeader() throws org.apache.http.HttpException, java.io.IOException;
-    method public void sendRequestEntity(org.apache.http.HttpEntityEnclosingRequest) throws org.apache.http.HttpException, java.io.IOException;
-    method public void sendRequestHeader(org.apache.http.HttpRequest) throws org.apache.http.HttpException, java.io.IOException;
-  }
-
-  public abstract deprecated class AbstractHttpServerConnection implements org.apache.http.HttpServerConnection {
-    ctor public AbstractHttpServerConnection();
-    method protected abstract void assertOpen() throws java.lang.IllegalStateException;
-    method protected org.apache.http.impl.entity.EntityDeserializer createEntityDeserializer();
-    method protected org.apache.http.impl.entity.EntitySerializer createEntitySerializer();
-    method protected org.apache.http.HttpRequestFactory createHttpRequestFactory();
-    method protected org.apache.http.io.HttpMessageParser createRequestParser(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpRequestFactory, org.apache.http.params.HttpParams);
-    method protected org.apache.http.io.HttpMessageWriter createResponseWriter(org.apache.http.io.SessionOutputBuffer, org.apache.http.params.HttpParams);
-    method protected void doFlush() throws java.io.IOException;
-    method public void flush() throws java.io.IOException;
-    method public org.apache.http.HttpConnectionMetrics getMetrics();
-    method protected void init(org.apache.http.io.SessionInputBuffer, org.apache.http.io.SessionOutputBuffer, org.apache.http.params.HttpParams);
-    method public boolean isStale();
-    method public void receiveRequestEntity(org.apache.http.HttpEntityEnclosingRequest) throws org.apache.http.HttpException, java.io.IOException;
-    method public org.apache.http.HttpRequest receiveRequestHeader() throws org.apache.http.HttpException, java.io.IOException;
-    method public void sendResponseEntity(org.apache.http.HttpResponse) throws org.apache.http.HttpException, java.io.IOException;
-    method public void sendResponseHeader(org.apache.http.HttpResponse) throws org.apache.http.HttpException, java.io.IOException;
-  }
-
-  public deprecated class DefaultConnectionReuseStrategy implements org.apache.http.ConnectionReuseStrategy {
-    ctor public DefaultConnectionReuseStrategy();
-    method protected org.apache.http.TokenIterator createTokenIterator(org.apache.http.HeaderIterator);
-    method public boolean keepAlive(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext);
-  }
-
-  public deprecated class DefaultHttpClientConnection extends org.apache.http.impl.SocketHttpClientConnection {
-    ctor public DefaultHttpClientConnection();
-    method public void bind(java.net.Socket, org.apache.http.params.HttpParams) throws java.io.IOException;
-  }
-
-  public deprecated class DefaultHttpRequestFactory implements org.apache.http.HttpRequestFactory {
-    ctor public DefaultHttpRequestFactory();
-    method public org.apache.http.HttpRequest newHttpRequest(org.apache.http.RequestLine) throws org.apache.http.MethodNotSupportedException;
-    method public org.apache.http.HttpRequest newHttpRequest(java.lang.String, java.lang.String) throws org.apache.http.MethodNotSupportedException;
-  }
-
-  public deprecated class DefaultHttpResponseFactory implements org.apache.http.HttpResponseFactory {
-    ctor public DefaultHttpResponseFactory(org.apache.http.ReasonPhraseCatalog);
-    ctor public DefaultHttpResponseFactory();
-    method protected java.util.Locale determineLocale(org.apache.http.protocol.HttpContext);
-    method public org.apache.http.HttpResponse newHttpResponse(org.apache.http.ProtocolVersion, int, org.apache.http.protocol.HttpContext);
-    method public org.apache.http.HttpResponse newHttpResponse(org.apache.http.StatusLine, org.apache.http.protocol.HttpContext);
-    field protected final org.apache.http.ReasonPhraseCatalog reasonCatalog;
-  }
-
-  public deprecated class DefaultHttpServerConnection extends org.apache.http.impl.SocketHttpServerConnection {
-    ctor public DefaultHttpServerConnection();
-    method public void bind(java.net.Socket, org.apache.http.params.HttpParams) throws java.io.IOException;
-  }
-
-  public deprecated class EnglishReasonPhraseCatalog implements org.apache.http.ReasonPhraseCatalog {
-    ctor protected EnglishReasonPhraseCatalog();
-    method public java.lang.String getReason(int, java.util.Locale);
-    field public static final org.apache.http.impl.EnglishReasonPhraseCatalog INSTANCE;
-  }
-
-  public deprecated class HttpConnectionMetricsImpl implements org.apache.http.HttpConnectionMetrics {
-    ctor public HttpConnectionMetricsImpl(org.apache.http.io.HttpTransportMetrics, org.apache.http.io.HttpTransportMetrics);
-    method public java.lang.Object getMetric(java.lang.String);
-    method public long getReceivedBytesCount();
-    method public long getRequestCount();
-    method public long getResponseCount();
-    method public long getSentBytesCount();
-    method public void incrementRequestCount();
-    method public void incrementResponseCount();
-    method public void reset();
-    method public void setMetric(java.lang.String, java.lang.Object);
-    field public static final java.lang.String RECEIVED_BYTES_COUNT = "http.received-bytes-count";
-    field public static final java.lang.String REQUEST_COUNT = "http.request-count";
-    field public static final java.lang.String RESPONSE_COUNT = "http.response-count";
-    field public static final java.lang.String SENT_BYTES_COUNT = "http.sent-bytes-count";
-  }
-
-  public deprecated class NoConnectionReuseStrategy implements org.apache.http.ConnectionReuseStrategy {
-    ctor public NoConnectionReuseStrategy();
-    method public boolean keepAlive(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext);
-  }
-
-  public deprecated class SocketHttpClientConnection extends org.apache.http.impl.AbstractHttpClientConnection implements org.apache.http.HttpInetConnection {
-    ctor public SocketHttpClientConnection();
-    method protected void assertNotOpen();
-    method protected void assertOpen();
-    method protected void bind(java.net.Socket, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public void close() throws java.io.IOException;
-    method protected org.apache.http.io.SessionInputBuffer createSessionInputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method protected org.apache.http.io.SessionOutputBuffer createSessionOutputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public java.net.InetAddress getLocalAddress();
-    method public int getLocalPort();
-    method public java.net.InetAddress getRemoteAddress();
-    method public int getRemotePort();
-    method protected java.net.Socket getSocket();
-    method public int getSocketTimeout();
-    method public boolean isOpen();
-    method public void setSocketTimeout(int);
-    method public void shutdown() throws java.io.IOException;
-  }
-
-  public deprecated class SocketHttpServerConnection extends org.apache.http.impl.AbstractHttpServerConnection implements org.apache.http.HttpInetConnection {
-    ctor public SocketHttpServerConnection();
-    method protected void assertNotOpen();
-    method protected void assertOpen();
-    method protected void bind(java.net.Socket, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public void close() throws java.io.IOException;
-    method protected org.apache.http.io.SessionInputBuffer createHttpDataReceiver(java.net.Socket, int, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method protected org.apache.http.io.SessionOutputBuffer createHttpDataTransmitter(java.net.Socket, int, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public java.net.InetAddress getLocalAddress();
-    method public int getLocalPort();
-    method public java.net.InetAddress getRemoteAddress();
-    method public int getRemotePort();
-    method protected java.net.Socket getSocket();
-    method public int getSocketTimeout();
-    method public boolean isOpen();
-    method public void setSocketTimeout(int);
-    method public void shutdown() throws java.io.IOException;
+  @Deprecated public abstract class AbstractHttpClientConnection implements org.apache.http.HttpClientConnection {
+    ctor @Deprecated public AbstractHttpClientConnection();
+    method @Deprecated protected abstract void assertOpen() throws java.lang.IllegalStateException;
+    method @Deprecated protected org.apache.http.impl.entity.EntityDeserializer createEntityDeserializer();
+    method @Deprecated protected org.apache.http.impl.entity.EntitySerializer createEntitySerializer();
+    method @Deprecated protected org.apache.http.HttpResponseFactory createHttpResponseFactory();
+    method @Deprecated protected org.apache.http.io.HttpMessageWriter createRequestWriter(org.apache.http.io.SessionOutputBuffer, org.apache.http.params.HttpParams);
+    method @Deprecated protected org.apache.http.io.HttpMessageParser createResponseParser(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpResponseFactory, org.apache.http.params.HttpParams);
+    method @Deprecated protected void doFlush() throws java.io.IOException;
+    method @Deprecated public void flush() throws java.io.IOException;
+    method @Deprecated public org.apache.http.HttpConnectionMetrics getMetrics();
+    method @Deprecated protected void init(org.apache.http.io.SessionInputBuffer, org.apache.http.io.SessionOutputBuffer, org.apache.http.params.HttpParams);
+    method @Deprecated public boolean isResponseAvailable(int) throws java.io.IOException;
+    method @Deprecated public boolean isStale();
+    method @Deprecated public void receiveResponseEntity(org.apache.http.HttpResponse) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public org.apache.http.HttpResponse receiveResponseHeader() throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public void sendRequestEntity(org.apache.http.HttpEntityEnclosingRequest) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public void sendRequestHeader(org.apache.http.HttpRequest) throws org.apache.http.HttpException, java.io.IOException;
+  }
+
+  @Deprecated public abstract class AbstractHttpServerConnection implements org.apache.http.HttpServerConnection {
+    ctor @Deprecated public AbstractHttpServerConnection();
+    method @Deprecated protected abstract void assertOpen() throws java.lang.IllegalStateException;
+    method @Deprecated protected org.apache.http.impl.entity.EntityDeserializer createEntityDeserializer();
+    method @Deprecated protected org.apache.http.impl.entity.EntitySerializer createEntitySerializer();
+    method @Deprecated protected org.apache.http.HttpRequestFactory createHttpRequestFactory();
+    method @Deprecated protected org.apache.http.io.HttpMessageParser createRequestParser(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpRequestFactory, org.apache.http.params.HttpParams);
+    method @Deprecated protected org.apache.http.io.HttpMessageWriter createResponseWriter(org.apache.http.io.SessionOutputBuffer, org.apache.http.params.HttpParams);
+    method @Deprecated protected void doFlush() throws java.io.IOException;
+    method @Deprecated public void flush() throws java.io.IOException;
+    method @Deprecated public org.apache.http.HttpConnectionMetrics getMetrics();
+    method @Deprecated protected void init(org.apache.http.io.SessionInputBuffer, org.apache.http.io.SessionOutputBuffer, org.apache.http.params.HttpParams);
+    method @Deprecated public boolean isStale();
+    method @Deprecated public void receiveRequestEntity(org.apache.http.HttpEntityEnclosingRequest) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public org.apache.http.HttpRequest receiveRequestHeader() throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public void sendResponseEntity(org.apache.http.HttpResponse) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public void sendResponseHeader(org.apache.http.HttpResponse) throws org.apache.http.HttpException, java.io.IOException;
+  }
+
+  @Deprecated public class DefaultConnectionReuseStrategy implements org.apache.http.ConnectionReuseStrategy {
+    ctor @Deprecated public DefaultConnectionReuseStrategy();
+    method @Deprecated protected org.apache.http.TokenIterator createTokenIterator(org.apache.http.HeaderIterator);
+    method @Deprecated public boolean keepAlive(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext);
+  }
+
+  @Deprecated public class DefaultHttpClientConnection extends org.apache.http.impl.SocketHttpClientConnection {
+    ctor @Deprecated public DefaultHttpClientConnection();
+    method @Deprecated public void bind(java.net.Socket, org.apache.http.params.HttpParams) throws java.io.IOException;
+  }
+
+  @Deprecated public class DefaultHttpRequestFactory implements org.apache.http.HttpRequestFactory {
+    ctor @Deprecated public DefaultHttpRequestFactory();
+    method @Deprecated public org.apache.http.HttpRequest newHttpRequest(org.apache.http.RequestLine) throws org.apache.http.MethodNotSupportedException;
+    method @Deprecated public org.apache.http.HttpRequest newHttpRequest(String, String) throws org.apache.http.MethodNotSupportedException;
+  }
+
+  @Deprecated public class DefaultHttpResponseFactory implements org.apache.http.HttpResponseFactory {
+    ctor @Deprecated public DefaultHttpResponseFactory(org.apache.http.ReasonPhraseCatalog);
+    ctor @Deprecated public DefaultHttpResponseFactory();
+    method @Deprecated protected java.util.Locale determineLocale(org.apache.http.protocol.HttpContext);
+    method @Deprecated public org.apache.http.HttpResponse newHttpResponse(org.apache.http.ProtocolVersion, int, org.apache.http.protocol.HttpContext);
+    method @Deprecated public org.apache.http.HttpResponse newHttpResponse(org.apache.http.StatusLine, org.apache.http.protocol.HttpContext);
+    field @Deprecated protected final org.apache.http.ReasonPhraseCatalog reasonCatalog;
+  }
+
+  @Deprecated public class DefaultHttpServerConnection extends org.apache.http.impl.SocketHttpServerConnection {
+    ctor @Deprecated public DefaultHttpServerConnection();
+    method @Deprecated public void bind(java.net.Socket, org.apache.http.params.HttpParams) throws java.io.IOException;
+  }
+
+  @Deprecated public class EnglishReasonPhraseCatalog implements org.apache.http.ReasonPhraseCatalog {
+    ctor @Deprecated protected EnglishReasonPhraseCatalog();
+    method @Deprecated public String getReason(int, java.util.Locale);
+    field @Deprecated public static final org.apache.http.impl.EnglishReasonPhraseCatalog INSTANCE;
+  }
+
+  @Deprecated public class HttpConnectionMetricsImpl implements org.apache.http.HttpConnectionMetrics {
+    ctor @Deprecated public HttpConnectionMetricsImpl(org.apache.http.io.HttpTransportMetrics, org.apache.http.io.HttpTransportMetrics);
+    method @Deprecated public Object getMetric(String);
+    method @Deprecated public long getReceivedBytesCount();
+    method @Deprecated public long getRequestCount();
+    method @Deprecated public long getResponseCount();
+    method @Deprecated public long getSentBytesCount();
+    method @Deprecated public void incrementRequestCount();
+    method @Deprecated public void incrementResponseCount();
+    method @Deprecated public void reset();
+    method @Deprecated public void setMetric(String, Object);
+    field @Deprecated public static final String RECEIVED_BYTES_COUNT = "http.received-bytes-count";
+    field @Deprecated public static final String REQUEST_COUNT = "http.request-count";
+    field @Deprecated public static final String RESPONSE_COUNT = "http.response-count";
+    field @Deprecated public static final String SENT_BYTES_COUNT = "http.sent-bytes-count";
+  }
+
+  @Deprecated public class NoConnectionReuseStrategy implements org.apache.http.ConnectionReuseStrategy {
+    ctor @Deprecated public NoConnectionReuseStrategy();
+    method @Deprecated public boolean keepAlive(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext);
+  }
+
+  @Deprecated public class SocketHttpClientConnection extends org.apache.http.impl.AbstractHttpClientConnection implements org.apache.http.HttpInetConnection {
+    ctor @Deprecated public SocketHttpClientConnection();
+    method @Deprecated protected void assertNotOpen();
+    method @Deprecated protected void assertOpen();
+    method @Deprecated protected void bind(java.net.Socket, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public void close() throws java.io.IOException;
+    method @Deprecated protected org.apache.http.io.SessionInputBuffer createSessionInputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated protected org.apache.http.io.SessionOutputBuffer createSessionOutputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public java.net.InetAddress getLocalAddress();
+    method @Deprecated public int getLocalPort();
+    method @Deprecated public java.net.InetAddress getRemoteAddress();
+    method @Deprecated public int getRemotePort();
+    method @Deprecated protected java.net.Socket getSocket();
+    method @Deprecated public int getSocketTimeout();
+    method @Deprecated public boolean isOpen();
+    method @Deprecated public void setSocketTimeout(int);
+    method @Deprecated public void shutdown() throws java.io.IOException;
+  }
+
+  @Deprecated public class SocketHttpServerConnection extends org.apache.http.impl.AbstractHttpServerConnection implements org.apache.http.HttpInetConnection {
+    ctor @Deprecated public SocketHttpServerConnection();
+    method @Deprecated protected void assertNotOpen();
+    method @Deprecated protected void assertOpen();
+    method @Deprecated protected void bind(java.net.Socket, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public void close() throws java.io.IOException;
+    method @Deprecated protected org.apache.http.io.SessionInputBuffer createHttpDataReceiver(java.net.Socket, int, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated protected org.apache.http.io.SessionOutputBuffer createHttpDataTransmitter(java.net.Socket, int, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public java.net.InetAddress getLocalAddress();
+    method @Deprecated public int getLocalPort();
+    method @Deprecated public java.net.InetAddress getRemoteAddress();
+    method @Deprecated public int getRemotePort();
+    method @Deprecated protected java.net.Socket getSocket();
+    method @Deprecated public int getSocketTimeout();
+    method @Deprecated public boolean isOpen();
+    method @Deprecated public void setSocketTimeout(int);
+    method @Deprecated public void shutdown() throws java.io.IOException;
   }
 
 }
 
 package org.apache.http.impl.auth {
 
-  public abstract deprecated class AuthSchemeBase implements org.apache.http.auth.AuthScheme {
-    ctor public AuthSchemeBase();
-    method public boolean isProxy();
-    method protected abstract void parseChallenge(org.apache.http.util.CharArrayBuffer, int, int) throws org.apache.http.auth.MalformedChallengeException;
-    method public void processChallenge(org.apache.http.Header) throws org.apache.http.auth.MalformedChallengeException;
+  @Deprecated public abstract class AuthSchemeBase implements org.apache.http.auth.AuthScheme {
+    ctor @Deprecated public AuthSchemeBase();
+    method @Deprecated public boolean isProxy();
+    method @Deprecated protected abstract void parseChallenge(org.apache.http.util.CharArrayBuffer, int, int) throws org.apache.http.auth.MalformedChallengeException;
+    method @Deprecated public void processChallenge(org.apache.http.Header) throws org.apache.http.auth.MalformedChallengeException;
   }
 
-  public deprecated class BasicScheme extends org.apache.http.impl.auth.RFC2617Scheme {
-    ctor public BasicScheme();
-    method public org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest) throws org.apache.http.auth.AuthenticationException;
-    method public static org.apache.http.Header authenticate(org.apache.http.auth.Credentials, java.lang.String, boolean);
-    method public java.lang.String getSchemeName();
-    method public boolean isComplete();
-    method public boolean isConnectionBased();
+  @Deprecated public class BasicScheme extends org.apache.http.impl.auth.RFC2617Scheme {
+    ctor @Deprecated public BasicScheme();
+    method @Deprecated public org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest) throws org.apache.http.auth.AuthenticationException;
+    method @Deprecated public static org.apache.http.Header authenticate(org.apache.http.auth.Credentials, String, boolean);
+    method @Deprecated public String getSchemeName();
+    method @Deprecated public boolean isComplete();
+    method @Deprecated public boolean isConnectionBased();
   }
 
-  public deprecated class BasicSchemeFactory implements org.apache.http.auth.AuthSchemeFactory {
-    ctor public BasicSchemeFactory();
-    method public org.apache.http.auth.AuthScheme newInstance(org.apache.http.params.HttpParams);
+  @Deprecated public class BasicSchemeFactory implements org.apache.http.auth.AuthSchemeFactory {
+    ctor @Deprecated public BasicSchemeFactory();
+    method @Deprecated public org.apache.http.auth.AuthScheme newInstance(org.apache.http.params.HttpParams);
   }
 
-  public deprecated class DigestScheme extends org.apache.http.impl.auth.RFC2617Scheme {
-    ctor public DigestScheme();
-    method public org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest) throws org.apache.http.auth.AuthenticationException;
-    method public static java.lang.String createCnonce();
-    method public java.lang.String getSchemeName();
-    method public boolean isComplete();
-    method public boolean isConnectionBased();
-    method public void overrideParamter(java.lang.String, java.lang.String);
+  @Deprecated public class DigestScheme extends org.apache.http.impl.auth.RFC2617Scheme {
+    ctor @Deprecated public DigestScheme();
+    method @Deprecated public org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest) throws org.apache.http.auth.AuthenticationException;
+    method @Deprecated public static String createCnonce();
+    method @Deprecated public String getSchemeName();
+    method @Deprecated public boolean isComplete();
+    method @Deprecated public boolean isConnectionBased();
+    method @Deprecated public void overrideParamter(String, String);
   }
 
-  public deprecated class DigestSchemeFactory implements org.apache.http.auth.AuthSchemeFactory {
-    ctor public DigestSchemeFactory();
-    method public org.apache.http.auth.AuthScheme newInstance(org.apache.http.params.HttpParams);
+  @Deprecated public class DigestSchemeFactory implements org.apache.http.auth.AuthSchemeFactory {
+    ctor @Deprecated public DigestSchemeFactory();
+    method @Deprecated public org.apache.http.auth.AuthScheme newInstance(org.apache.http.params.HttpParams);
   }
 
-  public abstract deprecated interface NTLMEngine {
-    method public abstract java.lang.String generateType1Msg(java.lang.String, java.lang.String) throws org.apache.http.impl.auth.NTLMEngineException;
-    method public abstract java.lang.String generateType3Msg(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String) throws org.apache.http.impl.auth.NTLMEngineException;
+  @Deprecated public interface NTLMEngine {
+    method @Deprecated public String generateType1Msg(String, String) throws org.apache.http.impl.auth.NTLMEngineException;
+    method @Deprecated public String generateType3Msg(String, String, String, String, String) throws org.apache.http.impl.auth.NTLMEngineException;
   }
 
-  public deprecated class NTLMEngineException extends org.apache.http.auth.AuthenticationException {
-    ctor public NTLMEngineException();
-    ctor public NTLMEngineException(java.lang.String);
-    ctor public NTLMEngineException(java.lang.String, java.lang.Throwable);
+  @Deprecated public class NTLMEngineException extends org.apache.http.auth.AuthenticationException {
+    ctor @Deprecated public NTLMEngineException();
+    ctor @Deprecated public NTLMEngineException(String);
+    ctor @Deprecated public NTLMEngineException(String, Throwable);
   }
 
-  public deprecated class NTLMScheme extends org.apache.http.impl.auth.AuthSchemeBase {
-    ctor public NTLMScheme(org.apache.http.impl.auth.NTLMEngine);
-    method public org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest) throws org.apache.http.auth.AuthenticationException;
-    method public java.lang.String getParameter(java.lang.String);
-    method public java.lang.String getRealm();
-    method public java.lang.String getSchemeName();
-    method public boolean isComplete();
-    method public boolean isConnectionBased();
-    method protected void parseChallenge(org.apache.http.util.CharArrayBuffer, int, int) throws org.apache.http.auth.MalformedChallengeException;
+  @Deprecated public class NTLMScheme extends org.apache.http.impl.auth.AuthSchemeBase {
+    ctor @Deprecated public NTLMScheme(org.apache.http.impl.auth.NTLMEngine);
+    method @Deprecated public org.apache.http.Header authenticate(org.apache.http.auth.Credentials, org.apache.http.HttpRequest) throws org.apache.http.auth.AuthenticationException;
+    method @Deprecated public String getParameter(String);
+    method @Deprecated public String getRealm();
+    method @Deprecated public String getSchemeName();
+    method @Deprecated public boolean isComplete();
+    method @Deprecated public boolean isConnectionBased();
+    method @Deprecated protected void parseChallenge(org.apache.http.util.CharArrayBuffer, int, int) throws org.apache.http.auth.MalformedChallengeException;
   }
 
-  public abstract deprecated class RFC2617Scheme extends org.apache.http.impl.auth.AuthSchemeBase {
-    ctor public RFC2617Scheme();
-    method public java.lang.String getParameter(java.lang.String);
-    method protected java.util.Map<java.lang.String, java.lang.String> getParameters();
-    method public java.lang.String getRealm();
-    method protected void parseChallenge(org.apache.http.util.CharArrayBuffer, int, int) throws org.apache.http.auth.MalformedChallengeException;
+  @Deprecated public abstract class RFC2617Scheme extends org.apache.http.impl.auth.AuthSchemeBase {
+    ctor @Deprecated public RFC2617Scheme();
+    method @Deprecated public String getParameter(String);
+    method @Deprecated protected java.util.Map<java.lang.String,java.lang.String> getParameters();
+    method @Deprecated public String getRealm();
+    method @Deprecated protected void parseChallenge(org.apache.http.util.CharArrayBuffer, int, int) throws org.apache.http.auth.MalformedChallengeException;
   }
 
-  public deprecated class UnsupportedDigestAlgorithmException extends java.lang.RuntimeException {
-    ctor public UnsupportedDigestAlgorithmException();
-    ctor public UnsupportedDigestAlgorithmException(java.lang.String);
-    ctor public UnsupportedDigestAlgorithmException(java.lang.String, java.lang.Throwable);
+  @Deprecated public class UnsupportedDigestAlgorithmException extends java.lang.RuntimeException {
+    ctor @Deprecated public UnsupportedDigestAlgorithmException();
+    ctor @Deprecated public UnsupportedDigestAlgorithmException(String);
+    ctor @Deprecated public UnsupportedDigestAlgorithmException(String, Throwable);
   }
 
 }
 
 package org.apache.http.impl.client {
 
-  public abstract deprecated class AbstractAuthenticationHandler implements org.apache.http.client.AuthenticationHandler {
-    ctor public AbstractAuthenticationHandler();
-    method protected java.util.List<java.lang.String> getAuthPreferences();
-    method protected java.util.Map<java.lang.String, org.apache.http.Header> parseChallenges(org.apache.http.Header[]) throws org.apache.http.auth.MalformedChallengeException;
-    method public org.apache.http.auth.AuthScheme selectScheme(java.util.Map<java.lang.String, org.apache.http.Header>, org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.auth.AuthenticationException;
-  }
-
-  public abstract deprecated class AbstractHttpClient implements org.apache.http.client.HttpClient {
-    ctor protected AbstractHttpClient(org.apache.http.conn.ClientConnectionManager, org.apache.http.params.HttpParams);
-    method public synchronized void addRequestInterceptor(org.apache.http.HttpRequestInterceptor);
-    method public synchronized void addRequestInterceptor(org.apache.http.HttpRequestInterceptor, int);
-    method public synchronized void addResponseInterceptor(org.apache.http.HttpResponseInterceptor);
-    method public synchronized void addResponseInterceptor(org.apache.http.HttpResponseInterceptor, int);
-    method public synchronized void clearRequestInterceptors();
-    method public synchronized void clearResponseInterceptors();
-    method protected abstract org.apache.http.auth.AuthSchemeRegistry createAuthSchemeRegistry();
-    method protected abstract org.apache.http.conn.ClientConnectionManager createClientConnectionManager();
-    method protected org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams);
-    method protected abstract org.apache.http.conn.ConnectionKeepAliveStrategy createConnectionKeepAliveStrategy();
-    method protected abstract org.apache.http.ConnectionReuseStrategy createConnectionReuseStrategy();
-    method protected abstract org.apache.http.cookie.CookieSpecRegistry createCookieSpecRegistry();
-    method protected abstract org.apache.http.client.CookieStore createCookieStore();
-    method protected abstract org.apache.http.client.CredentialsProvider createCredentialsProvider();
-    method protected abstract org.apache.http.protocol.HttpContext createHttpContext();
-    method protected abstract org.apache.http.params.HttpParams createHttpParams();
-    method protected abstract org.apache.http.protocol.BasicHttpProcessor createHttpProcessor();
-    method protected abstract org.apache.http.client.HttpRequestRetryHandler createHttpRequestRetryHandler();
-    method protected abstract org.apache.http.conn.routing.HttpRoutePlanner createHttpRoutePlanner();
-    method protected abstract org.apache.http.client.AuthenticationHandler createProxyAuthenticationHandler();
-    method protected abstract org.apache.http.client.RedirectHandler createRedirectHandler();
-    method protected abstract org.apache.http.protocol.HttpRequestExecutor createRequestExecutor();
-    method protected abstract org.apache.http.client.AuthenticationHandler createTargetAuthenticationHandler();
-    method protected abstract org.apache.http.client.UserTokenHandler createUserTokenHandler();
-    method protected org.apache.http.params.HttpParams determineParams(org.apache.http.HttpRequest);
-    method public final org.apache.http.HttpResponse execute(org.apache.http.client.methods.HttpUriRequest) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
-    method public final org.apache.http.HttpResponse execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
-    method public final org.apache.http.HttpResponse execute(org.apache.http.HttpHost, org.apache.http.HttpRequest) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
-    method public final org.apache.http.HttpResponse execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
-    method public <T> T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler<? extends T>) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
-    method public <T> T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler<? extends T>, org.apache.http.protocol.HttpContext) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
-    method public <T> T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler<? extends T>) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
-    method public <T> T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler<? extends T>, org.apache.http.protocol.HttpContext) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
-    method public final synchronized org.apache.http.auth.AuthSchemeRegistry getAuthSchemes();
-    method public final synchronized org.apache.http.conn.ConnectionKeepAliveStrategy getConnectionKeepAliveStrategy();
-    method public final synchronized org.apache.http.conn.ClientConnectionManager getConnectionManager();
-    method public final synchronized org.apache.http.ConnectionReuseStrategy getConnectionReuseStrategy();
-    method public final synchronized org.apache.http.cookie.CookieSpecRegistry getCookieSpecs();
-    method public final synchronized org.apache.http.client.CookieStore getCookieStore();
-    method public final synchronized org.apache.http.client.CredentialsProvider getCredentialsProvider();
-    method protected final synchronized org.apache.http.protocol.BasicHttpProcessor getHttpProcessor();
-    method public final synchronized org.apache.http.client.HttpRequestRetryHandler getHttpRequestRetryHandler();
-    method public final synchronized org.apache.http.params.HttpParams getParams();
-    method public final synchronized org.apache.http.client.AuthenticationHandler getProxyAuthenticationHandler();
-    method public final synchronized org.apache.http.client.RedirectHandler getRedirectHandler();
-    method public final synchronized org.apache.http.protocol.HttpRequestExecutor getRequestExecutor();
-    method public synchronized org.apache.http.HttpRequestInterceptor getRequestInterceptor(int);
-    method public synchronized int getRequestInterceptorCount();
-    method public synchronized org.apache.http.HttpResponseInterceptor getResponseInterceptor(int);
-    method public synchronized int getResponseInterceptorCount();
-    method public final synchronized org.apache.http.conn.routing.HttpRoutePlanner getRoutePlanner();
-    method public final synchronized org.apache.http.client.AuthenticationHandler getTargetAuthenticationHandler();
-    method public final synchronized org.apache.http.client.UserTokenHandler getUserTokenHandler();
-    method public void removeRequestInterceptorByClass(java.lang.Class<? extends org.apache.http.HttpRequestInterceptor>);
-    method public void removeResponseInterceptorByClass(java.lang.Class<? extends org.apache.http.HttpResponseInterceptor>);
-    method public synchronized void setAuthSchemes(org.apache.http.auth.AuthSchemeRegistry);
-    method public synchronized void setCookieSpecs(org.apache.http.cookie.CookieSpecRegistry);
-    method public synchronized void setCookieStore(org.apache.http.client.CookieStore);
-    method public synchronized void setCredentialsProvider(org.apache.http.client.CredentialsProvider);
-    method public synchronized void setHttpRequestRetryHandler(org.apache.http.client.HttpRequestRetryHandler);
-    method public synchronized void setKeepAliveStrategy(org.apache.http.conn.ConnectionKeepAliveStrategy);
-    method public synchronized void setParams(org.apache.http.params.HttpParams);
-    method public synchronized void setProxyAuthenticationHandler(org.apache.http.client.AuthenticationHandler);
-    method public synchronized void setRedirectHandler(org.apache.http.client.RedirectHandler);
-    method public synchronized void setReuseStrategy(org.apache.http.ConnectionReuseStrategy);
-    method public synchronized void setRoutePlanner(org.apache.http.conn.routing.HttpRoutePlanner);
-    method public synchronized void setTargetAuthenticationHandler(org.apache.http.client.AuthenticationHandler);
-    method public synchronized void setUserTokenHandler(org.apache.http.client.UserTokenHandler);
-  }
-
-  public deprecated class BasicCookieStore implements org.apache.http.client.CookieStore {
-    ctor public BasicCookieStore();
-    method public synchronized void addCookie(org.apache.http.cookie.Cookie);
-    method public synchronized void addCookies(org.apache.http.cookie.Cookie[]);
-    method public synchronized void clear();
-    method public synchronized boolean clearExpired(java.util.Date);
-    method public synchronized java.util.List<org.apache.http.cookie.Cookie> getCookies();
-  }
-
-  public deprecated class BasicCredentialsProvider implements org.apache.http.client.CredentialsProvider {
-    ctor public BasicCredentialsProvider();
-    method public synchronized void clear();
-    method public synchronized org.apache.http.auth.Credentials getCredentials(org.apache.http.auth.AuthScope);
-    method public synchronized void setCredentials(org.apache.http.auth.AuthScope, org.apache.http.auth.Credentials);
-  }
-
-  public deprecated class BasicResponseHandler implements org.apache.http.client.ResponseHandler {
-    ctor public BasicResponseHandler();
-    method public java.lang.String handleResponse(org.apache.http.HttpResponse) throws org.apache.http.client.HttpResponseException, java.io.IOException;
-  }
-
-  public deprecated class ClientParamsStack extends org.apache.http.params.AbstractHttpParams {
-    ctor public ClientParamsStack(org.apache.http.params.HttpParams, org.apache.http.params.HttpParams, org.apache.http.params.HttpParams, org.apache.http.params.HttpParams);
-    ctor public ClientParamsStack(org.apache.http.impl.client.ClientParamsStack);
-    ctor public ClientParamsStack(org.apache.http.impl.client.ClientParamsStack, org.apache.http.params.HttpParams, org.apache.http.params.HttpParams, org.apache.http.params.HttpParams, org.apache.http.params.HttpParams);
-    method public org.apache.http.params.HttpParams copy();
-    method public final org.apache.http.params.HttpParams getApplicationParams();
-    method public final org.apache.http.params.HttpParams getClientParams();
-    method public final org.apache.http.params.HttpParams getOverrideParams();
-    method public java.lang.Object getParameter(java.lang.String);
-    method public final org.apache.http.params.HttpParams getRequestParams();
-    method public boolean removeParameter(java.lang.String);
-    method public org.apache.http.params.HttpParams setParameter(java.lang.String, java.lang.Object) throws java.lang.UnsupportedOperationException;
-    field protected final org.apache.http.params.HttpParams applicationParams;
-    field protected final org.apache.http.params.HttpParams clientParams;
-    field protected final org.apache.http.params.HttpParams overrideParams;
-    field protected final org.apache.http.params.HttpParams requestParams;
-  }
-
-  public deprecated class DefaultConnectionKeepAliveStrategy implements org.apache.http.conn.ConnectionKeepAliveStrategy {
-    ctor public DefaultConnectionKeepAliveStrategy();
-    method public long getKeepAliveDuration(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext);
-  }
-
-  public deprecated class DefaultHttpClient extends org.apache.http.impl.client.AbstractHttpClient {
-    ctor public DefaultHttpClient(org.apache.http.conn.ClientConnectionManager, org.apache.http.params.HttpParams);
-    ctor public DefaultHttpClient(org.apache.http.params.HttpParams);
-    ctor public DefaultHttpClient();
-    method protected org.apache.http.auth.AuthSchemeRegistry createAuthSchemeRegistry();
-    method protected org.apache.http.conn.ClientConnectionManager createClientConnectionManager();
-    method protected org.apache.http.conn.ConnectionKeepAliveStrategy createConnectionKeepAliveStrategy();
-    method protected org.apache.http.ConnectionReuseStrategy createConnectionReuseStrategy();
-    method protected org.apache.http.cookie.CookieSpecRegistry createCookieSpecRegistry();
-    method protected org.apache.http.client.CookieStore createCookieStore();
-    method protected org.apache.http.client.CredentialsProvider createCredentialsProvider();
-    method protected org.apache.http.protocol.HttpContext createHttpContext();
-    method protected org.apache.http.params.HttpParams createHttpParams();
-    method protected org.apache.http.protocol.BasicHttpProcessor createHttpProcessor();
-    method protected org.apache.http.client.HttpRequestRetryHandler createHttpRequestRetryHandler();
-    method protected org.apache.http.conn.routing.HttpRoutePlanner createHttpRoutePlanner();
-    method protected org.apache.http.client.AuthenticationHandler createProxyAuthenticationHandler();
-    method protected org.apache.http.client.RedirectHandler createRedirectHandler();
-    method protected org.apache.http.protocol.HttpRequestExecutor createRequestExecutor();
-    method protected org.apache.http.client.AuthenticationHandler createTargetAuthenticationHandler();
-    method protected org.apache.http.client.UserTokenHandler createUserTokenHandler();
-  }
-
-  public deprecated class DefaultHttpRequestRetryHandler implements org.apache.http.client.HttpRequestRetryHandler {
-    ctor public DefaultHttpRequestRetryHandler(int, boolean);
-    ctor public DefaultHttpRequestRetryHandler();
-    method public int getRetryCount();
-    method public boolean isRequestSentRetryEnabled();
-    method public boolean retryRequest(java.io.IOException, int, org.apache.http.protocol.HttpContext);
-  }
-
-  public deprecated class DefaultProxyAuthenticationHandler extends org.apache.http.impl.client.AbstractAuthenticationHandler {
-    ctor public DefaultProxyAuthenticationHandler();
-    method public java.util.Map<java.lang.String, org.apache.http.Header> getChallenges(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.auth.MalformedChallengeException;
-    method public boolean isAuthenticationRequested(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext);
-  }
-
-  public deprecated class DefaultRedirectHandler implements org.apache.http.client.RedirectHandler {
-    ctor public DefaultRedirectHandler();
-    method public java.net.URI getLocationURI(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.ProtocolException;
-    method public boolean isRedirectRequested(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext);
-  }
-
-  public deprecated class DefaultRequestDirector implements org.apache.http.client.RequestDirector {
-    ctor public DefaultRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams);
-    method protected org.apache.http.HttpRequest createConnectRequest(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext);
-    method protected boolean createTunnelToProxy(org.apache.http.conn.routing.HttpRoute, int, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
-    method protected boolean createTunnelToTarget(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
-    method protected org.apache.http.conn.routing.HttpRoute determineRoute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException;
-    method protected void establishRoute(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
-    method public org.apache.http.HttpResponse execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
-    method protected org.apache.http.impl.client.RoutedRequest handleResponse(org.apache.http.impl.client.RoutedRequest, org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
-    method protected void releaseConnection();
-    method protected void rewriteRequestURI(org.apache.http.impl.client.RequestWrapper, org.apache.http.conn.routing.HttpRoute) throws org.apache.http.ProtocolException;
-    field protected final org.apache.http.conn.ClientConnectionManager connManager;
-    field protected final org.apache.http.protocol.HttpProcessor httpProcessor;
-    field protected final org.apache.http.conn.ConnectionKeepAliveStrategy keepAliveStrategy;
-    field protected org.apache.http.conn.ManagedClientConnection managedConn;
-    field protected final org.apache.http.params.HttpParams params;
-    field protected final org.apache.http.client.RedirectHandler redirectHandler;
-    field protected final org.apache.http.protocol.HttpRequestExecutor requestExec;
-    field protected final org.apache.http.client.HttpRequestRetryHandler retryHandler;
-    field protected final org.apache.http.ConnectionReuseStrategy reuseStrategy;
-    field protected final org.apache.http.conn.routing.HttpRoutePlanner routePlanner;
-  }
-
-  public deprecated class DefaultTargetAuthenticationHandler extends org.apache.http.impl.client.AbstractAuthenticationHandler {
-    ctor public DefaultTargetAuthenticationHandler();
-    method public java.util.Map<java.lang.String, org.apache.http.Header> getChallenges(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.auth.MalformedChallengeException;
-    method public boolean isAuthenticationRequested(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext);
-  }
-
-  public deprecated class DefaultUserTokenHandler implements org.apache.http.client.UserTokenHandler {
-    ctor public DefaultUserTokenHandler();
-    method public java.lang.Object getUserToken(org.apache.http.protocol.HttpContext);
-  }
-
-  public deprecated class EntityEnclosingRequestWrapper extends org.apache.http.impl.client.RequestWrapper implements org.apache.http.HttpEntityEnclosingRequest {
-    ctor public EntityEnclosingRequestWrapper(org.apache.http.HttpEntityEnclosingRequest) throws org.apache.http.ProtocolException;
-    method public boolean expectContinue();
-    method public org.apache.http.HttpEntity getEntity();
-    method public void setEntity(org.apache.http.HttpEntity);
-  }
-
-  public deprecated class RedirectLocations {
-    ctor public RedirectLocations();
-    method public void add(java.net.URI);
-    method public boolean contains(java.net.URI);
-    method public boolean remove(java.net.URI);
-  }
-
-  public deprecated class RequestWrapper extends org.apache.http.message.AbstractHttpMessage implements org.apache.http.client.methods.HttpUriRequest {
-    ctor public RequestWrapper(org.apache.http.HttpRequest) throws org.apache.http.ProtocolException;
-    method public void abort() throws java.lang.UnsupportedOperationException;
-    method public int getExecCount();
-    method public java.lang.String getMethod();
-    method public org.apache.http.HttpRequest getOriginal();
-    method public org.apache.http.ProtocolVersion getProtocolVersion();
-    method public org.apache.http.RequestLine getRequestLine();
-    method public java.net.URI getURI();
-    method public void incrementExecCount();
-    method public boolean isAborted();
-    method public boolean isRepeatable();
-    method public void resetHeaders();
-    method public void setMethod(java.lang.String);
-    method public void setProtocolVersion(org.apache.http.ProtocolVersion);
-    method public void setURI(java.net.URI);
-  }
-
-  public deprecated class RoutedRequest {
-    ctor public RoutedRequest(org.apache.http.impl.client.RequestWrapper, org.apache.http.conn.routing.HttpRoute);
-    method public final org.apache.http.impl.client.RequestWrapper getRequest();
-    method public final org.apache.http.conn.routing.HttpRoute getRoute();
-    field protected final org.apache.http.impl.client.RequestWrapper request;
-    field protected final org.apache.http.conn.routing.HttpRoute route;
-  }
-
-  public deprecated class TunnelRefusedException extends org.apache.http.HttpException {
-    ctor public TunnelRefusedException(java.lang.String, org.apache.http.HttpResponse);
-    method public org.apache.http.HttpResponse getResponse();
+  @Deprecated public abstract class AbstractAuthenticationHandler implements org.apache.http.client.AuthenticationHandler {
+    ctor @Deprecated public AbstractAuthenticationHandler();
+    method @Deprecated protected java.util.List<java.lang.String> getAuthPreferences();
+    method @Deprecated protected java.util.Map<java.lang.String,org.apache.http.Header> parseChallenges(org.apache.http.Header[]) throws org.apache.http.auth.MalformedChallengeException;
+    method @Deprecated public org.apache.http.auth.AuthScheme selectScheme(java.util.Map<java.lang.String,org.apache.http.Header>, org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.auth.AuthenticationException;
+  }
+
+  @Deprecated public abstract class AbstractHttpClient implements org.apache.http.client.HttpClient {
+    ctor @Deprecated protected AbstractHttpClient(org.apache.http.conn.ClientConnectionManager, org.apache.http.params.HttpParams);
+    method @Deprecated public void addRequestInterceptor(org.apache.http.HttpRequestInterceptor);
+    method @Deprecated public void addRequestInterceptor(org.apache.http.HttpRequestInterceptor, int);
+    method @Deprecated public void addResponseInterceptor(org.apache.http.HttpResponseInterceptor);
+    method @Deprecated public void addResponseInterceptor(org.apache.http.HttpResponseInterceptor, int);
+    method @Deprecated public void clearRequestInterceptors();
+    method @Deprecated public void clearResponseInterceptors();
+    method @Deprecated protected abstract org.apache.http.auth.AuthSchemeRegistry createAuthSchemeRegistry();
+    method @Deprecated protected abstract org.apache.http.conn.ClientConnectionManager createClientConnectionManager();
+    method @Deprecated protected org.apache.http.client.RequestDirector createClientRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams);
+    method @Deprecated protected abstract org.apache.http.conn.ConnectionKeepAliveStrategy createConnectionKeepAliveStrategy();
+    method @Deprecated protected abstract org.apache.http.ConnectionReuseStrategy createConnectionReuseStrategy();
+    method @Deprecated protected abstract org.apache.http.cookie.CookieSpecRegistry createCookieSpecRegistry();
+    method @Deprecated protected abstract org.apache.http.client.CookieStore createCookieStore();
+    method @Deprecated protected abstract org.apache.http.client.CredentialsProvider createCredentialsProvider();
+    method @Deprecated protected abstract org.apache.http.protocol.HttpContext createHttpContext();
+    method @Deprecated protected abstract org.apache.http.params.HttpParams createHttpParams();
+    method @Deprecated protected abstract org.apache.http.protocol.BasicHttpProcessor createHttpProcessor();
+    method @Deprecated protected abstract org.apache.http.client.HttpRequestRetryHandler createHttpRequestRetryHandler();
+    method @Deprecated protected abstract org.apache.http.conn.routing.HttpRoutePlanner createHttpRoutePlanner();
+    method @Deprecated protected abstract org.apache.http.client.AuthenticationHandler createProxyAuthenticationHandler();
+    method @Deprecated protected abstract org.apache.http.client.RedirectHandler createRedirectHandler();
+    method @Deprecated protected abstract org.apache.http.protocol.HttpRequestExecutor createRequestExecutor();
+    method @Deprecated protected abstract org.apache.http.client.AuthenticationHandler createTargetAuthenticationHandler();
+    method @Deprecated protected abstract org.apache.http.client.UserTokenHandler createUserTokenHandler();
+    method @Deprecated protected org.apache.http.params.HttpParams determineParams(org.apache.http.HttpRequest);
+    method @Deprecated public final org.apache.http.HttpResponse execute(org.apache.http.client.methods.HttpUriRequest) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
+    method @Deprecated public final org.apache.http.HttpResponse execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
+    method @Deprecated public final org.apache.http.HttpResponse execute(org.apache.http.HttpHost, org.apache.http.HttpRequest) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
+    method @Deprecated public final org.apache.http.HttpResponse execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
+    method @Deprecated public <T> T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler<? extends T>) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
+    method @Deprecated public <T> T execute(org.apache.http.client.methods.HttpUriRequest, org.apache.http.client.ResponseHandler<? extends T>, org.apache.http.protocol.HttpContext) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
+    method @Deprecated public <T> T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler<? extends T>) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
+    method @Deprecated public <T> T execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.client.ResponseHandler<? extends T>, org.apache.http.protocol.HttpContext) throws org.apache.http.client.ClientProtocolException, java.io.IOException;
+    method @Deprecated public final org.apache.http.auth.AuthSchemeRegistry getAuthSchemes();
+    method @Deprecated public final org.apache.http.conn.ConnectionKeepAliveStrategy getConnectionKeepAliveStrategy();
+    method @Deprecated public final org.apache.http.conn.ClientConnectionManager getConnectionManager();
+    method @Deprecated public final org.apache.http.ConnectionReuseStrategy getConnectionReuseStrategy();
+    method @Deprecated public final org.apache.http.cookie.CookieSpecRegistry getCookieSpecs();
+    method @Deprecated public final org.apache.http.client.CookieStore getCookieStore();
+    method @Deprecated public final org.apache.http.client.CredentialsProvider getCredentialsProvider();
+    method @Deprecated protected final org.apache.http.protocol.BasicHttpProcessor getHttpProcessor();
+    method @Deprecated public final org.apache.http.client.HttpRequestRetryHandler getHttpRequestRetryHandler();
+    method @Deprecated public final org.apache.http.params.HttpParams getParams();
+    method @Deprecated public final org.apache.http.client.AuthenticationHandler getProxyAuthenticationHandler();
+    method @Deprecated public final org.apache.http.client.RedirectHandler getRedirectHandler();
+    method @Deprecated public final org.apache.http.protocol.HttpRequestExecutor getRequestExecutor();
+    method @Deprecated public org.apache.http.HttpRequestInterceptor getRequestInterceptor(int);
+    method @Deprecated public int getRequestInterceptorCount();
+    method @Deprecated public org.apache.http.HttpResponseInterceptor getResponseInterceptor(int);
+    method @Deprecated public int getResponseInterceptorCount();
+    method @Deprecated public final org.apache.http.conn.routing.HttpRoutePlanner getRoutePlanner();
+    method @Deprecated public final org.apache.http.client.AuthenticationHandler getTargetAuthenticationHandler();
+    method @Deprecated public final org.apache.http.client.UserTokenHandler getUserTokenHandler();
+    method @Deprecated public void removeRequestInterceptorByClass(Class<? extends org.apache.http.HttpRequestInterceptor>);
+    method @Deprecated public void removeResponseInterceptorByClass(Class<? extends org.apache.http.HttpResponseInterceptor>);
+    method @Deprecated public void setAuthSchemes(org.apache.http.auth.AuthSchemeRegistry);
+    method @Deprecated public void setCookieSpecs(org.apache.http.cookie.CookieSpecRegistry);
+    method @Deprecated public void setCookieStore(org.apache.http.client.CookieStore);
+    method @Deprecated public void setCredentialsProvider(org.apache.http.client.CredentialsProvider);
+    method @Deprecated public void setHttpRequestRetryHandler(org.apache.http.client.HttpRequestRetryHandler);
+    method @Deprecated public void setKeepAliveStrategy(org.apache.http.conn.ConnectionKeepAliveStrategy);
+    method @Deprecated public void setParams(org.apache.http.params.HttpParams);
+    method @Deprecated public void setProxyAuthenticationHandler(org.apache.http.client.AuthenticationHandler);
+    method @Deprecated public void setRedirectHandler(org.apache.http.client.RedirectHandler);
+    method @Deprecated public void setReuseStrategy(org.apache.http.ConnectionReuseStrategy);
+    method @Deprecated public void setRoutePlanner(org.apache.http.conn.routing.HttpRoutePlanner);
+    method @Deprecated public void setTargetAuthenticationHandler(org.apache.http.client.AuthenticationHandler);
+    method @Deprecated public void setUserTokenHandler(org.apache.http.client.UserTokenHandler);
+  }
+
+  @Deprecated public class BasicCookieStore implements org.apache.http.client.CookieStore {
+    ctor @Deprecated public BasicCookieStore();
+    method @Deprecated public void addCookie(org.apache.http.cookie.Cookie);
+    method @Deprecated public void addCookies(org.apache.http.cookie.Cookie[]);
+    method @Deprecated public void clear();
+    method @Deprecated public boolean clearExpired(java.util.Date);
+    method @Deprecated public java.util.List<org.apache.http.cookie.Cookie> getCookies();
+  }
+
+  @Deprecated public class BasicCredentialsProvider implements org.apache.http.client.CredentialsProvider {
+    ctor @Deprecated public BasicCredentialsProvider();
+    method @Deprecated public void clear();
+    method @Deprecated public org.apache.http.auth.Credentials getCredentials(org.apache.http.auth.AuthScope);
+    method @Deprecated public void setCredentials(org.apache.http.auth.AuthScope, org.apache.http.auth.Credentials);
+  }
+
+  @Deprecated public class BasicResponseHandler implements org.apache.http.client.ResponseHandler<java.lang.String> {
+    ctor @Deprecated public BasicResponseHandler();
+    method @Deprecated public String handleResponse(org.apache.http.HttpResponse) throws org.apache.http.client.HttpResponseException, java.io.IOException;
+  }
+
+  @Deprecated public class ClientParamsStack extends org.apache.http.params.AbstractHttpParams {
+    ctor @Deprecated public ClientParamsStack(org.apache.http.params.HttpParams, org.apache.http.params.HttpParams, org.apache.http.params.HttpParams, org.apache.http.params.HttpParams);
+    ctor @Deprecated public ClientParamsStack(org.apache.http.impl.client.ClientParamsStack);
+    ctor @Deprecated public ClientParamsStack(org.apache.http.impl.client.ClientParamsStack, org.apache.http.params.HttpParams, org.apache.http.params.HttpParams, org.apache.http.params.HttpParams, org.apache.http.params.HttpParams);
+    method @Deprecated public org.apache.http.params.HttpParams copy();
+    method @Deprecated public final org.apache.http.params.HttpParams getApplicationParams();
+    method @Deprecated public final org.apache.http.params.HttpParams getClientParams();
+    method @Deprecated public final org.apache.http.params.HttpParams getOverrideParams();
+    method @Deprecated public Object getParameter(String);
+    method @Deprecated public final org.apache.http.params.HttpParams getRequestParams();
+    method @Deprecated public boolean removeParameter(String);
+    method @Deprecated public org.apache.http.params.HttpParams setParameter(String, Object) throws java.lang.UnsupportedOperationException;
+    field @Deprecated protected final org.apache.http.params.HttpParams applicationParams;
+    field @Deprecated protected final org.apache.http.params.HttpParams clientParams;
+    field @Deprecated protected final org.apache.http.params.HttpParams overrideParams;
+    field @Deprecated protected final org.apache.http.params.HttpParams requestParams;
+  }
+
+  @Deprecated public class DefaultConnectionKeepAliveStrategy implements org.apache.http.conn.ConnectionKeepAliveStrategy {
+    ctor @Deprecated public DefaultConnectionKeepAliveStrategy();
+    method @Deprecated public long getKeepAliveDuration(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext);
+  }
+
+  @Deprecated public class DefaultHttpClient extends org.apache.http.impl.client.AbstractHttpClient {
+    ctor @Deprecated public DefaultHttpClient(org.apache.http.conn.ClientConnectionManager, org.apache.http.params.HttpParams);
+    ctor @Deprecated public DefaultHttpClient(org.apache.http.params.HttpParams);
+    ctor @Deprecated public DefaultHttpClient();
+    method @Deprecated protected org.apache.http.auth.AuthSchemeRegistry createAuthSchemeRegistry();
+    method @Deprecated protected org.apache.http.conn.ClientConnectionManager createClientConnectionManager();
+    method @Deprecated protected org.apache.http.conn.ConnectionKeepAliveStrategy createConnectionKeepAliveStrategy();
+    method @Deprecated protected org.apache.http.ConnectionReuseStrategy createConnectionReuseStrategy();
+    method @Deprecated protected org.apache.http.cookie.CookieSpecRegistry createCookieSpecRegistry();
+    method @Deprecated protected org.apache.http.client.CookieStore createCookieStore();
+    method @Deprecated protected org.apache.http.client.CredentialsProvider createCredentialsProvider();
+    method @Deprecated protected org.apache.http.protocol.HttpContext createHttpContext();
+    method @Deprecated protected org.apache.http.params.HttpParams createHttpParams();
+    method @Deprecated protected org.apache.http.protocol.BasicHttpProcessor createHttpProcessor();
+    method @Deprecated protected org.apache.http.client.HttpRequestRetryHandler createHttpRequestRetryHandler();
+    method @Deprecated protected org.apache.http.conn.routing.HttpRoutePlanner createHttpRoutePlanner();
+    method @Deprecated protected org.apache.http.client.AuthenticationHandler createProxyAuthenticationHandler();
+    method @Deprecated protected org.apache.http.client.RedirectHandler createRedirectHandler();
+    method @Deprecated protected org.apache.http.protocol.HttpRequestExecutor createRequestExecutor();
+    method @Deprecated protected org.apache.http.client.AuthenticationHandler createTargetAuthenticationHandler();
+    method @Deprecated protected org.apache.http.client.UserTokenHandler createUserTokenHandler();
+  }
+
+  @Deprecated public class DefaultHttpRequestRetryHandler implements org.apache.http.client.HttpRequestRetryHandler {
+    ctor @Deprecated public DefaultHttpRequestRetryHandler(int, boolean);
+    ctor @Deprecated public DefaultHttpRequestRetryHandler();
+    method @Deprecated public int getRetryCount();
+    method @Deprecated public boolean isRequestSentRetryEnabled();
+    method @Deprecated public boolean retryRequest(java.io.IOException, int, org.apache.http.protocol.HttpContext);
+  }
+
+  @Deprecated public class DefaultProxyAuthenticationHandler extends org.apache.http.impl.client.AbstractAuthenticationHandler {
+    ctor @Deprecated public DefaultProxyAuthenticationHandler();
+    method @Deprecated public java.util.Map<java.lang.String,org.apache.http.Header> getChallenges(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.auth.MalformedChallengeException;
+    method @Deprecated public boolean isAuthenticationRequested(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext);
+  }
+
+  @Deprecated public class DefaultRedirectHandler implements org.apache.http.client.RedirectHandler {
+    ctor @Deprecated public DefaultRedirectHandler();
+    method @Deprecated public java.net.URI getLocationURI(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.ProtocolException;
+    method @Deprecated public boolean isRedirectRequested(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext);
+  }
+
+  @Deprecated public class DefaultRequestDirector implements org.apache.http.client.RequestDirector {
+    ctor @Deprecated public DefaultRequestDirector(org.apache.http.protocol.HttpRequestExecutor, org.apache.http.conn.ClientConnectionManager, org.apache.http.ConnectionReuseStrategy, org.apache.http.conn.ConnectionKeepAliveStrategy, org.apache.http.conn.routing.HttpRoutePlanner, org.apache.http.protocol.HttpProcessor, org.apache.http.client.HttpRequestRetryHandler, org.apache.http.client.RedirectHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.AuthenticationHandler, org.apache.http.client.UserTokenHandler, org.apache.http.params.HttpParams);
+    method @Deprecated protected org.apache.http.HttpRequest createConnectRequest(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext);
+    method @Deprecated protected boolean createTunnelToProxy(org.apache.http.conn.routing.HttpRoute, int, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated protected boolean createTunnelToTarget(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated protected org.apache.http.conn.routing.HttpRoute determineRoute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException;
+    method @Deprecated protected void establishRoute(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public org.apache.http.HttpResponse execute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated protected org.apache.http.impl.client.RoutedRequest handleResponse(org.apache.http.impl.client.RoutedRequest, org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated protected void releaseConnection();
+    method @Deprecated protected void rewriteRequestURI(org.apache.http.impl.client.RequestWrapper, org.apache.http.conn.routing.HttpRoute) throws org.apache.http.ProtocolException;
+    field @Deprecated protected final org.apache.http.conn.ClientConnectionManager connManager;
+    field @Deprecated protected final org.apache.http.protocol.HttpProcessor httpProcessor;
+    field @Deprecated protected final org.apache.http.conn.ConnectionKeepAliveStrategy keepAliveStrategy;
+    field @Deprecated protected org.apache.http.conn.ManagedClientConnection managedConn;
+    field @Deprecated protected final org.apache.http.params.HttpParams params;
+    field @Deprecated protected final org.apache.http.client.RedirectHandler redirectHandler;
+    field @Deprecated protected final org.apache.http.protocol.HttpRequestExecutor requestExec;
+    field @Deprecated protected final org.apache.http.client.HttpRequestRetryHandler retryHandler;
+    field @Deprecated protected final org.apache.http.ConnectionReuseStrategy reuseStrategy;
+    field @Deprecated protected final org.apache.http.conn.routing.HttpRoutePlanner routePlanner;
+  }
+
+  @Deprecated public class DefaultTargetAuthenticationHandler extends org.apache.http.impl.client.AbstractAuthenticationHandler {
+    ctor @Deprecated public DefaultTargetAuthenticationHandler();
+    method @Deprecated public java.util.Map<java.lang.String,org.apache.http.Header> getChallenges(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.auth.MalformedChallengeException;
+    method @Deprecated public boolean isAuthenticationRequested(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext);
+  }
+
+  @Deprecated public class DefaultUserTokenHandler implements org.apache.http.client.UserTokenHandler {
+    ctor @Deprecated public DefaultUserTokenHandler();
+    method @Deprecated public Object getUserToken(org.apache.http.protocol.HttpContext);
+  }
+
+  @Deprecated public class EntityEnclosingRequestWrapper extends org.apache.http.impl.client.RequestWrapper implements org.apache.http.HttpEntityEnclosingRequest {
+    ctor @Deprecated public EntityEnclosingRequestWrapper(org.apache.http.HttpEntityEnclosingRequest) throws org.apache.http.ProtocolException;
+    method @Deprecated public boolean expectContinue();
+    method @Deprecated public org.apache.http.HttpEntity getEntity();
+    method @Deprecated public void setEntity(org.apache.http.HttpEntity);
+  }
+
+  @Deprecated public class RedirectLocations {
+    ctor @Deprecated public RedirectLocations();
+    method @Deprecated public void add(java.net.URI);
+    method @Deprecated public boolean contains(java.net.URI);
+    method @Deprecated public boolean remove(java.net.URI);
+  }
+
+  @Deprecated public class RequestWrapper extends org.apache.http.message.AbstractHttpMessage implements org.apache.http.client.methods.HttpUriRequest {
+    ctor @Deprecated public RequestWrapper(org.apache.http.HttpRequest) throws org.apache.http.ProtocolException;
+    method @Deprecated public void abort() throws java.lang.UnsupportedOperationException;
+    method @Deprecated public int getExecCount();
+    method @Deprecated public String getMethod();
+    method @Deprecated public org.apache.http.HttpRequest getOriginal();
+    method @Deprecated public org.apache.http.ProtocolVersion getProtocolVersion();
+    method @Deprecated public org.apache.http.RequestLine getRequestLine();
+    method @Deprecated public java.net.URI getURI();
+    method @Deprecated public void incrementExecCount();
+    method @Deprecated public boolean isAborted();
+    method @Deprecated public boolean isRepeatable();
+    method @Deprecated public void resetHeaders();
+    method @Deprecated public void setMethod(String);
+    method @Deprecated public void setProtocolVersion(org.apache.http.ProtocolVersion);
+    method @Deprecated public void setURI(java.net.URI);
+  }
+
+  @Deprecated public class RoutedRequest {
+    ctor @Deprecated public RoutedRequest(org.apache.http.impl.client.RequestWrapper, org.apache.http.conn.routing.HttpRoute);
+    method @Deprecated public final org.apache.http.impl.client.RequestWrapper getRequest();
+    method @Deprecated public final org.apache.http.conn.routing.HttpRoute getRoute();
+    field @Deprecated protected final org.apache.http.impl.client.RequestWrapper request;
+    field @Deprecated protected final org.apache.http.conn.routing.HttpRoute route;
+  }
+
+  @Deprecated public class TunnelRefusedException extends org.apache.http.HttpException {
+    ctor @Deprecated public TunnelRefusedException(String, org.apache.http.HttpResponse);
+    method @Deprecated public org.apache.http.HttpResponse getResponse();
   }
 
 }
 
 package org.apache.http.impl.conn {
 
-  public abstract deprecated class AbstractClientConnAdapter implements org.apache.http.conn.ManagedClientConnection {
-    ctor protected AbstractClientConnAdapter(org.apache.http.conn.ClientConnectionManager, org.apache.http.conn.OperatedClientConnection);
-    method public void abortConnection();
-    method protected final void assertNotAborted() throws java.io.InterruptedIOException;
-    method protected final void assertValid(org.apache.http.conn.OperatedClientConnection);
-    method protected void detach();
-    method public void flush() throws java.io.IOException;
-    method public java.net.InetAddress getLocalAddress();
-    method public int getLocalPort();
-    method protected org.apache.http.conn.ClientConnectionManager getManager();
-    method public org.apache.http.HttpConnectionMetrics getMetrics();
-    method public java.net.InetAddress getRemoteAddress();
-    method public int getRemotePort();
-    method public javax.net.ssl.SSLSession getSSLSession();
-    method public int getSocketTimeout();
-    method protected org.apache.http.conn.OperatedClientConnection getWrappedConnection();
-    method public boolean isMarkedReusable();
-    method public boolean isOpen();
-    method public boolean isResponseAvailable(int) throws java.io.IOException;
-    method public boolean isSecure();
-    method public boolean isStale();
-    method public void markReusable();
-    method public void receiveResponseEntity(org.apache.http.HttpResponse) throws org.apache.http.HttpException, java.io.IOException;
-    method public org.apache.http.HttpResponse receiveResponseHeader() throws org.apache.http.HttpException, java.io.IOException;
-    method public void releaseConnection();
-    method public void sendRequestEntity(org.apache.http.HttpEntityEnclosingRequest) throws org.apache.http.HttpException, java.io.IOException;
-    method public void sendRequestHeader(org.apache.http.HttpRequest) throws org.apache.http.HttpException, java.io.IOException;
-    method public void setIdleDuration(long, java.util.concurrent.TimeUnit);
-    method public void setSocketTimeout(int);
-    method public void unmarkReusable();
-  }
-
-  public abstract deprecated class AbstractPoolEntry {
-    ctor protected AbstractPoolEntry(org.apache.http.conn.ClientConnectionOperator, org.apache.http.conn.routing.HttpRoute);
-    method public java.lang.Object getState();
-    method public void layerProtocol(org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public void open(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public void setState(java.lang.Object);
-    method protected void shutdownEntry();
-    method public void tunnelProxy(org.apache.http.HttpHost, boolean, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public void tunnelTarget(boolean, org.apache.http.params.HttpParams) throws java.io.IOException;
-    field protected final org.apache.http.conn.ClientConnectionOperator connOperator;
-    field protected final org.apache.http.conn.OperatedClientConnection connection;
-    field protected volatile org.apache.http.conn.routing.HttpRoute route;
-    field protected volatile java.lang.Object state;
-    field protected volatile org.apache.http.conn.routing.RouteTracker tracker;
-  }
-
-  public abstract deprecated class AbstractPooledConnAdapter extends org.apache.http.impl.conn.AbstractClientConnAdapter {
-    ctor protected AbstractPooledConnAdapter(org.apache.http.conn.ClientConnectionManager, org.apache.http.impl.conn.AbstractPoolEntry);
-    method protected final void assertAttached();
-    method public void close() throws java.io.IOException;
-    method public org.apache.http.conn.routing.HttpRoute getRoute();
-    method public java.lang.Object getState();
-    method public void layerProtocol(org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public void open(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public void setState(java.lang.Object);
-    method public void shutdown() throws java.io.IOException;
-    method public void tunnelProxy(org.apache.http.HttpHost, boolean, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public void tunnelTarget(boolean, org.apache.http.params.HttpParams) throws java.io.IOException;
-    field protected volatile org.apache.http.impl.conn.AbstractPoolEntry poolEntry;
-  }
-
-  public deprecated class DefaultClientConnection extends org.apache.http.impl.SocketHttpClientConnection implements org.apache.http.conn.OperatedClientConnection {
-    ctor public DefaultClientConnection();
-    method public final java.net.Socket getSocket();
-    method public final org.apache.http.HttpHost getTargetHost();
-    method public final boolean isSecure();
-    method public void openCompleted(boolean, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public void opening(java.net.Socket, org.apache.http.HttpHost) throws java.io.IOException;
-    method public void update(java.net.Socket, org.apache.http.HttpHost, boolean, org.apache.http.params.HttpParams) throws java.io.IOException;
-  }
-
-  public deprecated class DefaultClientConnectionOperator implements org.apache.http.conn.ClientConnectionOperator {
-    ctor public DefaultClientConnectionOperator(org.apache.http.conn.scheme.SchemeRegistry);
-    method public org.apache.http.conn.OperatedClientConnection createConnection();
-    method public void openConnection(org.apache.http.conn.OperatedClientConnection, org.apache.http.HttpHost, java.net.InetAddress, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method protected void prepareSocket(java.net.Socket, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public void updateSecureConnection(org.apache.http.conn.OperatedClientConnection, org.apache.http.HttpHost, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
-    field protected org.apache.http.conn.scheme.SchemeRegistry schemeRegistry;
-  }
-
-  public deprecated class DefaultHttpRoutePlanner implements org.apache.http.conn.routing.HttpRoutePlanner {
-    ctor public DefaultHttpRoutePlanner(org.apache.http.conn.scheme.SchemeRegistry);
-    method public org.apache.http.conn.routing.HttpRoute determineRoute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException;
-    field protected org.apache.http.conn.scheme.SchemeRegistry schemeRegistry;
-  }
-
-  public deprecated class DefaultResponseParser extends org.apache.http.impl.io.AbstractMessageParser {
-    ctor public DefaultResponseParser(org.apache.http.io.SessionInputBuffer, org.apache.http.message.LineParser, org.apache.http.HttpResponseFactory, org.apache.http.params.HttpParams);
-    method protected org.apache.http.HttpMessage parseHead(org.apache.http.io.SessionInputBuffer) throws org.apache.http.HttpException, java.io.IOException;
-  }
-
-  public deprecated class IdleConnectionHandler {
-    ctor public IdleConnectionHandler();
-    method public void add(org.apache.http.HttpConnection, long, java.util.concurrent.TimeUnit);
-    method public void closeExpiredConnections();
-    method public void closeIdleConnections(long);
-    method public boolean remove(org.apache.http.HttpConnection);
-    method public void removeAll();
-  }
-
-  public deprecated class LoggingSessionInputBuffer implements org.apache.http.io.SessionInputBuffer {
-    ctor public LoggingSessionInputBuffer(org.apache.http.io.SessionInputBuffer, org.apache.http.impl.conn.Wire);
-    method public org.apache.http.io.HttpTransportMetrics getMetrics();
-    method public boolean isDataAvailable(int) throws java.io.IOException;
-    method public int read(byte[], int, int) throws java.io.IOException;
-    method public int read() throws java.io.IOException;
-    method public int read(byte[]) throws java.io.IOException;
-    method public java.lang.String readLine() throws java.io.IOException;
-    method public int readLine(org.apache.http.util.CharArrayBuffer) throws java.io.IOException;
-  }
-
-  public deprecated class LoggingSessionOutputBuffer implements org.apache.http.io.SessionOutputBuffer {
-    ctor public LoggingSessionOutputBuffer(org.apache.http.io.SessionOutputBuffer, org.apache.http.impl.conn.Wire);
-    method public void flush() throws java.io.IOException;
-    method public org.apache.http.io.HttpTransportMetrics getMetrics();
-    method public void write(byte[], int, int) throws java.io.IOException;
-    method public void write(int) throws java.io.IOException;
-    method public void write(byte[]) throws java.io.IOException;
-    method public void writeLine(org.apache.http.util.CharArrayBuffer) throws java.io.IOException;
-    method public void writeLine(java.lang.String) throws java.io.IOException;
-  }
-
-  public deprecated class ProxySelectorRoutePlanner implements org.apache.http.conn.routing.HttpRoutePlanner {
-    ctor public ProxySelectorRoutePlanner(org.apache.http.conn.scheme.SchemeRegistry, java.net.ProxySelector);
-    method protected java.net.Proxy chooseProxy(java.util.List<java.net.Proxy>, org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext);
-    method protected org.apache.http.HttpHost determineProxy(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException;
-    method public org.apache.http.conn.routing.HttpRoute determineRoute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException;
-    method protected java.lang.String getHost(java.net.InetSocketAddress);
-    method public java.net.ProxySelector getProxySelector();
-    method public void setProxySelector(java.net.ProxySelector);
-    field protected java.net.ProxySelector proxySelector;
-    field protected org.apache.http.conn.scheme.SchemeRegistry schemeRegistry;
-  }
-
-  public deprecated class SingleClientConnManager implements org.apache.http.conn.ClientConnectionManager {
-    ctor public SingleClientConnManager(org.apache.http.params.HttpParams, org.apache.http.conn.scheme.SchemeRegistry);
-    method protected final void assertStillUp() throws java.lang.IllegalStateException;
-    method public void closeExpiredConnections();
-    method public void closeIdleConnections(long, java.util.concurrent.TimeUnit);
-    method protected org.apache.http.conn.ClientConnectionOperator createConnectionOperator(org.apache.http.conn.scheme.SchemeRegistry);
-    method public org.apache.http.conn.ManagedClientConnection getConnection(org.apache.http.conn.routing.HttpRoute, java.lang.Object);
-    method public org.apache.http.conn.scheme.SchemeRegistry getSchemeRegistry();
-    method public void releaseConnection(org.apache.http.conn.ManagedClientConnection, long, java.util.concurrent.TimeUnit);
-    method public final org.apache.http.conn.ClientConnectionRequest requestConnection(org.apache.http.conn.routing.HttpRoute, java.lang.Object);
-    method protected void revokeConnection();
-    method public void shutdown();
-    field public static final java.lang.String MISUSE_MESSAGE = "Invalid use of SingleClientConnManager: connection still allocated.\nMake sure to release the connection before allocating another one.";
-    field protected boolean alwaysShutDown;
-    field protected org.apache.http.conn.ClientConnectionOperator connOperator;
-    field protected long connectionExpiresTime;
-    field protected volatile boolean isShutDown;
-    field protected long lastReleaseTime;
-    field protected org.apache.http.impl.conn.SingleClientConnManager.ConnAdapter managedConn;
-    field protected org.apache.http.conn.scheme.SchemeRegistry schemeRegistry;
-    field protected org.apache.http.impl.conn.SingleClientConnManager.PoolEntry uniquePoolEntry;
-  }
-
-  protected class SingleClientConnManager.ConnAdapter extends org.apache.http.impl.conn.AbstractPooledConnAdapter {
-    ctor protected SingleClientConnManager.ConnAdapter(org.apache.http.impl.conn.SingleClientConnManager.PoolEntry, org.apache.http.conn.routing.HttpRoute);
-  }
-
-  protected class SingleClientConnManager.PoolEntry extends org.apache.http.impl.conn.AbstractPoolEntry {
-    ctor protected SingleClientConnManager.PoolEntry();
-    method protected void close() throws java.io.IOException;
-    method protected void shutdown() throws java.io.IOException;
-  }
-
-  public deprecated class Wire {
-    ctor public Wire(org.apache.commons.logging.Log);
-    method public boolean enabled();
-    method public void input(java.io.InputStream) throws java.io.IOException;
-    method public void input(byte[], int, int) throws java.io.IOException;
-    method public void input(byte[]) throws java.io.IOException;
-    method public void input(int) throws java.io.IOException;
-    method public void input(java.lang.String) throws java.io.IOException;
-    method public void output(java.io.InputStream) throws java.io.IOException;
-    method public void output(byte[], int, int) throws java.io.IOException;
-    method public void output(byte[]) throws java.io.IOException;
-    method public void output(int) throws java.io.IOException;
-    method public void output(java.lang.String) throws java.io.IOException;
+  @Deprecated public abstract class AbstractClientConnAdapter implements org.apache.http.conn.ManagedClientConnection {
+    ctor @Deprecated protected AbstractClientConnAdapter(org.apache.http.conn.ClientConnectionManager, org.apache.http.conn.OperatedClientConnection);
+    method @Deprecated public void abortConnection();
+    method @Deprecated protected final void assertNotAborted() throws java.io.InterruptedIOException;
+    method @Deprecated protected final void assertValid(org.apache.http.conn.OperatedClientConnection);
+    method @Deprecated protected void detach();
+    method @Deprecated public void flush() throws java.io.IOException;
+    method @Deprecated public java.net.InetAddress getLocalAddress();
+    method @Deprecated public int getLocalPort();
+    method @Deprecated protected org.apache.http.conn.ClientConnectionManager getManager();
+    method @Deprecated public org.apache.http.HttpConnectionMetrics getMetrics();
+    method @Deprecated public java.net.InetAddress getRemoteAddress();
+    method @Deprecated public int getRemotePort();
+    method @Deprecated public javax.net.ssl.SSLSession getSSLSession();
+    method @Deprecated public int getSocketTimeout();
+    method @Deprecated protected org.apache.http.conn.OperatedClientConnection getWrappedConnection();
+    method @Deprecated public boolean isMarkedReusable();
+    method @Deprecated public boolean isOpen();
+    method @Deprecated public boolean isResponseAvailable(int) throws java.io.IOException;
+    method @Deprecated public boolean isSecure();
+    method @Deprecated public boolean isStale();
+    method @Deprecated public void markReusable();
+    method @Deprecated public void receiveResponseEntity(org.apache.http.HttpResponse) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public org.apache.http.HttpResponse receiveResponseHeader() throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public void releaseConnection();
+    method @Deprecated public void sendRequestEntity(org.apache.http.HttpEntityEnclosingRequest) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public void sendRequestHeader(org.apache.http.HttpRequest) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public void setIdleDuration(long, java.util.concurrent.TimeUnit);
+    method @Deprecated public void setSocketTimeout(int);
+    method @Deprecated public void unmarkReusable();
+  }
+
+  @Deprecated public abstract class AbstractPoolEntry {
+    ctor @Deprecated protected AbstractPoolEntry(org.apache.http.conn.ClientConnectionOperator, org.apache.http.conn.routing.HttpRoute);
+    method @Deprecated public Object getState();
+    method @Deprecated public void layerProtocol(org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public void open(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public void setState(Object);
+    method @Deprecated protected void shutdownEntry();
+    method @Deprecated public void tunnelProxy(org.apache.http.HttpHost, boolean, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public void tunnelTarget(boolean, org.apache.http.params.HttpParams) throws java.io.IOException;
+    field @Deprecated protected final org.apache.http.conn.ClientConnectionOperator connOperator;
+    field @Deprecated protected final org.apache.http.conn.OperatedClientConnection connection;
+    field @Deprecated protected volatile org.apache.http.conn.routing.HttpRoute route;
+    field @Deprecated protected volatile Object state;
+    field @Deprecated protected volatile org.apache.http.conn.routing.RouteTracker tracker;
+  }
+
+  @Deprecated public abstract class AbstractPooledConnAdapter extends org.apache.http.impl.conn.AbstractClientConnAdapter {
+    ctor @Deprecated protected AbstractPooledConnAdapter(org.apache.http.conn.ClientConnectionManager, org.apache.http.impl.conn.AbstractPoolEntry);
+    method @Deprecated protected final void assertAttached();
+    method @Deprecated public void close() throws java.io.IOException;
+    method @Deprecated public org.apache.http.conn.routing.HttpRoute getRoute();
+    method @Deprecated public Object getState();
+    method @Deprecated public void layerProtocol(org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public void open(org.apache.http.conn.routing.HttpRoute, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public void setState(Object);
+    method @Deprecated public void shutdown() throws java.io.IOException;
+    method @Deprecated public void tunnelProxy(org.apache.http.HttpHost, boolean, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public void tunnelTarget(boolean, org.apache.http.params.HttpParams) throws java.io.IOException;
+    field @Deprecated protected volatile org.apache.http.impl.conn.AbstractPoolEntry poolEntry;
+  }
+
+  @Deprecated public class DefaultClientConnection extends org.apache.http.impl.SocketHttpClientConnection implements org.apache.http.conn.OperatedClientConnection {
+    ctor @Deprecated public DefaultClientConnection();
+    method @Deprecated public final java.net.Socket getSocket();
+    method @Deprecated public final org.apache.http.HttpHost getTargetHost();
+    method @Deprecated public final boolean isSecure();
+    method @Deprecated public void openCompleted(boolean, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public void opening(java.net.Socket, org.apache.http.HttpHost) throws java.io.IOException;
+    method @Deprecated public void update(java.net.Socket, org.apache.http.HttpHost, boolean, org.apache.http.params.HttpParams) throws java.io.IOException;
+  }
+
+  @Deprecated public class DefaultClientConnectionOperator implements org.apache.http.conn.ClientConnectionOperator {
+    ctor @Deprecated public DefaultClientConnectionOperator(org.apache.http.conn.scheme.SchemeRegistry);
+    method @Deprecated public org.apache.http.conn.OperatedClientConnection createConnection();
+    method @Deprecated public void openConnection(org.apache.http.conn.OperatedClientConnection, org.apache.http.HttpHost, java.net.InetAddress, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated protected void prepareSocket(java.net.Socket, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public void updateSecureConnection(org.apache.http.conn.OperatedClientConnection, org.apache.http.HttpHost, org.apache.http.protocol.HttpContext, org.apache.http.params.HttpParams) throws java.io.IOException;
+    field @Deprecated protected org.apache.http.conn.scheme.SchemeRegistry schemeRegistry;
+  }
+
+  @Deprecated public class DefaultHttpRoutePlanner implements org.apache.http.conn.routing.HttpRoutePlanner {
+    ctor @Deprecated public DefaultHttpRoutePlanner(org.apache.http.conn.scheme.SchemeRegistry);
+    method @Deprecated public org.apache.http.conn.routing.HttpRoute determineRoute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException;
+    field @Deprecated protected org.apache.http.conn.scheme.SchemeRegistry schemeRegistry;
+  }
+
+  @Deprecated public class DefaultResponseParser extends org.apache.http.impl.io.AbstractMessageParser {
+    ctor @Deprecated public DefaultResponseParser(org.apache.http.io.SessionInputBuffer, org.apache.http.message.LineParser, org.apache.http.HttpResponseFactory, org.apache.http.params.HttpParams);
+    method @Deprecated protected org.apache.http.HttpMessage parseHead(org.apache.http.io.SessionInputBuffer) throws org.apache.http.HttpException, java.io.IOException;
+  }
+
+  @Deprecated public class IdleConnectionHandler {
+    ctor @Deprecated public IdleConnectionHandler();
+    method @Deprecated public void add(org.apache.http.HttpConnection, long, java.util.concurrent.TimeUnit);
+    method @Deprecated public void closeExpiredConnections();
+    method @Deprecated public void closeIdleConnections(long);
+    method @Deprecated public boolean remove(org.apache.http.HttpConnection);
+    method @Deprecated public void removeAll();
+  }
+
+  @Deprecated public class LoggingSessionInputBuffer implements org.apache.http.io.SessionInputBuffer {
+    ctor @Deprecated public LoggingSessionInputBuffer(org.apache.http.io.SessionInputBuffer, org.apache.http.impl.conn.Wire);
+    method @Deprecated public org.apache.http.io.HttpTransportMetrics getMetrics();
+    method @Deprecated public boolean isDataAvailable(int) throws java.io.IOException;
+    method @Deprecated public int read(byte[], int, int) throws java.io.IOException;
+    method @Deprecated public int read() throws java.io.IOException;
+    method @Deprecated public int read(byte[]) throws java.io.IOException;
+    method @Deprecated public String readLine() throws java.io.IOException;
+    method @Deprecated public int readLine(org.apache.http.util.CharArrayBuffer) throws java.io.IOException;
+  }
+
+  @Deprecated public class LoggingSessionOutputBuffer implements org.apache.http.io.SessionOutputBuffer {
+    ctor @Deprecated public LoggingSessionOutputBuffer(org.apache.http.io.SessionOutputBuffer, org.apache.http.impl.conn.Wire);
+    method @Deprecated public void flush() throws java.io.IOException;
+    method @Deprecated public org.apache.http.io.HttpTransportMetrics getMetrics();
+    method @Deprecated public void write(byte[], int, int) throws java.io.IOException;
+    method @Deprecated public void write(int) throws java.io.IOException;
+    method @Deprecated public void write(byte[]) throws java.io.IOException;
+    method @Deprecated public void writeLine(org.apache.http.util.CharArrayBuffer) throws java.io.IOException;
+    method @Deprecated public void writeLine(String) throws java.io.IOException;
+  }
+
+  @Deprecated public class ProxySelectorRoutePlanner implements org.apache.http.conn.routing.HttpRoutePlanner {
+    ctor @Deprecated public ProxySelectorRoutePlanner(org.apache.http.conn.scheme.SchemeRegistry, java.net.ProxySelector);
+    method @Deprecated protected java.net.Proxy chooseProxy(java.util.List<java.net.Proxy>, org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext);
+    method @Deprecated protected org.apache.http.HttpHost determineProxy(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException;
+    method @Deprecated public org.apache.http.conn.routing.HttpRoute determineRoute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException;
+    method @Deprecated protected String getHost(java.net.InetSocketAddress);
+    method @Deprecated public java.net.ProxySelector getProxySelector();
+    method @Deprecated public void setProxySelector(java.net.ProxySelector);
+    field @Deprecated protected java.net.ProxySelector proxySelector;
+    field @Deprecated protected org.apache.http.conn.scheme.SchemeRegistry schemeRegistry;
+  }
+
+  @Deprecated public class SingleClientConnManager implements org.apache.http.conn.ClientConnectionManager {
+    ctor @Deprecated public SingleClientConnManager(org.apache.http.params.HttpParams, org.apache.http.conn.scheme.SchemeRegistry);
+    method @Deprecated protected final void assertStillUp() throws java.lang.IllegalStateException;
+    method @Deprecated public void closeExpiredConnections();
+    method @Deprecated public void closeIdleConnections(long, java.util.concurrent.TimeUnit);
+    method @Deprecated protected org.apache.http.conn.ClientConnectionOperator createConnectionOperator(org.apache.http.conn.scheme.SchemeRegistry);
+    method @Deprecated public org.apache.http.conn.ManagedClientConnection getConnection(org.apache.http.conn.routing.HttpRoute, Object);
+    method @Deprecated public org.apache.http.conn.scheme.SchemeRegistry getSchemeRegistry();
+    method @Deprecated public void releaseConnection(org.apache.http.conn.ManagedClientConnection, long, java.util.concurrent.TimeUnit);
+    method @Deprecated public final org.apache.http.conn.ClientConnectionRequest requestConnection(org.apache.http.conn.routing.HttpRoute, Object);
+    method @Deprecated protected void revokeConnection();
+    method @Deprecated public void shutdown();
+    field @Deprecated public static final String MISUSE_MESSAGE = "Invalid use of SingleClientConnManager: connection still allocated.\nMake sure to release the connection before allocating another one.";
+    field @Deprecated protected boolean alwaysShutDown;
+    field @Deprecated protected org.apache.http.conn.ClientConnectionOperator connOperator;
+    field @Deprecated protected long connectionExpiresTime;
+    field @Deprecated protected volatile boolean isShutDown;
+    field @Deprecated protected long lastReleaseTime;
+    field @Deprecated protected org.apache.http.impl.conn.SingleClientConnManager.ConnAdapter managedConn;
+    field @Deprecated protected org.apache.http.conn.scheme.SchemeRegistry schemeRegistry;
+    field @Deprecated protected org.apache.http.impl.conn.SingleClientConnManager.PoolEntry uniquePoolEntry;
+  }
+
+  @Deprecated protected class SingleClientConnManager.ConnAdapter extends org.apache.http.impl.conn.AbstractPooledConnAdapter {
+    ctor @Deprecated protected SingleClientConnManager.ConnAdapter(org.apache.http.impl.conn.SingleClientConnManager.PoolEntry, org.apache.http.conn.routing.HttpRoute);
+  }
+
+  @Deprecated protected class SingleClientConnManager.PoolEntry extends org.apache.http.impl.conn.AbstractPoolEntry {
+    ctor @Deprecated protected SingleClientConnManager.PoolEntry();
+    method @Deprecated protected void close() throws java.io.IOException;
+    method @Deprecated protected void shutdown() throws java.io.IOException;
+  }
+
+  @Deprecated public class Wire {
+    ctor @Deprecated public Wire(org.apache.commons.logging.Log);
+    method @Deprecated public boolean enabled();
+    method @Deprecated public void input(java.io.InputStream) throws java.io.IOException;
+    method @Deprecated public void input(byte[], int, int) throws java.io.IOException;
+    method @Deprecated public void input(byte[]) throws java.io.IOException;
+    method @Deprecated public void input(int) throws java.io.IOException;
+    method @Deprecated public void input(String) throws java.io.IOException;
+    method @Deprecated public void output(java.io.InputStream) throws java.io.IOException;
+    method @Deprecated public void output(byte[], int, int) throws java.io.IOException;
+    method @Deprecated public void output(byte[]) throws java.io.IOException;
+    method @Deprecated public void output(int) throws java.io.IOException;
+    method @Deprecated public void output(String) throws java.io.IOException;
   }
 
 }
 
 package org.apache.http.impl.conn.tsccm {
 
-  public abstract deprecated class AbstractConnPool implements org.apache.http.impl.conn.tsccm.RefQueueHandler {
-    ctor protected AbstractConnPool();
-    method protected void closeConnection(org.apache.http.conn.OperatedClientConnection);
-    method public void closeExpiredConnections();
-    method public void closeIdleConnections(long, java.util.concurrent.TimeUnit);
-    method public abstract void deleteClosedConnections();
-    method public void enableConnectionGC() throws java.lang.IllegalStateException;
-    method public abstract void freeEntry(org.apache.http.impl.conn.tsccm.BasicPoolEntry, boolean, long, java.util.concurrent.TimeUnit);
-    method public final org.apache.http.impl.conn.tsccm.BasicPoolEntry getEntry(org.apache.http.conn.routing.HttpRoute, java.lang.Object, long, java.util.concurrent.TimeUnit) throws org.apache.http.conn.ConnectionPoolTimeoutException, java.lang.InterruptedException;
-    method protected abstract void handleLostEntry(org.apache.http.conn.routing.HttpRoute);
-    method public void handleReference(java.lang.ref.Reference);
-    method public abstract org.apache.http.impl.conn.tsccm.PoolEntryRequest requestPoolEntry(org.apache.http.conn.routing.HttpRoute, java.lang.Object);
-    method public void shutdown();
-    field protected org.apache.http.impl.conn.IdleConnectionHandler idleConnHandler;
-    field protected volatile boolean isShutDown;
-    field protected java.util.Set<org.apache.http.impl.conn.tsccm.BasicPoolEntryRef> issuedConnections;
-    field protected int numConnections;
-    field protected final java.util.concurrent.locks.Lock poolLock;
-    field protected java.lang.ref.ReferenceQueue<java.lang.Object> refQueue;
-  }
-
-  public deprecated class BasicPoolEntry extends org.apache.http.impl.conn.AbstractPoolEntry {
-    ctor public BasicPoolEntry(org.apache.http.conn.ClientConnectionOperator, org.apache.http.conn.routing.HttpRoute, java.lang.ref.ReferenceQueue<java.lang.Object>);
-    method protected final org.apache.http.conn.OperatedClientConnection getConnection();
-    method protected final org.apache.http.conn.routing.HttpRoute getPlannedRoute();
-    method protected final org.apache.http.impl.conn.tsccm.BasicPoolEntryRef getWeakRef();
-  }
-
-  public deprecated class BasicPoolEntryRef extends java.lang.ref.WeakReference {
-    ctor public BasicPoolEntryRef(org.apache.http.impl.conn.tsccm.BasicPoolEntry, java.lang.ref.ReferenceQueue<java.lang.Object>);
-    method public final org.apache.http.conn.routing.HttpRoute getRoute();
-  }
-
-  public deprecated class BasicPooledConnAdapter extends org.apache.http.impl.conn.AbstractPooledConnAdapter {
-    ctor protected BasicPooledConnAdapter(org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager, org.apache.http.impl.conn.AbstractPoolEntry);
-    method protected org.apache.http.impl.conn.AbstractPoolEntry getPoolEntry();
-  }
-
-  public deprecated class ConnPoolByRoute extends org.apache.http.impl.conn.tsccm.AbstractConnPool {
-    ctor public ConnPoolByRoute(org.apache.http.conn.ClientConnectionOperator, org.apache.http.params.HttpParams);
-    method protected org.apache.http.impl.conn.tsccm.BasicPoolEntry createEntry(org.apache.http.impl.conn.tsccm.RouteSpecificPool, org.apache.http.conn.ClientConnectionOperator);
-    method protected java.util.Queue<org.apache.http.impl.conn.tsccm.BasicPoolEntry> createFreeConnQueue();
-    method protected java.util.Map<org.apache.http.conn.routing.HttpRoute, org.apache.http.impl.conn.tsccm.RouteSpecificPool> createRouteToPoolMap();
-    method protected java.util.Queue<org.apache.http.impl.conn.tsccm.WaitingThread> createWaitingThreadQueue();
-    method public void deleteClosedConnections();
-    method protected void deleteEntry(org.apache.http.impl.conn.tsccm.BasicPoolEntry);
-    method protected void deleteLeastUsedEntry();
-    method public void freeEntry(org.apache.http.impl.conn.tsccm.BasicPoolEntry, boolean, long, java.util.concurrent.TimeUnit);
-    method public int getConnectionsInPool(org.apache.http.conn.routing.HttpRoute);
-    method protected org.apache.http.impl.conn.tsccm.BasicPoolEntry getEntryBlocking(org.apache.http.conn.routing.HttpRoute, java.lang.Object, long, java.util.concurrent.TimeUnit, org.apache.http.impl.conn.tsccm.WaitingThreadAborter) throws org.apache.http.conn.ConnectionPoolTimeoutException, java.lang.InterruptedException;
-    method protected org.apache.http.impl.conn.tsccm.BasicPoolEntry getFreeEntry(org.apache.http.impl.conn.tsccm.RouteSpecificPool, java.lang.Object);
-    method protected org.apache.http.impl.conn.tsccm.RouteSpecificPool getRoutePool(org.apache.http.conn.routing.HttpRoute, boolean);
-    method protected void handleLostEntry(org.apache.http.conn.routing.HttpRoute);
-    method protected org.apache.http.impl.conn.tsccm.RouteSpecificPool newRouteSpecificPool(org.apache.http.conn.routing.HttpRoute);
-    method protected org.apache.http.impl.conn.tsccm.WaitingThread newWaitingThread(java.util.concurrent.locks.Condition, org.apache.http.impl.conn.tsccm.RouteSpecificPool);
-    method protected void notifyWaitingThread(org.apache.http.impl.conn.tsccm.RouteSpecificPool);
-    method public org.apache.http.impl.conn.tsccm.PoolEntryRequest requestPoolEntry(org.apache.http.conn.routing.HttpRoute, java.lang.Object);
-    field protected java.util.Queue<org.apache.http.impl.conn.tsccm.BasicPoolEntry> freeConnections;
-    field protected final int maxTotalConnections;
-    field protected final org.apache.http.conn.ClientConnectionOperator operator;
-    field protected final java.util.Map<org.apache.http.conn.routing.HttpRoute, org.apache.http.impl.conn.tsccm.RouteSpecificPool> routeToPool;
-    field protected java.util.Queue<org.apache.http.impl.conn.tsccm.WaitingThread> waitingThreads;
-  }
-
-  public abstract deprecated interface PoolEntryRequest {
-    method public abstract void abortRequest();
-    method public abstract org.apache.http.impl.conn.tsccm.BasicPoolEntry getPoolEntry(long, java.util.concurrent.TimeUnit) throws org.apache.http.conn.ConnectionPoolTimeoutException, java.lang.InterruptedException;
-  }
-
-  public abstract deprecated interface RefQueueHandler {
-    method public abstract void handleReference(java.lang.ref.Reference<?>);
-  }
-
-  public deprecated class RefQueueWorker implements java.lang.Runnable {
-    ctor public RefQueueWorker(java.lang.ref.ReferenceQueue<?>, org.apache.http.impl.conn.tsccm.RefQueueHandler);
-    method public void run();
-    method public void shutdown();
-    field protected final org.apache.http.impl.conn.tsccm.RefQueueHandler refHandler;
-    field protected final java.lang.ref.ReferenceQueue<?> refQueue;
-    field protected volatile java.lang.Thread workerThread;
-  }
-
-  public deprecated class RouteSpecificPool {
-    ctor public RouteSpecificPool(org.apache.http.conn.routing.HttpRoute, int);
-    method public org.apache.http.impl.conn.tsccm.BasicPoolEntry allocEntry(java.lang.Object);
-    method public void createdEntry(org.apache.http.impl.conn.tsccm.BasicPoolEntry);
-    method public boolean deleteEntry(org.apache.http.impl.conn.tsccm.BasicPoolEntry);
-    method public void dropEntry();
-    method public void freeEntry(org.apache.http.impl.conn.tsccm.BasicPoolEntry);
-    method public int getCapacity();
-    method public final int getEntryCount();
-    method public final int getMaxEntries();
-    method public final org.apache.http.conn.routing.HttpRoute getRoute();
-    method public boolean hasThread();
-    method public boolean isUnused();
-    method public org.apache.http.impl.conn.tsccm.WaitingThread nextThread();
-    method public void queueThread(org.apache.http.impl.conn.tsccm.WaitingThread);
-    method public void removeThread(org.apache.http.impl.conn.tsccm.WaitingThread);
-    field protected final java.util.LinkedList<org.apache.http.impl.conn.tsccm.BasicPoolEntry> freeEntries;
-    field protected final int maxEntries;
-    field protected int numEntries;
-    field protected final org.apache.http.conn.routing.HttpRoute route;
-    field protected final java.util.Queue<org.apache.http.impl.conn.tsccm.WaitingThread> waitingThreads;
-  }
-
-  public deprecated class ThreadSafeClientConnManager implements org.apache.http.conn.ClientConnectionManager {
-    ctor public ThreadSafeClientConnManager(org.apache.http.params.HttpParams, org.apache.http.conn.scheme.SchemeRegistry);
-    method public void closeExpiredConnections();
-    method public void closeIdleConnections(long, java.util.concurrent.TimeUnit);
-    method protected org.apache.http.conn.ClientConnectionOperator createConnectionOperator(org.apache.http.conn.scheme.SchemeRegistry);
-    method protected org.apache.http.impl.conn.tsccm.AbstractConnPool createConnectionPool(org.apache.http.params.HttpParams);
-    method public int getConnectionsInPool(org.apache.http.conn.routing.HttpRoute);
-    method public int getConnectionsInPool();
-    method public org.apache.http.conn.scheme.SchemeRegistry getSchemeRegistry();
-    method public void releaseConnection(org.apache.http.conn.ManagedClientConnection, long, java.util.concurrent.TimeUnit);
-    method public org.apache.http.conn.ClientConnectionRequest requestConnection(org.apache.http.conn.routing.HttpRoute, java.lang.Object);
-    method public void shutdown();
-    field protected org.apache.http.conn.ClientConnectionOperator connOperator;
-    field protected final org.apache.http.impl.conn.tsccm.AbstractConnPool connectionPool;
-    field protected org.apache.http.conn.scheme.SchemeRegistry schemeRegistry;
-  }
-
-  public deprecated class WaitingThread {
-    ctor public WaitingThread(java.util.concurrent.locks.Condition, org.apache.http.impl.conn.tsccm.RouteSpecificPool);
-    method public boolean await(java.util.Date) throws java.lang.InterruptedException;
-    method public final java.util.concurrent.locks.Condition getCondition();
-    method public final org.apache.http.impl.conn.tsccm.RouteSpecificPool getPool();
-    method public final java.lang.Thread getThread();
-    method public void interrupt();
-    method public void wakeup();
-  }
-
-  public deprecated class WaitingThreadAborter {
-    ctor public WaitingThreadAborter();
-    method public void abort();
-    method public void setWaitingThread(org.apache.http.impl.conn.tsccm.WaitingThread);
+  @Deprecated public abstract class AbstractConnPool implements org.apache.http.impl.conn.tsccm.RefQueueHandler {
+    ctor @Deprecated protected AbstractConnPool();
+    method @Deprecated protected void closeConnection(org.apache.http.conn.OperatedClientConnection);
+    method @Deprecated public void closeExpiredConnections();
+    method @Deprecated public void closeIdleConnections(long, java.util.concurrent.TimeUnit);
+    method @Deprecated public abstract void deleteClosedConnections();
+    method @Deprecated public void enableConnectionGC() throws java.lang.IllegalStateException;
+    method @Deprecated public abstract void freeEntry(org.apache.http.impl.conn.tsccm.BasicPoolEntry, boolean, long, java.util.concurrent.TimeUnit);
+    method @Deprecated public final org.apache.http.impl.conn.tsccm.BasicPoolEntry getEntry(org.apache.http.conn.routing.HttpRoute, Object, long, java.util.concurrent.TimeUnit) throws org.apache.http.conn.ConnectionPoolTimeoutException, java.lang.InterruptedException;
+    method @Deprecated protected abstract void handleLostEntry(org.apache.http.conn.routing.HttpRoute);
+    method @Deprecated public void handleReference(java.lang.ref.Reference);
+    method @Deprecated public abstract org.apache.http.impl.conn.tsccm.PoolEntryRequest requestPoolEntry(org.apache.http.conn.routing.HttpRoute, Object);
+    method @Deprecated public void shutdown();
+    field @Deprecated protected org.apache.http.impl.conn.IdleConnectionHandler idleConnHandler;
+    field @Deprecated protected volatile boolean isShutDown;
+    field @Deprecated protected java.util.Set<org.apache.http.impl.conn.tsccm.BasicPoolEntryRef> issuedConnections;
+    field @Deprecated protected int numConnections;
+    field @Deprecated protected final java.util.concurrent.locks.Lock poolLock;
+    field @Deprecated protected java.lang.ref.ReferenceQueue<java.lang.Object> refQueue;
+  }
+
+  @Deprecated public class BasicPoolEntry extends org.apache.http.impl.conn.AbstractPoolEntry {
+    ctor @Deprecated public BasicPoolEntry(org.apache.http.conn.ClientConnectionOperator, org.apache.http.conn.routing.HttpRoute, java.lang.ref.ReferenceQueue<java.lang.Object>);
+    method @Deprecated protected final org.apache.http.conn.OperatedClientConnection getConnection();
+    method @Deprecated protected final org.apache.http.conn.routing.HttpRoute getPlannedRoute();
+    method @Deprecated protected final org.apache.http.impl.conn.tsccm.BasicPoolEntryRef getWeakRef();
+  }
+
+  @Deprecated public class BasicPoolEntryRef extends java.lang.ref.WeakReference<org.apache.http.impl.conn.tsccm.BasicPoolEntry> {
+    ctor @Deprecated public BasicPoolEntryRef(org.apache.http.impl.conn.tsccm.BasicPoolEntry, java.lang.ref.ReferenceQueue<java.lang.Object>);
+    method @Deprecated public final org.apache.http.conn.routing.HttpRoute getRoute();
+  }
+
+  @Deprecated public class BasicPooledConnAdapter extends org.apache.http.impl.conn.AbstractPooledConnAdapter {
+    ctor @Deprecated protected BasicPooledConnAdapter(org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager, org.apache.http.impl.conn.AbstractPoolEntry);
+    method @Deprecated protected org.apache.http.impl.conn.AbstractPoolEntry getPoolEntry();
+  }
+
+  @Deprecated public class ConnPoolByRoute extends org.apache.http.impl.conn.tsccm.AbstractConnPool {
+    ctor @Deprecated public ConnPoolByRoute(org.apache.http.conn.ClientConnectionOperator, org.apache.http.params.HttpParams);
+    method @Deprecated protected org.apache.http.impl.conn.tsccm.BasicPoolEntry createEntry(org.apache.http.impl.conn.tsccm.RouteSpecificPool, org.apache.http.conn.ClientConnectionOperator);
+    method @Deprecated protected java.util.Queue<org.apache.http.impl.conn.tsccm.BasicPoolEntry> createFreeConnQueue();
+    method @Deprecated protected java.util.Map<org.apache.http.conn.routing.HttpRoute,org.apache.http.impl.conn.tsccm.RouteSpecificPool> createRouteToPoolMap();
+    method @Deprecated protected java.util.Queue<org.apache.http.impl.conn.tsccm.WaitingThread> createWaitingThreadQueue();
+    method @Deprecated public void deleteClosedConnections();
+    method @Deprecated protected void deleteEntry(org.apache.http.impl.conn.tsccm.BasicPoolEntry);
+    method @Deprecated protected void deleteLeastUsedEntry();
+    method @Deprecated public void freeEntry(org.apache.http.impl.conn.tsccm.BasicPoolEntry, boolean, long, java.util.concurrent.TimeUnit);
+    method @Deprecated public int getConnectionsInPool(org.apache.http.conn.routing.HttpRoute);
+    method @Deprecated protected org.apache.http.impl.conn.tsccm.BasicPoolEntry getEntryBlocking(org.apache.http.conn.routing.HttpRoute, Object, long, java.util.concurrent.TimeUnit, org.apache.http.impl.conn.tsccm.WaitingThreadAborter) throws org.apache.http.conn.ConnectionPoolTimeoutException, java.lang.InterruptedException;
+    method @Deprecated protected org.apache.http.impl.conn.tsccm.BasicPoolEntry getFreeEntry(org.apache.http.impl.conn.tsccm.RouteSpecificPool, Object);
+    method @Deprecated protected org.apache.http.impl.conn.tsccm.RouteSpecificPool getRoutePool(org.apache.http.conn.routing.HttpRoute, boolean);
+    method @Deprecated protected void handleLostEntry(org.apache.http.conn.routing.HttpRoute);
+    method @Deprecated protected org.apache.http.impl.conn.tsccm.RouteSpecificPool newRouteSpecificPool(org.apache.http.conn.routing.HttpRoute);
+    method @Deprecated protected org.apache.http.impl.conn.tsccm.WaitingThread newWaitingThread(java.util.concurrent.locks.Condition, org.apache.http.impl.conn.tsccm.RouteSpecificPool);
+    method @Deprecated protected void notifyWaitingThread(org.apache.http.impl.conn.tsccm.RouteSpecificPool);
+    method @Deprecated public org.apache.http.impl.conn.tsccm.PoolEntryRequest requestPoolEntry(org.apache.http.conn.routing.HttpRoute, Object);
+    field @Deprecated protected java.util.Queue<org.apache.http.impl.conn.tsccm.BasicPoolEntry> freeConnections;
+    field @Deprecated protected final int maxTotalConnections;
+    field @Deprecated protected final org.apache.http.conn.ClientConnectionOperator operator;
+    field @Deprecated protected final java.util.Map<org.apache.http.conn.routing.HttpRoute,org.apache.http.impl.conn.tsccm.RouteSpecificPool> routeToPool;
+    field @Deprecated protected java.util.Queue<org.apache.http.impl.conn.tsccm.WaitingThread> waitingThreads;
+  }
+
+  @Deprecated public interface PoolEntryRequest {
+    method @Deprecated public void abortRequest();
+    method @Deprecated public org.apache.http.impl.conn.tsccm.BasicPoolEntry getPoolEntry(long, java.util.concurrent.TimeUnit) throws org.apache.http.conn.ConnectionPoolTimeoutException, java.lang.InterruptedException;
+  }
+
+  @Deprecated public interface RefQueueHandler {
+    method @Deprecated public void handleReference(java.lang.ref.Reference<?>);
+  }
+
+  @Deprecated public class RefQueueWorker implements java.lang.Runnable {
+    ctor @Deprecated public RefQueueWorker(java.lang.ref.ReferenceQueue<?>, org.apache.http.impl.conn.tsccm.RefQueueHandler);
+    method @Deprecated public void run();
+    method @Deprecated public void shutdown();
+    field @Deprecated protected final org.apache.http.impl.conn.tsccm.RefQueueHandler refHandler;
+    field @Deprecated protected final java.lang.ref.ReferenceQueue<?> refQueue;
+    field @Deprecated protected volatile Thread workerThread;
+  }
+
+  @Deprecated public class RouteSpecificPool {
+    ctor @Deprecated public RouteSpecificPool(org.apache.http.conn.routing.HttpRoute, int);
+    method @Deprecated public org.apache.http.impl.conn.tsccm.BasicPoolEntry allocEntry(Object);
+    method @Deprecated public void createdEntry(org.apache.http.impl.conn.tsccm.BasicPoolEntry);
+    method @Deprecated public boolean deleteEntry(org.apache.http.impl.conn.tsccm.BasicPoolEntry);
+    method @Deprecated public void dropEntry();
+    method @Deprecated public void freeEntry(org.apache.http.impl.conn.tsccm.BasicPoolEntry);
+    method @Deprecated public int getCapacity();
+    method @Deprecated public final int getEntryCount();
+    method @Deprecated public final int getMaxEntries();
+    method @Deprecated public final org.apache.http.conn.routing.HttpRoute getRoute();
+    method @Deprecated public boolean hasThread();
+    method @Deprecated public boolean isUnused();
+    method @Deprecated public org.apache.http.impl.conn.tsccm.WaitingThread nextThread();
+    method @Deprecated public void queueThread(org.apache.http.impl.conn.tsccm.WaitingThread);
+    method @Deprecated public void removeThread(org.apache.http.impl.conn.tsccm.WaitingThread);
+    field @Deprecated protected final java.util.LinkedList<org.apache.http.impl.conn.tsccm.BasicPoolEntry> freeEntries;
+    field @Deprecated protected final int maxEntries;
+    field @Deprecated protected int numEntries;
+    field @Deprecated protected final org.apache.http.conn.routing.HttpRoute route;
+    field @Deprecated protected final java.util.Queue<org.apache.http.impl.conn.tsccm.WaitingThread> waitingThreads;
+  }
+
+  @Deprecated public class ThreadSafeClientConnManager implements org.apache.http.conn.ClientConnectionManager {
+    ctor @Deprecated public ThreadSafeClientConnManager(org.apache.http.params.HttpParams, org.apache.http.conn.scheme.SchemeRegistry);
+    method @Deprecated public void closeExpiredConnections();
+    method @Deprecated public void closeIdleConnections(long, java.util.concurrent.TimeUnit);
+    method @Deprecated protected org.apache.http.conn.ClientConnectionOperator createConnectionOperator(org.apache.http.conn.scheme.SchemeRegistry);
+    method @Deprecated protected org.apache.http.impl.conn.tsccm.AbstractConnPool createConnectionPool(org.apache.http.params.HttpParams);
+    method @Deprecated public int getConnectionsInPool(org.apache.http.conn.routing.HttpRoute);
+    method @Deprecated public int getConnectionsInPool();
+    method @Deprecated public org.apache.http.conn.scheme.SchemeRegistry getSchemeRegistry();
+    method @Deprecated public void releaseConnection(org.apache.http.conn.ManagedClientConnection, long, java.util.concurrent.TimeUnit);
+    method @Deprecated public org.apache.http.conn.ClientConnectionRequest requestConnection(org.apache.http.conn.routing.HttpRoute, Object);
+    method @Deprecated public void shutdown();
+    field @Deprecated protected org.apache.http.conn.ClientConnectionOperator connOperator;
+    field @Deprecated protected final org.apache.http.impl.conn.tsccm.AbstractConnPool connectionPool;
+    field @Deprecated protected org.apache.http.conn.scheme.SchemeRegistry schemeRegistry;
+  }
+
+  @Deprecated public class WaitingThread {
+    ctor @Deprecated public WaitingThread(java.util.concurrent.locks.Condition, org.apache.http.impl.conn.tsccm.RouteSpecificPool);
+    method @Deprecated public boolean await(java.util.Date) throws java.lang.InterruptedException;
+    method @Deprecated public final java.util.concurrent.locks.Condition getCondition();
+    method @Deprecated public final org.apache.http.impl.conn.tsccm.RouteSpecificPool getPool();
+    method @Deprecated public final Thread getThread();
+    method @Deprecated public void interrupt();
+    method @Deprecated public void wakeup();
+  }
+
+  @Deprecated public class WaitingThreadAborter {
+    ctor @Deprecated public WaitingThreadAborter();
+    method @Deprecated public void abort();
+    method @Deprecated public void setWaitingThread(org.apache.http.impl.conn.tsccm.WaitingThread);
   }
 
 }
 
 package org.apache.http.impl.cookie {
 
-  public abstract deprecated class AbstractCookieAttributeHandler implements org.apache.http.cookie.CookieAttributeHandler {
-    ctor public AbstractCookieAttributeHandler();
-    method public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
-    method public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
-  }
-
-  public abstract deprecated class AbstractCookieSpec implements org.apache.http.cookie.CookieSpec {
-    ctor public AbstractCookieSpec();
-    method protected org.apache.http.cookie.CookieAttributeHandler findAttribHandler(java.lang.String);
-    method protected org.apache.http.cookie.CookieAttributeHandler getAttribHandler(java.lang.String);
-    method protected java.util.Collection<org.apache.http.cookie.CookieAttributeHandler> getAttribHandlers();
-    method public void registerAttribHandler(java.lang.String, org.apache.http.cookie.CookieAttributeHandler);
+  @Deprecated public abstract class AbstractCookieAttributeHandler implements org.apache.http.cookie.CookieAttributeHandler {
+    ctor @Deprecated public AbstractCookieAttributeHandler();
+    method @Deprecated public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
+    method @Deprecated public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
+  }
+
+  @Deprecated public abstract class AbstractCookieSpec implements org.apache.http.cookie.CookieSpec {
+    ctor @Deprecated public AbstractCookieSpec();
+    method @Deprecated protected org.apache.http.cookie.CookieAttributeHandler findAttribHandler(String);
+    method @Deprecated protected org.apache.http.cookie.CookieAttributeHandler getAttribHandler(String);
+    method @Deprecated protected java.util.Collection<org.apache.http.cookie.CookieAttributeHandler> getAttribHandlers();
+    method @Deprecated public void registerAttribHandler(String, org.apache.http.cookie.CookieAttributeHandler);
   }
 
-  public deprecated class BasicClientCookie implements org.apache.http.cookie.ClientCookie java.lang.Cloneable org.apache.http.cookie.SetCookie {
-    ctor public BasicClientCookie(java.lang.String, java.lang.String);
-    method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
-    method public boolean containsAttribute(java.lang.String);
-    method public java.lang.String getAttribute(java.lang.String);
-    method public java.lang.String getComment();
-    method public java.lang.String getCommentURL();
-    method public java.lang.String getDomain();
-    method public java.util.Date getExpiryDate();
-    method public java.lang.String getName();
-    method public java.lang.String getPath();
-    method public int[] getPorts();
-    method public java.lang.String getValue();
-    method public int getVersion();
-    method public boolean isExpired(java.util.Date);
-    method public boolean isPersistent();
-    method public boolean isSecure();
-    method public void setAttribute(java.lang.String, java.lang.String);
-    method public void setComment(java.lang.String);
-    method public void setDomain(java.lang.String);
-    method public void setExpiryDate(java.util.Date);
-    method public void setPath(java.lang.String);
-    method public void setSecure(boolean);
-    method public void setValue(java.lang.String);
-    method public void setVersion(int);
+  @Deprecated public class BasicClientCookie implements org.apache.http.cookie.ClientCookie java.lang.Cloneable org.apache.http.cookie.SetCookie {
+    ctor @Deprecated public BasicClientCookie(String, String);
+    method @Deprecated public Object clone() throws java.lang.CloneNotSupportedException;
+    method @Deprecated public boolean containsAttribute(String);
+    method @Deprecated public String getAttribute(String);
+    method @Deprecated public String getComment();
+    method @Deprecated public String getCommentURL();
+    method @Deprecated public String getDomain();
+    method @Deprecated public java.util.Date getExpiryDate();
+    method @Deprecated public String getName();
+    method @Deprecated public String getPath();
+    method @Deprecated public int[] getPorts();
+    method @Deprecated public String getValue();
+    method @Deprecated public int getVersion();
+    method @Deprecated public boolean isExpired(java.util.Date);
+    method @Deprecated public boolean isPersistent();
+    method @Deprecated public boolean isSecure();
+    method @Deprecated public void setAttribute(String, String);
+    method @Deprecated public void setComment(String);
+    method @Deprecated public void setDomain(String);
+    method @Deprecated public void setExpiryDate(java.util.Date);
+    method @Deprecated public void setPath(String);
+    method @Deprecated public void setSecure(boolean);
+    method @Deprecated public void setValue(String);
+    method @Deprecated public void setVersion(int);
   }
 
-  public deprecated class BasicClientCookie2 extends org.apache.http.impl.cookie.BasicClientCookie implements org.apache.http.cookie.SetCookie2 {
-    ctor public BasicClientCookie2(java.lang.String, java.lang.String);
-    method public void setCommentURL(java.lang.String);
-    method public void setDiscard(boolean);
-    method public void setPorts(int[]);
+  @Deprecated public class BasicClientCookie2 extends org.apache.http.impl.cookie.BasicClientCookie implements org.apache.http.cookie.SetCookie2 {
+    ctor @Deprecated public BasicClientCookie2(String, String);
+    method @Deprecated public void setCommentURL(String);
+    method @Deprecated public void setDiscard(boolean);
+    method @Deprecated public void setPorts(int[]);
   }
 
-  public deprecated class BasicCommentHandler extends org.apache.http.impl.cookie.AbstractCookieAttributeHandler {
-    ctor public BasicCommentHandler();
-    method public void parse(org.apache.http.cookie.SetCookie, java.lang.String) throws org.apache.http.cookie.MalformedCookieException;
+  @Deprecated public class BasicCommentHandler extends org.apache.http.impl.cookie.AbstractCookieAttributeHandler {
+    ctor @Deprecated public BasicCommentHandler();
+    method @Deprecated public void parse(org.apache.http.cookie.SetCookie, String) throws org.apache.http.cookie.MalformedCookieException;
   }
 
-  public deprecated class BasicDomainHandler implements org.apache.http.cookie.CookieAttributeHandler {
-    ctor public BasicDomainHandler();
-    method public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
-    method public void parse(org.apache.http.cookie.SetCookie, java.lang.String) throws org.apache.http.cookie.MalformedCookieException;
-    method public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
+  @Deprecated public class BasicDomainHandler implements org.apache.http.cookie.CookieAttributeHandler {
+    ctor @Deprecated public BasicDomainHandler();
+    method @Deprecated public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
+    method @Deprecated public void parse(org.apache.http.cookie.SetCookie, String) throws org.apache.http.cookie.MalformedCookieException;
+    method @Deprecated public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
   }
 
-  public deprecated class BasicExpiresHandler extends org.apache.http.impl.cookie.AbstractCookieAttributeHandler {
-    ctor public BasicExpiresHandler(java.lang.String[]);
-    method public void parse(org.apache.http.cookie.SetCookie, java.lang.String) throws org.apache.http.cookie.MalformedCookieException;
+  @Deprecated public class BasicExpiresHandler extends org.apache.http.impl.cookie.AbstractCookieAttributeHandler {
+    ctor @Deprecated public BasicExpiresHandler(String[]);
+    method @Deprecated public void parse(org.apache.http.cookie.SetCookie, String) throws org.apache.http.cookie.MalformedCookieException;
   }
 
-  public deprecated class BasicMaxAgeHandler extends org.apache.http.impl.cookie.AbstractCookieAttributeHandler {
-    ctor public BasicMaxAgeHandler();
-    method public void parse(org.apache.http.cookie.SetCookie, java.lang.String) throws org.apache.http.cookie.MalformedCookieException;
+  @Deprecated public class BasicMaxAgeHandler extends org.apache.http.impl.cookie.AbstractCookieAttributeHandler {
+    ctor @Deprecated public BasicMaxAgeHandler();
+    method @Deprecated public void parse(org.apache.http.cookie.SetCookie, String) throws org.apache.http.cookie.MalformedCookieException;
   }
 
-  public deprecated class BasicPathHandler implements org.apache.http.cookie.CookieAttributeHandler {
-    ctor public BasicPathHandler();
-    method public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
-    method public void parse(org.apache.http.cookie.SetCookie, java.lang.String) throws org.apache.http.cookie.MalformedCookieException;
-    method public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
+  @Deprecated public class BasicPathHandler implements org.apache.http.cookie.CookieAttributeHandler {
+    ctor @Deprecated public BasicPathHandler();
+    method @Deprecated public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
+    method @Deprecated public void parse(org.apache.http.cookie.SetCookie, String) throws org.apache.http.cookie.MalformedCookieException;
+    method @Deprecated public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
   }
 
-  public deprecated class BasicSecureHandler extends org.apache.http.impl.cookie.AbstractCookieAttributeHandler {
-    ctor public BasicSecureHandler();
-    method public void parse(org.apache.http.cookie.SetCookie, java.lang.String) throws org.apache.http.cookie.MalformedCookieException;
+  @Deprecated public class BasicSecureHandler extends org.apache.http.impl.cookie.AbstractCookieAttributeHandler {
+    ctor @Deprecated public BasicSecureHandler();
+    method @Deprecated public void parse(org.apache.http.cookie.SetCookie, String) throws org.apache.http.cookie.MalformedCookieException;
   }
 
-  public deprecated class BestMatchSpec implements org.apache.http.cookie.CookieSpec {
-    ctor public BestMatchSpec(java.lang.String[], boolean);
-    ctor public BestMatchSpec();
-    method public java.util.List<org.apache.http.Header> formatCookies(java.util.List<org.apache.http.cookie.Cookie>);
-    method public int getVersion();
-    method public org.apache.http.Header getVersionHeader();
-    method public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
-    method public java.util.List<org.apache.http.cookie.Cookie> parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
-    method public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
+  @Deprecated public class BestMatchSpec implements org.apache.http.cookie.CookieSpec {
+    ctor @Deprecated public BestMatchSpec(String[], boolean);
+    ctor @Deprecated public BestMatchSpec();
+    method @Deprecated public java.util.List<org.apache.http.Header> formatCookies(java.util.List<org.apache.http.cookie.Cookie>);
+    method @Deprecated public int getVersion();
+    method @Deprecated public org.apache.http.Header getVersionHeader();
+    method @Deprecated public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
+    method @Deprecated public java.util.List<org.apache.http.cookie.Cookie> parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
+    method @Deprecated public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
   }
 
-  public deprecated class BestMatchSpecFactory implements org.apache.http.cookie.CookieSpecFactory {
-    ctor public BestMatchSpecFactory();
-    method public org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams);
+  @Deprecated public class BestMatchSpecFactory implements org.apache.http.cookie.CookieSpecFactory {
+    ctor @Deprecated public BestMatchSpecFactory();
+    method @Deprecated public org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams);
   }
 
-  public deprecated class BrowserCompatSpec extends org.apache.http.impl.cookie.CookieSpecBase {
-    ctor public BrowserCompatSpec(java.lang.String[]);
-    ctor public BrowserCompatSpec();
-    method public java.util.List<org.apache.http.Header> formatCookies(java.util.List<org.apache.http.cookie.Cookie>);
-    method public int getVersion();
-    method public org.apache.http.Header getVersionHeader();
-    method public java.util.List<org.apache.http.cookie.Cookie> parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
-    field protected static final java.lang.String[] DATE_PATTERNS;
+  @Deprecated public class BrowserCompatSpec extends org.apache.http.impl.cookie.CookieSpecBase {
+    ctor @Deprecated public BrowserCompatSpec(String[]);
+    ctor @Deprecated public BrowserCompatSpec();
+    method @Deprecated public java.util.List<org.apache.http.Header> formatCookies(java.util.List<org.apache.http.cookie.Cookie>);
+    method @Deprecated public int getVersion();
+    method @Deprecated public org.apache.http.Header getVersionHeader();
+    method @Deprecated public java.util.List<org.apache.http.cookie.Cookie> parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
+    field @Deprecated protected static final String[] DATE_PATTERNS;
   }
 
-  public deprecated class BrowserCompatSpecFactory implements org.apache.http.cookie.CookieSpecFactory {
-    ctor public BrowserCompatSpecFactory();
-    method public org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams);
+  @Deprecated public class BrowserCompatSpecFactory implements org.apache.http.cookie.CookieSpecFactory {
+    ctor @Deprecated public BrowserCompatSpecFactory();
+    method @Deprecated public org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams);
   }
 
-  public abstract deprecated class CookieSpecBase extends org.apache.http.impl.cookie.AbstractCookieSpec {
-    ctor public CookieSpecBase();
-    method protected static java.lang.String getDefaultDomain(org.apache.http.cookie.CookieOrigin);
-    method protected static java.lang.String getDefaultPath(org.apache.http.cookie.CookieOrigin);
-    method public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
-    method protected java.util.List<org.apache.http.cookie.Cookie> parse(org.apache.http.HeaderElement[], org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
-    method public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
+  @Deprecated public abstract class CookieSpecBase extends org.apache.http.impl.cookie.AbstractCookieSpec {
+    ctor @Deprecated public CookieSpecBase();
+    method @Deprecated protected static String getDefaultDomain(org.apache.http.cookie.CookieOrigin);
+    method @Deprecated protected static String getDefaultPath(org.apache.http.cookie.CookieOrigin);
+    method @Deprecated public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
+    method @Deprecated protected java.util.List<org.apache.http.cookie.Cookie> parse(org.apache.http.HeaderElement[], org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
+    method @Deprecated public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
   }
 
-  public deprecated class DateParseException extends java.lang.Exception {
-    ctor public DateParseException();
-    ctor public DateParseException(java.lang.String);
+  @Deprecated public class DateParseException extends java.lang.Exception {
+    ctor @Deprecated public DateParseException();
+    ctor @Deprecated public DateParseException(String);
   }
 
-  public final deprecated class DateUtils {
-    method public static java.lang.String formatDate(java.util.Date);
-    method public static java.lang.String formatDate(java.util.Date, java.lang.String);
-    method public static java.util.Date parseDate(java.lang.String) throws org.apache.http.impl.cookie.DateParseException;
-    method public static java.util.Date parseDate(java.lang.String, java.lang.String[]) throws org.apache.http.impl.cookie.DateParseException;
-    method public static java.util.Date parseDate(java.lang.String, java.lang.String[], java.util.Date) throws org.apache.http.impl.cookie.DateParseException;
-    field public static final java.util.TimeZone GMT;
-    field public static final java.lang.String PATTERN_ASCTIME = "EEE MMM d HH:mm:ss yyyy";
-    field public static final java.lang.String PATTERN_RFC1036 = "EEEE, dd-MMM-yy HH:mm:ss zzz";
-    field public static final java.lang.String PATTERN_RFC1123 = "EEE, dd MMM yyyy HH:mm:ss zzz";
+  @Deprecated public final class DateUtils {
+    method @Deprecated public static String formatDate(java.util.Date);
+    method @Deprecated public static String formatDate(java.util.Date, String);
+    method @Deprecated public static java.util.Date parseDate(String) throws org.apache.http.impl.cookie.DateParseException;
+    method @Deprecated public static java.util.Date parseDate(String, String[]) throws org.apache.http.impl.cookie.DateParseException;
+    method @Deprecated public static java.util.Date parseDate(String, String[], java.util.Date) throws org.apache.http.impl.cookie.DateParseException;
+    field @Deprecated public static final java.util.TimeZone GMT;
+    field @Deprecated public static final String PATTERN_ASCTIME = "EEE MMM d HH:mm:ss yyyy";
+    field @Deprecated public static final String PATTERN_RFC1036 = "EEEE, dd-MMM-yy HH:mm:ss zzz";
+    field @Deprecated public static final String PATTERN_RFC1123 = "EEE, dd MMM yyyy HH:mm:ss zzz";
   }
 
-  public deprecated class NetscapeDomainHandler extends org.apache.http.impl.cookie.BasicDomainHandler {
-    ctor public NetscapeDomainHandler();
+  @Deprecated public class NetscapeDomainHandler extends org.apache.http.impl.cookie.BasicDomainHandler {
+    ctor @Deprecated public NetscapeDomainHandler();
   }
 
-  public deprecated class NetscapeDraftHeaderParser {
-    ctor public NetscapeDraftHeaderParser();
-    method public org.apache.http.HeaderElement parseHeader(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
-    field public static final org.apache.http.impl.cookie.NetscapeDraftHeaderParser DEFAULT;
+  @Deprecated public class NetscapeDraftHeaderParser {
+    ctor @Deprecated public NetscapeDraftHeaderParser();
+    method @Deprecated public org.apache.http.HeaderElement parseHeader(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
+    field @Deprecated public static final org.apache.http.impl.cookie.NetscapeDraftHeaderParser DEFAULT;
   }
 
-  public deprecated class NetscapeDraftSpec extends org.apache.http.impl.cookie.CookieSpecBase {
-    ctor public NetscapeDraftSpec(java.lang.String[]);
-    ctor public NetscapeDraftSpec();
-    method public java.util.List<org.apache.http.Header> formatCookies(java.util.List<org.apache.http.cookie.Cookie>);
-    method public int getVersion();
-    method public org.apache.http.Header getVersionHeader();
-    method public java.util.List<org.apache.http.cookie.Cookie> parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
-    field protected static final java.lang.String EXPIRES_PATTERN = "EEE, dd-MMM-yyyy HH:mm:ss z";
+  @Deprecated public class NetscapeDraftSpec extends org.apache.http.impl.cookie.CookieSpecBase {
+    ctor @Deprecated public NetscapeDraftSpec(String[]);
+    ctor @Deprecated public NetscapeDraftSpec();
+    method @Deprecated public java.util.List<org.apache.http.Header> formatCookies(java.util.List<org.apache.http.cookie.Cookie>);
+    method @Deprecated public int getVersion();
+    method @Deprecated public org.apache.http.Header getVersionHeader();
+    method @Deprecated public java.util.List<org.apache.http.cookie.Cookie> parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
+    field @Deprecated protected static final String EXPIRES_PATTERN = "EEE, dd-MMM-yyyy HH:mm:ss z";
   }
 
-  public deprecated class NetscapeDraftSpecFactory implements org.apache.http.cookie.CookieSpecFactory {
-    ctor public NetscapeDraftSpecFactory();
-    method public org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams);
+  @Deprecated public class NetscapeDraftSpecFactory implements org.apache.http.cookie.CookieSpecFactory {
+    ctor @Deprecated public NetscapeDraftSpecFactory();
+    method @Deprecated public org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams);
   }
 
-  public deprecated class RFC2109DomainHandler implements org.apache.http.cookie.CookieAttributeHandler {
-    ctor public RFC2109DomainHandler();
-    method public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
-    method public void parse(org.apache.http.cookie.SetCookie, java.lang.String) throws org.apache.http.cookie.MalformedCookieException;
-    method public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
+  @Deprecated public class RFC2109DomainHandler implements org.apache.http.cookie.CookieAttributeHandler {
+    ctor @Deprecated public RFC2109DomainHandler();
+    method @Deprecated public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
+    method @Deprecated public void parse(org.apache.http.cookie.SetCookie, String) throws org.apache.http.cookie.MalformedCookieException;
+    method @Deprecated public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
   }
 
-  public deprecated class RFC2109Spec extends org.apache.http.impl.cookie.CookieSpecBase {
-    ctor public RFC2109Spec(java.lang.String[], boolean);
-    ctor public RFC2109Spec();
-    method protected void formatCookieAsVer(org.apache.http.util.CharArrayBuffer, org.apache.http.cookie.Cookie, int);
-    method public java.util.List<org.apache.http.Header> formatCookies(java.util.List<org.apache.http.cookie.Cookie>);
-    method protected void formatParamAsVer(org.apache.http.util.CharArrayBuffer, java.lang.String, java.lang.String, int);
-    method public int getVersion();
-    method public org.apache.http.Header getVersionHeader();
-    method public java.util.List<org.apache.http.cookie.Cookie> parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
+  @Deprecated public class RFC2109Spec extends org.apache.http.impl.cookie.CookieSpecBase {
+    ctor @Deprecated public RFC2109Spec(String[], boolean);
+    ctor @Deprecated public RFC2109Spec();
+    method @Deprecated protected void formatCookieAsVer(org.apache.http.util.CharArrayBuffer, org.apache.http.cookie.Cookie, int);
+    method @Deprecated public java.util.List<org.apache.http.Header> formatCookies(java.util.List<org.apache.http.cookie.Cookie>);
+    method @Deprecated protected void formatParamAsVer(org.apache.http.util.CharArrayBuffer, String, String, int);
+    method @Deprecated public int getVersion();
+    method @Deprecated public org.apache.http.Header getVersionHeader();
+    method @Deprecated public java.util.List<org.apache.http.cookie.Cookie> parse(org.apache.http.Header, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
   }
 
-  public deprecated class RFC2109SpecFactory implements org.apache.http.cookie.CookieSpecFactory {
-    ctor public RFC2109SpecFactory();
-    method public org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams);
+  @Deprecated public class RFC2109SpecFactory implements org.apache.http.cookie.CookieSpecFactory {
+    ctor @Deprecated public RFC2109SpecFactory();
+    method @Deprecated public org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams);
   }
 
-  public deprecated class RFC2109VersionHandler extends org.apache.http.impl.cookie.AbstractCookieAttributeHandler {
-    ctor public RFC2109VersionHandler();
-    method public void parse(org.apache.http.cookie.SetCookie, java.lang.String) throws org.apache.http.cookie.MalformedCookieException;
+  @Deprecated public class RFC2109VersionHandler extends org.apache.http.impl.cookie.AbstractCookieAttributeHandler {
+    ctor @Deprecated public RFC2109VersionHandler();
+    method @Deprecated public void parse(org.apache.http.cookie.SetCookie, String) throws org.apache.http.cookie.MalformedCookieException;
   }
 
-  public deprecated class RFC2965CommentUrlAttributeHandler implements org.apache.http.cookie.CookieAttributeHandler {
-    ctor public RFC2965CommentUrlAttributeHandler();
-    method public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
-    method public void parse(org.apache.http.cookie.SetCookie, java.lang.String) throws org.apache.http.cookie.MalformedCookieException;
-    method public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
+  @Deprecated public class RFC2965CommentUrlAttributeHandler implements org.apache.http.cookie.CookieAttributeHandler {
+    ctor @Deprecated public RFC2965CommentUrlAttributeHandler();
+    method @Deprecated public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
+    method @Deprecated public void parse(org.apache.http.cookie.SetCookie, String) throws org.apache.http.cookie.MalformedCookieException;
+    method @Deprecated public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
   }
 
-  public deprecated class RFC2965DiscardAttributeHandler implements org.apache.http.cookie.CookieAttributeHandler {
-    ctor public RFC2965DiscardAttributeHandler();
-    method public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
-    method public void parse(org.apache.http.cookie.SetCookie, java.lang.String) throws org.apache.http.cookie.MalformedCookieException;
-    method public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
+  @Deprecated public class RFC2965DiscardAttributeHandler implements org.apache.http.cookie.CookieAttributeHandler {
+    ctor @Deprecated public RFC2965DiscardAttributeHandler();
+    method @Deprecated public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
+    method @Deprecated public void parse(org.apache.http.cookie.SetCookie, String) throws org.apache.http.cookie.MalformedCookieException;
+    method @Deprecated public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
   }
 
-  public deprecated class RFC2965DomainAttributeHandler implements org.apache.http.cookie.CookieAttributeHandler {
-    ctor public RFC2965DomainAttributeHandler();
-    method public boolean domainMatch(java.lang.String, java.lang.String);
-    method public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
-    method public void parse(org.apache.http.cookie.SetCookie, java.lang.String) throws org.apache.http.cookie.MalformedCookieException;
-    method public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
+  @Deprecated public class RFC2965DomainAttributeHandler implements org.apache.http.cookie.CookieAttributeHandler {
+    ctor @Deprecated public RFC2965DomainAttributeHandler();
+    method @Deprecated public boolean domainMatch(String, String);
+    method @Deprecated public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
+    method @Deprecated public void parse(org.apache.http.cookie.SetCookie, String) throws org.apache.http.cookie.MalformedCookieException;
+    method @Deprecated public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
   }
 
-  public deprecated class RFC2965PortAttributeHandler implements org.apache.http.cookie.CookieAttributeHandler {
-    ctor public RFC2965PortAttributeHandler();
-    method public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
-    method public void parse(org.apache.http.cookie.SetCookie, java.lang.String) throws org.apache.http.cookie.MalformedCookieException;
-    method public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
+  @Deprecated public class RFC2965PortAttributeHandler implements org.apache.http.cookie.CookieAttributeHandler {
+    ctor @Deprecated public RFC2965PortAttributeHandler();
+    method @Deprecated public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
+    method @Deprecated public void parse(org.apache.http.cookie.SetCookie, String) throws org.apache.http.cookie.MalformedCookieException;
+    method @Deprecated public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
   }
 
-  public deprecated class RFC2965Spec extends org.apache.http.impl.cookie.RFC2109Spec {
-    ctor public RFC2965Spec();
-    ctor public RFC2965Spec(java.lang.String[], boolean);
+  @Deprecated public class RFC2965Spec extends org.apache.http.impl.cookie.RFC2109Spec {
+    ctor @Deprecated public RFC2965Spec();
+    ctor @Deprecated public RFC2965Spec(String[], boolean);
   }
 
-  public deprecated class RFC2965SpecFactory implements org.apache.http.cookie.CookieSpecFactory {
-    ctor public RFC2965SpecFactory();
-    method public org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams);
+  @Deprecated public class RFC2965SpecFactory implements org.apache.http.cookie.CookieSpecFactory {
+    ctor @Deprecated public RFC2965SpecFactory();
+    method @Deprecated public org.apache.http.cookie.CookieSpec newInstance(org.apache.http.params.HttpParams);
   }
 
-  public deprecated class RFC2965VersionAttributeHandler implements org.apache.http.cookie.CookieAttributeHandler {
-    ctor public RFC2965VersionAttributeHandler();
-    method public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
-    method public void parse(org.apache.http.cookie.SetCookie, java.lang.String) throws org.apache.http.cookie.MalformedCookieException;
-    method public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
+  @Deprecated public class RFC2965VersionAttributeHandler implements org.apache.http.cookie.CookieAttributeHandler {
+    ctor @Deprecated public RFC2965VersionAttributeHandler();
+    method @Deprecated public boolean match(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin);
+    method @Deprecated public void parse(org.apache.http.cookie.SetCookie, String) throws org.apache.http.cookie.MalformedCookieException;
+    method @Deprecated public void validate(org.apache.http.cookie.Cookie, org.apache.http.cookie.CookieOrigin) throws org.apache.http.cookie.MalformedCookieException;
   }
 
 }
 
 package org.apache.http.impl.entity {
 
-  public deprecated class EntityDeserializer {
-    ctor public EntityDeserializer(org.apache.http.entity.ContentLengthStrategy);
-    method public org.apache.http.HttpEntity deserialize(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpMessage) throws org.apache.http.HttpException, java.io.IOException;
-    method protected org.apache.http.entity.BasicHttpEntity doDeserialize(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpMessage) throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public class EntityDeserializer {
+    ctor @Deprecated public EntityDeserializer(org.apache.http.entity.ContentLengthStrategy);
+    method @Deprecated public org.apache.http.HttpEntity deserialize(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpMessage) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated protected org.apache.http.entity.BasicHttpEntity doDeserialize(org.apache.http.io.SessionInputBuffer, org.apache.http.HttpMessage) throws org.apache.http.HttpException, java.io.IOException;
   }
 
-  public deprecated class EntitySerializer {
-    ctor public EntitySerializer(org.apache.http.entity.ContentLengthStrategy);
-    method protected java.io.OutputStream doSerialize(org.apache.http.io.SessionOutputBuffer, org.apache.http.HttpMessage) throws org.apache.http.HttpException, java.io.IOException;
-    method public void serialize(org.apache.http.io.SessionOutputBuffer, org.apache.http.HttpMessage, org.apache.http.HttpEntity) throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public class EntitySerializer {
+    ctor @Deprecated public EntitySerializer(org.apache.http.entity.ContentLengthStrategy);
+    method @Deprecated protected java.io.OutputStream doSerialize(org.apache.http.io.SessionOutputBuffer, org.apache.http.HttpMessage) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public void serialize(org.apache.http.io.SessionOutputBuffer, org.apache.http.HttpMessage, org.apache.http.HttpEntity) throws org.apache.http.HttpException, java.io.IOException;
   }
 
-  public deprecated class LaxContentLengthStrategy implements org.apache.http.entity.ContentLengthStrategy {
-    ctor public LaxContentLengthStrategy();
-    method public long determineLength(org.apache.http.HttpMessage) throws org.apache.http.HttpException;
+  @Deprecated public class LaxContentLengthStrategy implements org.apache.http.entity.ContentLengthStrategy {
+    ctor @Deprecated public LaxContentLengthStrategy();
+    method @Deprecated public long determineLength(org.apache.http.HttpMessage) throws org.apache.http.HttpException;
   }
 
-  public deprecated class StrictContentLengthStrategy implements org.apache.http.entity.ContentLengthStrategy {
-    ctor public StrictContentLengthStrategy();
-    method public long determineLength(org.apache.http.HttpMessage) throws org.apache.http.HttpException;
+  @Deprecated public class StrictContentLengthStrategy implements org.apache.http.entity.ContentLengthStrategy {
+    ctor @Deprecated public StrictContentLengthStrategy();
+    method @Deprecated public long determineLength(org.apache.http.HttpMessage) throws org.apache.http.HttpException;
   }
 
 }
 
 package org.apache.http.impl.io {
 
-  public abstract deprecated class AbstractMessageParser implements org.apache.http.io.HttpMessageParser {
-    ctor public AbstractMessageParser(org.apache.http.io.SessionInputBuffer, org.apache.http.message.LineParser, org.apache.http.params.HttpParams);
-    method public org.apache.http.HttpMessage parse() throws org.apache.http.HttpException, java.io.IOException;
-    method protected abstract org.apache.http.HttpMessage parseHead(org.apache.http.io.SessionInputBuffer) throws org.apache.http.HttpException, java.io.IOException, org.apache.http.ParseException;
-    method public static org.apache.http.Header[] parseHeaders(org.apache.http.io.SessionInputBuffer, int, int, org.apache.http.message.LineParser) throws org.apache.http.HttpException, java.io.IOException;
-    field protected final org.apache.http.message.LineParser lineParser;
-  }
-
-  public abstract deprecated class AbstractMessageWriter implements org.apache.http.io.HttpMessageWriter {
-    ctor public AbstractMessageWriter(org.apache.http.io.SessionOutputBuffer, org.apache.http.message.LineFormatter, org.apache.http.params.HttpParams);
-    method public void write(org.apache.http.HttpMessage) throws org.apache.http.HttpException, java.io.IOException;
-    method protected abstract void writeHeadLine(org.apache.http.HttpMessage) throws java.io.IOException;
-    field protected final org.apache.http.util.CharArrayBuffer lineBuf;
-    field protected final org.apache.http.message.LineFormatter lineFormatter;
-    field protected final org.apache.http.io.SessionOutputBuffer sessionBuffer;
-  }
-
-  public abstract deprecated class AbstractSessionInputBuffer implements org.apache.http.io.SessionInputBuffer {
-    ctor public AbstractSessionInputBuffer();
-    method protected int fillBuffer() throws java.io.IOException;
-    method public org.apache.http.io.HttpTransportMetrics getMetrics();
-    method protected boolean hasBufferedData();
-    method protected void init(java.io.InputStream, int, org.apache.http.params.HttpParams);
-    method public int read() throws java.io.IOException;
-    method public int read(byte[], int, int) throws java.io.IOException;
-    method public int read(byte[]) throws java.io.IOException;
-    method public int readLine(org.apache.http.util.CharArrayBuffer) throws java.io.IOException;
-    method public java.lang.String readLine() throws java.io.IOException;
-  }
-
-  public abstract deprecated class AbstractSessionOutputBuffer implements org.apache.http.io.SessionOutputBuffer {
-    ctor public AbstractSessionOutputBuffer();
-    method public void flush() throws java.io.IOException;
-    method protected void flushBuffer() throws java.io.IOException;
-    method public org.apache.http.io.HttpTransportMetrics getMetrics();
-    method protected void init(java.io.OutputStream, int, org.apache.http.params.HttpParams);
-    method public void write(byte[], int, int) throws java.io.IOException;
-    method public void write(byte[]) throws java.io.IOException;
-    method public void write(int) throws java.io.IOException;
-    method public void writeLine(java.lang.String) throws java.io.IOException;
-    method public void writeLine(org.apache.http.util.CharArrayBuffer) throws java.io.IOException;
+  @Deprecated public abstract class AbstractMessageParser implements org.apache.http.io.HttpMessageParser {
+    ctor @Deprecated public AbstractMessageParser(org.apache.http.io.SessionInputBuffer, org.apache.http.message.LineParser, org.apache.http.params.HttpParams);
+    method @Deprecated public org.apache.http.HttpMessage parse() throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated protected abstract org.apache.http.HttpMessage parseHead(org.apache.http.io.SessionInputBuffer) throws org.apache.http.HttpException, java.io.IOException, org.apache.http.ParseException;
+    method @Deprecated public static org.apache.http.Header[] parseHeaders(org.apache.http.io.SessionInputBuffer, int, int, org.apache.http.message.LineParser) throws org.apache.http.HttpException, java.io.IOException;
+    field @Deprecated protected final org.apache.http.message.LineParser lineParser;
+  }
+
+  @Deprecated public abstract class AbstractMessageWriter implements org.apache.http.io.HttpMessageWriter {
+    ctor @Deprecated public AbstractMessageWriter(org.apache.http.io.SessionOutputBuffer, org.apache.http.message.LineFormatter, org.apache.http.params.HttpParams);
+    method @Deprecated public void write(org.apache.http.HttpMessage) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated protected abstract void writeHeadLine(org.apache.http.HttpMessage) throws java.io.IOException;
+    field @Deprecated protected final org.apache.http.util.CharArrayBuffer lineBuf;
+    field @Deprecated protected final org.apache.http.message.LineFormatter lineFormatter;
+    field @Deprecated protected final org.apache.http.io.SessionOutputBuffer sessionBuffer;
+  }
+
+  @Deprecated public abstract class AbstractSessionInputBuffer implements org.apache.http.io.SessionInputBuffer {
+    ctor @Deprecated public AbstractSessionInputBuffer();
+    method @Deprecated protected int fillBuffer() throws java.io.IOException;
+    method @Deprecated public org.apache.http.io.HttpTransportMetrics getMetrics();
+    method @Deprecated protected boolean hasBufferedData();
+    method @Deprecated protected void init(java.io.InputStream, int, org.apache.http.params.HttpParams);
+    method @Deprecated public int read() throws java.io.IOException;
+    method @Deprecated public int read(byte[], int, int) throws java.io.IOException;
+    method @Deprecated public int read(byte[]) throws java.io.IOException;
+    method @Deprecated public int readLine(org.apache.http.util.CharArrayBuffer) throws java.io.IOException;
+    method @Deprecated public String readLine() throws java.io.IOException;
+  }
+
+  @Deprecated public abstract class AbstractSessionOutputBuffer implements org.apache.http.io.SessionOutputBuffer {
+    ctor @Deprecated public AbstractSessionOutputBuffer();
+    method @Deprecated public void flush() throws java.io.IOException;
+    method @Deprecated protected void flushBuffer() throws java.io.IOException;
+    method @Deprecated public org.apache.http.io.HttpTransportMetrics getMetrics();
+    method @Deprecated protected void init(java.io.OutputStream, int, org.apache.http.params.HttpParams);
+    method @Deprecated public void write(byte[], int, int) throws java.io.IOException;
+    method @Deprecated public void write(byte[]) throws java.io.IOException;
+    method @Deprecated public void write(int) throws java.io.IOException;
+    method @Deprecated public void writeLine(String) throws java.io.IOException;
+    method @Deprecated public void writeLine(org.apache.http.util.CharArrayBuffer) throws java.io.IOException;
   }
 
-  public deprecated class ChunkedInputStream extends java.io.InputStream {
-    ctor public ChunkedInputStream(org.apache.http.io.SessionInputBuffer);
-    method public org.apache.http.Header[] getFooters();
-    method public int read() throws java.io.IOException;
+  @Deprecated public class ChunkedInputStream extends java.io.InputStream {
+    ctor @Deprecated public ChunkedInputStream(org.apache.http.io.SessionInputBuffer);
+    method @Deprecated public org.apache.http.Header[] getFooters();
+    method @Deprecated public int read() throws java.io.IOException;
   }
 
-  public deprecated class ChunkedOutputStream extends java.io.OutputStream {
-    ctor public ChunkedOutputStream(org.apache.http.io.SessionOutputBuffer, int) throws java.io.IOException;
-    ctor public ChunkedOutputStream(org.apache.http.io.SessionOutputBuffer) throws java.io.IOException;
-    method public void finish() throws java.io.IOException;
-    method protected void flushCache() throws java.io.IOException;
-    method protected void flushCacheWithAppend(byte[], int, int) throws java.io.IOException;
-    method public void write(int) throws java.io.IOException;
-    method protected void writeClosingChunk() throws java.io.IOException;
+  @Deprecated public class ChunkedOutputStream extends java.io.OutputStream {
+    ctor @Deprecated public ChunkedOutputStream(org.apache.http.io.SessionOutputBuffer, int) throws java.io.IOException;
+    ctor @Deprecated public ChunkedOutputStream(org.apache.http.io.SessionOutputBuffer) throws java.io.IOException;
+    method @Deprecated public void finish() throws java.io.IOException;
+    method @Deprecated protected void flushCache() throws java.io.IOException;
+    method @Deprecated protected void flushCacheWithAppend(byte[], int, int) throws java.io.IOException;
+    method @Deprecated public void write(int) throws java.io.IOException;
+    method @Deprecated protected void writeClosingChunk() throws java.io.IOException;
   }
 
-  public deprecated class ContentLengthInputStream extends java.io.InputStream {
-    ctor public ContentLengthInputStream(org.apache.http.io.SessionInputBuffer, long);
-    method public int read() throws java.io.IOException;
+  @Deprecated public class ContentLengthInputStream extends java.io.InputStream {
+    ctor @Deprecated public ContentLengthInputStream(org.apache.http.io.SessionInputBuffer, long);
+    method @Deprecated public int read() throws java.io.IOException;
   }
 
-  public deprecated class ContentLengthOutputStream extends java.io.OutputStream {
-    ctor public ContentLengthOutputStream(org.apache.http.io.SessionOutputBuffer, long);
-    method public void write(int) throws java.io.IOException;
+  @Deprecated public class ContentLengthOutputStream extends java.io.OutputStream {
+    ctor @Deprecated public ContentLengthOutputStream(org.apache.http.io.SessionOutputBuffer, long);
+    method @Deprecated public void write(int) throws java.io.IOException;
   }
 
-  public deprecated class HttpRequestParser extends org.apache.http.impl.io.AbstractMessageParser {
-    ctor public HttpRequestParser(org.apache.http.io.SessionInputBuffer, org.apache.http.message.LineParser, org.apache.http.HttpRequestFactory, org.apache.http.params.HttpParams);
-    method protected org.apache.http.HttpMessage parseHead(org.apache.http.io.SessionInputBuffer) throws org.apache.http.HttpException, java.io.IOException, org.apache.http.ParseException;
+  @Deprecated public class HttpRequestParser extends org.apache.http.impl.io.AbstractMessageParser {
+    ctor @Deprecated public HttpRequestParser(org.apache.http.io.SessionInputBuffer, org.apache.http.message.LineParser, org.apache.http.HttpRequestFactory, org.apache.http.params.HttpParams);
+    method @Deprecated protected org.apache.http.HttpMessage parseHead(org.apache.http.io.SessionInputBuffer) throws org.apache.http.HttpException, java.io.IOException, org.apache.http.ParseException;
   }
 
-  public deprecated class HttpRequestWriter extends org.apache.http.impl.io.AbstractMessageWriter {
-    ctor public HttpRequestWriter(org.apache.http.io.SessionOutputBuffer, org.apache.http.message.LineFormatter, org.apache.http.params.HttpParams);
-    method protected void writeHeadLine(org.apache.http.HttpMessage) throws java.io.IOException;
+  @Deprecated public class HttpRequestWriter extends org.apache.http.impl.io.AbstractMessageWriter {
+    ctor @Deprecated public HttpRequestWriter(org.apache.http.io.SessionOutputBuffer, org.apache.http.message.LineFormatter, org.apache.http.params.HttpParams);
+    method @Deprecated protected void writeHeadLine(org.apache.http.HttpMessage) throws java.io.IOException;
   }
 
-  public deprecated class HttpResponseParser extends org.apache.http.impl.io.AbstractMessageParser {
-    ctor public HttpResponseParser(org.apache.http.io.SessionInputBuffer, org.apache.http.message.LineParser, org.apache.http.HttpResponseFactory, org.apache.http.params.HttpParams);
-    method protected org.apache.http.HttpMessage parseHead(org.apache.http.io.SessionInputBuffer) throws org.apache.http.HttpException, java.io.IOException, org.apache.http.ParseException;
+  @Deprecated public class HttpResponseParser extends org.apache.http.impl.io.AbstractMessageParser {
+    ctor @Deprecated public HttpResponseParser(org.apache.http.io.SessionInputBuffer, org.apache.http.message.LineParser, org.apache.http.HttpResponseFactory, org.apache.http.params.HttpParams);
+    method @Deprecated protected org.apache.http.HttpMessage parseHead(org.apache.http.io.SessionInputBuffer) throws org.apache.http.HttpException, java.io.IOException, org.apache.http.ParseException;
   }
 
-  public deprecated class HttpResponseWriter extends org.apache.http.impl.io.AbstractMessageWriter {
-    ctor public HttpResponseWriter(org.apache.http.io.SessionOutputBuffer, org.apache.http.message.LineFormatter, org.apache.http.params.HttpParams);
-    method protected void writeHeadLine(org.apache.http.HttpMessage) throws java.io.IOException;
+  @Deprecated public class HttpResponseWriter extends org.apache.http.impl.io.AbstractMessageWriter {
+    ctor @Deprecated public HttpResponseWriter(org.apache.http.io.SessionOutputBuffer, org.apache.http.message.LineFormatter, org.apache.http.params.HttpParams);
+    method @Deprecated protected void writeHeadLine(org.apache.http.HttpMessage) throws java.io.IOException;
   }
 
-  public deprecated class HttpTransportMetricsImpl implements org.apache.http.io.HttpTransportMetrics {
-    ctor public HttpTransportMetricsImpl();
-    method public long getBytesTransferred();
-    method public void incrementBytesTransferred(long);
-    method public void reset();
-    method public void setBytesTransferred(long);
+  @Deprecated public class HttpTransportMetricsImpl implements org.apache.http.io.HttpTransportMetrics {
+    ctor @Deprecated public HttpTransportMetricsImpl();
+    method @Deprecated public long getBytesTransferred();
+    method @Deprecated public void incrementBytesTransferred(long);
+    method @Deprecated public void reset();
+    method @Deprecated public void setBytesTransferred(long);
   }
 
-  public deprecated class IdentityInputStream extends java.io.InputStream {
-    ctor public IdentityInputStream(org.apache.http.io.SessionInputBuffer);
-    method public int read() throws java.io.IOException;
+  @Deprecated public class IdentityInputStream extends java.io.InputStream {
+    ctor @Deprecated public IdentityInputStream(org.apache.http.io.SessionInputBuffer);
+    method @Deprecated public int read() throws java.io.IOException;
   }
 
-  public deprecated class IdentityOutputStream extends java.io.OutputStream {
-    ctor public IdentityOutputStream(org.apache.http.io.SessionOutputBuffer);
-    method public void write(int) throws java.io.IOException;
+  @Deprecated public class IdentityOutputStream extends java.io.OutputStream {
+    ctor @Deprecated public IdentityOutputStream(org.apache.http.io.SessionOutputBuffer);
+    method @Deprecated public void write(int) throws java.io.IOException;
   }
 
-  public deprecated class SocketInputBuffer extends org.apache.http.impl.io.AbstractSessionInputBuffer {
-    ctor public SocketInputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams) throws java.io.IOException;
-    method public boolean isDataAvailable(int) throws java.io.IOException;
-    method public boolean isStale() throws java.io.IOException;
+  @Deprecated public class SocketInputBuffer extends org.apache.http.impl.io.AbstractSessionInputBuffer {
+    ctor @Deprecated public SocketInputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams) throws java.io.IOException;
+    method @Deprecated public boolean isDataAvailable(int) throws java.io.IOException;
+    method @Deprecated public boolean isStale() throws java.io.IOException;
   }
 
-  public deprecated class SocketOutputBuffer extends org.apache.http.impl.io.AbstractSessionOutputBuffer {
-    ctor public SocketOutputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams) throws java.io.IOException;
+  @Deprecated public class SocketOutputBuffer extends org.apache.http.impl.io.AbstractSessionOutputBuffer {
+    ctor @Deprecated public SocketOutputBuffer(java.net.Socket, int, org.apache.http.params.HttpParams) throws java.io.IOException;
   }
 
 }
 
 package org.apache.http.io {
 
-  public abstract deprecated interface HttpMessageParser {
-    method public abstract org.apache.http.HttpMessage parse() throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public interface HttpMessageParser {
+    method @Deprecated public org.apache.http.HttpMessage parse() throws org.apache.http.HttpException, java.io.IOException;
   }
 
-  public abstract deprecated interface HttpMessageWriter {
-    method public abstract void write(org.apache.http.HttpMessage) throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public interface HttpMessageWriter {
+    method @Deprecated public void write(org.apache.http.HttpMessage) throws org.apache.http.HttpException, java.io.IOException;
   }
 
-  public abstract deprecated interface HttpTransportMetrics {
-    method public abstract long getBytesTransferred();
-    method public abstract void reset();
+  @Deprecated public interface HttpTransportMetrics {
+    method @Deprecated public long getBytesTransferred();
+    method @Deprecated public void reset();
   }
 
-  public abstract deprecated interface SessionInputBuffer {
-    method public abstract org.apache.http.io.HttpTransportMetrics getMetrics();
-    method public abstract boolean isDataAvailable(int) throws java.io.IOException;
-    method public abstract int read(byte[], int, int) throws java.io.IOException;
-    method public abstract int read(byte[]) throws java.io.IOException;
-    method public abstract int read() throws java.io.IOException;
-    method public abstract int readLine(org.apache.http.util.CharArrayBuffer) throws java.io.IOException;
-    method public abstract java.lang.String readLine() throws java.io.IOException;
+  @Deprecated public interface SessionInputBuffer {
+    method @Deprecated public org.apache.http.io.HttpTransportMetrics getMetrics();
+    method @Deprecated public boolean isDataAvailable(int) throws java.io.IOException;
+    method @Deprecated public int read(byte[], int, int) throws java.io.IOException;
+    method @Deprecated public int read(byte[]) throws java.io.IOException;
+    method @Deprecated public int read() throws java.io.IOException;
+    method @Deprecated public int readLine(org.apache.http.util.CharArrayBuffer) throws java.io.IOException;
+    method @Deprecated public String readLine() throws java.io.IOException;
   }
 
-  public abstract deprecated interface SessionOutputBuffer {
-    method public abstract void flush() throws java.io.IOException;
-    method public abstract org.apache.http.io.HttpTransportMetrics getMetrics();
-    method public abstract void write(byte[], int, int) throws java.io.IOException;
-    method public abstract void write(byte[]) throws java.io.IOException;
-    method public abstract void write(int) throws java.io.IOException;
-    method public abstract void writeLine(java.lang.String) throws java.io.IOException;
-    method public abstract void writeLine(org.apache.http.util.CharArrayBuffer) throws java.io.IOException;
+  @Deprecated public interface SessionOutputBuffer {
+    method @Deprecated public void flush() throws java.io.IOException;
+    method @Deprecated public org.apache.http.io.HttpTransportMetrics getMetrics();
+    method @Deprecated public void write(byte[], int, int) throws java.io.IOException;
+    method @Deprecated public void write(byte[]) throws java.io.IOException;
+    method @Deprecated public void write(int) throws java.io.IOException;
+    method @Deprecated public void writeLine(String) throws java.io.IOException;
+    method @Deprecated public void writeLine(org.apache.http.util.CharArrayBuffer) throws java.io.IOException;
   }
 
 }
 
 package org.apache.http.message {
 
-  public abstract deprecated class AbstractHttpMessage implements org.apache.http.HttpMessage {
-    ctor protected AbstractHttpMessage(org.apache.http.params.HttpParams);
-    ctor protected AbstractHttpMessage();
-    method public void addHeader(org.apache.http.Header);
-    method public void addHeader(java.lang.String, java.lang.String);
-    method public boolean containsHeader(java.lang.String);
-    method public org.apache.http.Header[] getAllHeaders();
-    method public org.apache.http.Header getFirstHeader(java.lang.String);
-    method public org.apache.http.Header[] getHeaders(java.lang.String);
-    method public org.apache.http.Header getLastHeader(java.lang.String);
-    method public org.apache.http.params.HttpParams getParams();
-    method public org.apache.http.HeaderIterator headerIterator();
-    method public org.apache.http.HeaderIterator headerIterator(java.lang.String);
-    method public void removeHeader(org.apache.http.Header);
-    method public void removeHeaders(java.lang.String);
-    method public void setHeader(org.apache.http.Header);
-    method public void setHeader(java.lang.String, java.lang.String);
-    method public void setHeaders(org.apache.http.Header[]);
-    method public void setParams(org.apache.http.params.HttpParams);
-    field protected org.apache.http.message.HeaderGroup headergroup;
-    field protected org.apache.http.params.HttpParams params;
-  }
-
-  public deprecated class BasicHeader implements java.lang.Cloneable org.apache.http.Header {
-    ctor public BasicHeader(java.lang.String, java.lang.String);
-    method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
-    method public org.apache.http.HeaderElement[] getElements() throws org.apache.http.ParseException;
-    method public java.lang.String getName();
-    method public java.lang.String getValue();
-  }
-
-  public deprecated class BasicHeaderElement implements java.lang.Cloneable org.apache.http.HeaderElement {
-    ctor public BasicHeaderElement(java.lang.String, java.lang.String, org.apache.http.NameValuePair[]);
-    ctor public BasicHeaderElement(java.lang.String, java.lang.String);
-    method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
-    method public java.lang.String getName();
-    method public org.apache.http.NameValuePair getParameter(int);
-    method public org.apache.http.NameValuePair getParameterByName(java.lang.String);
-    method public int getParameterCount();
-    method public org.apache.http.NameValuePair[] getParameters();
-    method public java.lang.String getValue();
-  }
-
-  public deprecated class BasicHeaderElementIterator implements org.apache.http.HeaderElementIterator {
-    ctor public BasicHeaderElementIterator(org.apache.http.HeaderIterator, org.apache.http.message.HeaderValueParser);
-    ctor public BasicHeaderElementIterator(org.apache.http.HeaderIterator);
-    method public boolean hasNext();
-    method public final java.lang.Object next() throws java.util.NoSuchElementException;
-    method public org.apache.http.HeaderElement nextElement() throws java.util.NoSuchElementException;
-    method public void remove() throws java.lang.UnsupportedOperationException;
-  }
-
-  public deprecated class BasicHeaderIterator implements org.apache.http.HeaderIterator {
-    ctor public BasicHeaderIterator(org.apache.http.Header[], java.lang.String);
-    method protected boolean filterHeader(int);
-    method protected int findNext(int);
-    method public boolean hasNext();
-    method public final java.lang.Object next() throws java.util.NoSuchElementException;
-    method public org.apache.http.Header nextHeader() throws java.util.NoSuchElementException;
-    method public void remove() throws java.lang.UnsupportedOperationException;
-    field protected final org.apache.http.Header[] allHeaders;
-    field protected int currentIndex;
-    field protected java.lang.String headerName;
-  }
-
-  public deprecated class BasicHeaderValueFormatter implements org.apache.http.message.HeaderValueFormatter {
-    ctor public BasicHeaderValueFormatter();
-    method protected void doFormatValue(org.apache.http.util.CharArrayBuffer, java.lang.String, boolean);
-    method protected int estimateElementsLen(org.apache.http.HeaderElement[]);
-    method protected int estimateHeaderElementLen(org.apache.http.HeaderElement);
-    method protected int estimateNameValuePairLen(org.apache.http.NameValuePair);
-    method protected int estimateParametersLen(org.apache.http.NameValuePair[]);
-    method public static final java.lang.String formatElements(org.apache.http.HeaderElement[], boolean, org.apache.http.message.HeaderValueFormatter);
-    method public org.apache.http.util.CharArrayBuffer formatElements(org.apache.http.util.CharArrayBuffer, org.apache.http.HeaderElement[], boolean);
-    method public static final java.lang.String formatHeaderElement(org.apache.http.HeaderElement, boolean, org.apache.http.message.HeaderValueFormatter);
-    method public org.apache.http.util.CharArrayBuffer formatHeaderElement(org.apache.http.util.CharArrayBuffer, org.apache.http.HeaderElement, boolean);
-    method public static final java.lang.String formatNameValuePair(org.apache.http.NameValuePair, boolean, org.apache.http.message.HeaderValueFormatter);
-    method public org.apache.http.util.CharArrayBuffer formatNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.NameValuePair, boolean);
-    method public static final java.lang.String formatParameters(org.apache.http.NameValuePair[], boolean, org.apache.http.message.HeaderValueFormatter);
-    method public org.apache.http.util.CharArrayBuffer formatParameters(org.apache.http.util.CharArrayBuffer, org.apache.http.NameValuePair[], boolean);
-    method protected boolean isSeparator(char);
-    method protected boolean isUnsafe(char);
-    field public static final org.apache.http.message.BasicHeaderValueFormatter DEFAULT;
-    field public static final java.lang.String SEPARATORS = " ;,:@()<>\\\"/[]?={}\t";
-    field public static final java.lang.String UNSAFE_CHARS = "\"\\";
-  }
-
-  public deprecated class BasicHeaderValueParser implements org.apache.http.message.HeaderValueParser {
-    ctor public BasicHeaderValueParser();
-    method protected org.apache.http.HeaderElement createHeaderElement(java.lang.String, java.lang.String, org.apache.http.NameValuePair[]);
-    method protected org.apache.http.NameValuePair createNameValuePair(java.lang.String, java.lang.String);
-    method public static final org.apache.http.HeaderElement[] parseElements(java.lang.String, org.apache.http.message.HeaderValueParser) throws org.apache.http.ParseException;
-    method public org.apache.http.HeaderElement[] parseElements(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor);
-    method public static final org.apache.http.HeaderElement parseHeaderElement(java.lang.String, org.apache.http.message.HeaderValueParser) throws org.apache.http.ParseException;
-    method public org.apache.http.HeaderElement parseHeaderElement(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor);
-    method public static final org.apache.http.NameValuePair parseNameValuePair(java.lang.String, org.apache.http.message.HeaderValueParser) throws org.apache.http.ParseException;
-    method public org.apache.http.NameValuePair parseNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor);
-    method public org.apache.http.NameValuePair parseNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor, char[]);
-    method public static final org.apache.http.NameValuePair[] parseParameters(java.lang.String, org.apache.http.message.HeaderValueParser) throws org.apache.http.ParseException;
-    method public org.apache.http.NameValuePair[] parseParameters(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor);
-    field public static final org.apache.http.message.BasicHeaderValueParser DEFAULT;
-  }
-
-  public deprecated class BasicHttpEntityEnclosingRequest extends org.apache.http.message.BasicHttpRequest implements org.apache.http.HttpEntityEnclosingRequest {
-    ctor public BasicHttpEntityEnclosingRequest(java.lang.String, java.lang.String);
-    ctor public BasicHttpEntityEnclosingRequest(java.lang.String, java.lang.String, org.apache.http.ProtocolVersion);
-    ctor public BasicHttpEntityEnclosingRequest(org.apache.http.RequestLine);
-    method public boolean expectContinue();
-    method public org.apache.http.HttpEntity getEntity();
-    method public void setEntity(org.apache.http.HttpEntity);
-  }
-
-  public deprecated class BasicHttpRequest extends org.apache.http.message.AbstractHttpMessage implements org.apache.http.HttpRequest {
-    ctor public BasicHttpRequest(java.lang.String, java.lang.String);
-    ctor public BasicHttpRequest(java.lang.String, java.lang.String, org.apache.http.ProtocolVersion);
-    ctor public BasicHttpRequest(org.apache.http.RequestLine);
-    method public org.apache.http.ProtocolVersion getProtocolVersion();
-    method public org.apache.http.RequestLine getRequestLine();
-  }
-
-  public deprecated class BasicHttpResponse extends org.apache.http.message.AbstractHttpMessage implements org.apache.http.HttpResponse {
-    ctor public BasicHttpResponse(org.apache.http.StatusLine, org.apache.http.ReasonPhraseCatalog, java.util.Locale);
-    ctor public BasicHttpResponse(org.apache.http.StatusLine);
-    ctor public BasicHttpResponse(org.apache.http.ProtocolVersion, int, java.lang.String);
-    method public org.apache.http.HttpEntity getEntity();
-    method public java.util.Locale getLocale();
-    method public org.apache.http.ProtocolVersion getProtocolVersion();
-    method protected java.lang.String getReason(int);
-    method public org.apache.http.StatusLine getStatusLine();
-    method public void setEntity(org.apache.http.HttpEntity);
-    method public void setLocale(java.util.Locale);
-    method public void setReasonPhrase(java.lang.String);
-    method public void setStatusCode(int);
-    method public void setStatusLine(org.apache.http.StatusLine);
-    method public void setStatusLine(org.apache.http.ProtocolVersion, int);
-    method public void setStatusLine(org.apache.http.ProtocolVersion, int, java.lang.String);
-  }
-
-  public deprecated class BasicLineFormatter implements org.apache.http.message.LineFormatter {
-    ctor public BasicLineFormatter();
-    method public org.apache.http.util.CharArrayBuffer appendProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.ProtocolVersion);
-    method protected void doFormatHeader(org.apache.http.util.CharArrayBuffer, org.apache.http.Header);
-    method protected void doFormatRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.RequestLine);
-    method protected void doFormatStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.StatusLine);
-    method protected int estimateProtocolVersionLen(org.apache.http.ProtocolVersion);
-    method public static final java.lang.String formatHeader(org.apache.http.Header, org.apache.http.message.LineFormatter);
-    method public org.apache.http.util.CharArrayBuffer formatHeader(org.apache.http.util.CharArrayBuffer, org.apache.http.Header);
-    method public static final java.lang.String formatProtocolVersion(org.apache.http.ProtocolVersion, org.apache.http.message.LineFormatter);
-    method public static final java.lang.String formatRequestLine(org.apache.http.RequestLine, org.apache.http.message.LineFormatter);
-    method public org.apache.http.util.CharArrayBuffer formatRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.RequestLine);
-    method public static final java.lang.String formatStatusLine(org.apache.http.StatusLine, org.apache.http.message.LineFormatter);
-    method public org.apache.http.util.CharArrayBuffer formatStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.StatusLine);
-    method protected org.apache.http.util.CharArrayBuffer initBuffer(org.apache.http.util.CharArrayBuffer);
-    field public static final org.apache.http.message.BasicLineFormatter DEFAULT;
-  }
-
-  public deprecated class BasicLineParser implements org.apache.http.message.LineParser {
-    ctor public BasicLineParser(org.apache.http.ProtocolVersion);
-    ctor public BasicLineParser();
-    method protected org.apache.http.ProtocolVersion createProtocolVersion(int, int);
-    method protected org.apache.http.RequestLine createRequestLine(java.lang.String, java.lang.String, org.apache.http.ProtocolVersion);
-    method protected org.apache.http.StatusLine createStatusLine(org.apache.http.ProtocolVersion, int, java.lang.String);
-    method public boolean hasProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor);
-    method public static final org.apache.http.Header parseHeader(java.lang.String, org.apache.http.message.LineParser) throws org.apache.http.ParseException;
-    method public org.apache.http.Header parseHeader(org.apache.http.util.CharArrayBuffer) throws org.apache.http.ParseException;
-    method public static final org.apache.http.ProtocolVersion parseProtocolVersion(java.lang.String, org.apache.http.message.LineParser) throws org.apache.http.ParseException;
-    method public org.apache.http.ProtocolVersion parseProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
-    method public static final org.apache.http.RequestLine parseRequestLine(java.lang.String, org.apache.http.message.LineParser) throws org.apache.http.ParseException;
-    method public org.apache.http.RequestLine parseRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
-    method public static final org.apache.http.StatusLine parseStatusLine(java.lang.String, org.apache.http.message.LineParser) throws org.apache.http.ParseException;
-    method public org.apache.http.StatusLine parseStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
-    method protected void skipWhitespace(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor);
-    field public static final org.apache.http.message.BasicLineParser DEFAULT;
-    field protected final org.apache.http.ProtocolVersion protocol;
-  }
-
-  public deprecated class BasicListHeaderIterator implements org.apache.http.HeaderIterator {
-    ctor public BasicListHeaderIterator(java.util.List, java.lang.String);
-    method protected boolean filterHeader(int);
-    method protected int findNext(int);
-    method public boolean hasNext();
-    method public final java.lang.Object next() throws java.util.NoSuchElementException;
-    method public org.apache.http.Header nextHeader() throws java.util.NoSuchElementException;
-    method public void remove() throws java.lang.UnsupportedOperationException;
-    field protected final java.util.List allHeaders;
-    field protected int currentIndex;
-    field protected java.lang.String headerName;
-    field protected int lastIndex;
-  }
-
-  public deprecated class BasicNameValuePair implements java.lang.Cloneable org.apache.http.NameValuePair {
-    ctor public BasicNameValuePair(java.lang.String, java.lang.String);
-    method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
-    method public java.lang.String getName();
-    method public java.lang.String getValue();
-  }
-
-  public deprecated class BasicRequestLine implements java.lang.Cloneable org.apache.http.RequestLine {
-    ctor public BasicRequestLine(java.lang.String, java.lang.String, org.apache.http.ProtocolVersion);
-    method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
-    method public java.lang.String getMethod();
-    method public org.apache.http.ProtocolVersion getProtocolVersion();
-    method public java.lang.String getUri();
-  }
-
-  public deprecated class BasicStatusLine implements java.lang.Cloneable org.apache.http.StatusLine {
-    ctor public BasicStatusLine(org.apache.http.ProtocolVersion, int, java.lang.String);
-    method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
-    method public org.apache.http.ProtocolVersion getProtocolVersion();
-    method public java.lang.String getReasonPhrase();
-    method public int getStatusCode();
-  }
-
-  public deprecated class BasicTokenIterator implements org.apache.http.TokenIterator {
-    ctor public BasicTokenIterator(org.apache.http.HeaderIterator);
-    method protected java.lang.String createToken(java.lang.String, int, int);
-    method protected int findNext(int) throws org.apache.http.ParseException;
-    method protected int findTokenEnd(int);
-    method protected int findTokenSeparator(int);
-    method protected int findTokenStart(int);
-    method public boolean hasNext();
-    method protected boolean isHttpSeparator(char);
-    method protected boolean isTokenChar(char);
-    method protected boolean isTokenSeparator(char);
-    method protected boolean isWhitespace(char);
-    method public final java.lang.Object next() throws java.util.NoSuchElementException, org.apache.http.ParseException;
-    method public java.lang.String nextToken() throws java.util.NoSuchElementException, org.apache.http.ParseException;
-    method public final void remove() throws java.lang.UnsupportedOperationException;
-    field public static final java.lang.String HTTP_SEPARATORS = " ,;=()<>@:\\\"/[]?{}\t";
-    field protected java.lang.String currentHeader;
-    field protected java.lang.String currentToken;
-    field protected final org.apache.http.HeaderIterator headerIt;
-    field protected int searchPos;
-  }
-
-  public deprecated class BufferedHeader implements java.lang.Cloneable org.apache.http.FormattedHeader {
-    ctor public BufferedHeader(org.apache.http.util.CharArrayBuffer) throws org.apache.http.ParseException;
-    method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
-    method public org.apache.http.util.CharArrayBuffer getBuffer();
-    method public org.apache.http.HeaderElement[] getElements() throws org.apache.http.ParseException;
-    method public java.lang.String getName();
-    method public java.lang.String getValue();
-    method public int getValuePos();
-  }
-
-  public deprecated class HeaderGroup implements java.lang.Cloneable {
-    ctor public HeaderGroup();
-    method public void addHeader(org.apache.http.Header);
-    method public void clear();
-    method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
-    method public boolean containsHeader(java.lang.String);
-    method public org.apache.http.message.HeaderGroup copy();
-    method public org.apache.http.Header[] getAllHeaders();
-    method public org.apache.http.Header getCondensedHeader(java.lang.String);
-    method public org.apache.http.Header getFirstHeader(java.lang.String);
-    method public org.apache.http.Header[] getHeaders(java.lang.String);
-    method public org.apache.http.Header getLastHeader(java.lang.String);
-    method public org.apache.http.HeaderIterator iterator();
-    method public org.apache.http.HeaderIterator iterator(java.lang.String);
-    method public void removeHeader(org.apache.http.Header);
-    method public void setHeaders(org.apache.http.Header[]);
-    method public void updateHeader(org.apache.http.Header);
-  }
-
-  public abstract deprecated interface HeaderValueFormatter {
-    method public abstract org.apache.http.util.CharArrayBuffer formatElements(org.apache.http.util.CharArrayBuffer, org.apache.http.HeaderElement[], boolean);
-    method public abstract org.apache.http.util.CharArrayBuffer formatHeaderElement(org.apache.http.util.CharArrayBuffer, org.apache.http.HeaderElement, boolean);
-    method public abstract org.apache.http.util.CharArrayBuffer formatNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.NameValuePair, boolean);
-    method public abstract org.apache.http.util.CharArrayBuffer formatParameters(org.apache.http.util.CharArrayBuffer, org.apache.http.NameValuePair[], boolean);
-  }
-
-  public abstract deprecated interface HeaderValueParser {
-    method public abstract org.apache.http.HeaderElement[] parseElements(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
-    method public abstract org.apache.http.HeaderElement parseHeaderElement(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
-    method public abstract org.apache.http.NameValuePair parseNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
-    method public abstract org.apache.http.NameValuePair[] parseParameters(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
-  }
-
-  public abstract deprecated interface LineFormatter {
-    method public abstract org.apache.http.util.CharArrayBuffer appendProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.ProtocolVersion);
-    method public abstract org.apache.http.util.CharArrayBuffer formatHeader(org.apache.http.util.CharArrayBuffer, org.apache.http.Header);
-    method public abstract org.apache.http.util.CharArrayBuffer formatRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.RequestLine);
-    method public abstract org.apache.http.util.CharArrayBuffer formatStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.StatusLine);
-  }
-
-  public abstract deprecated interface LineParser {
-    method public abstract boolean hasProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor);
-    method public abstract org.apache.http.Header parseHeader(org.apache.http.util.CharArrayBuffer) throws org.apache.http.ParseException;
-    method public abstract org.apache.http.ProtocolVersion parseProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
-    method public abstract org.apache.http.RequestLine parseRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
-    method public abstract org.apache.http.StatusLine parseStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
-  }
-
-  public deprecated class ParserCursor {
-    ctor public ParserCursor(int, int);
-    method public boolean atEnd();
-    method public int getLowerBound();
-    method public int getPos();
-    method public int getUpperBound();
-    method public void updatePos(int);
+  @Deprecated public abstract class AbstractHttpMessage implements org.apache.http.HttpMessage {
+    ctor @Deprecated protected AbstractHttpMessage(org.apache.http.params.HttpParams);
+    ctor @Deprecated protected AbstractHttpMessage();
+    method @Deprecated public void addHeader(org.apache.http.Header);
+    method @Deprecated public void addHeader(String, String);
+    method @Deprecated public boolean containsHeader(String);
+    method @Deprecated public org.apache.http.Header[] getAllHeaders();
+    method @Deprecated public org.apache.http.Header getFirstHeader(String);
+    method @Deprecated public org.apache.http.Header[] getHeaders(String);
+    method @Deprecated public org.apache.http.Header getLastHeader(String);
+    method @Deprecated public org.apache.http.params.HttpParams getParams();
+    method @Deprecated public org.apache.http.HeaderIterator headerIterator();
+    method @Deprecated public org.apache.http.HeaderIterator headerIterator(String);
+    method @Deprecated public void removeHeader(org.apache.http.Header);
+    method @Deprecated public void removeHeaders(String);
+    method @Deprecated public void setHeader(org.apache.http.Header);
+    method @Deprecated public void setHeader(String, String);
+    method @Deprecated public void setHeaders(org.apache.http.Header[]);
+    method @Deprecated public void setParams(org.apache.http.params.HttpParams);
+    field @Deprecated protected org.apache.http.message.HeaderGroup headergroup;
+    field @Deprecated protected org.apache.http.params.HttpParams params;
+  }
+
+  @Deprecated public class BasicHeader implements java.lang.Cloneable org.apache.http.Header {
+    ctor @Deprecated public BasicHeader(String, String);
+    method @Deprecated public Object clone() throws java.lang.CloneNotSupportedException;
+    method @Deprecated public org.apache.http.HeaderElement[] getElements() throws org.apache.http.ParseException;
+    method @Deprecated public String getName();
+    method @Deprecated public String getValue();
+  }
+
+  @Deprecated public class BasicHeaderElement implements java.lang.Cloneable org.apache.http.HeaderElement {
+    ctor @Deprecated public BasicHeaderElement(String, String, org.apache.http.NameValuePair[]);
+    ctor @Deprecated public BasicHeaderElement(String, String);
+    method @Deprecated public Object clone() throws java.lang.CloneNotSupportedException;
+    method @Deprecated public String getName();
+    method @Deprecated public org.apache.http.NameValuePair getParameter(int);
+    method @Deprecated public org.apache.http.NameValuePair getParameterByName(String);
+    method @Deprecated public int getParameterCount();
+    method @Deprecated public org.apache.http.NameValuePair[] getParameters();
+    method @Deprecated public String getValue();
+  }
+
+  @Deprecated public class BasicHeaderElementIterator implements org.apache.http.HeaderElementIterator {
+    ctor @Deprecated public BasicHeaderElementIterator(org.apache.http.HeaderIterator, org.apache.http.message.HeaderValueParser);
+    ctor @Deprecated public BasicHeaderElementIterator(org.apache.http.HeaderIterator);
+    method @Deprecated public boolean hasNext();
+    method @Deprecated public final Object next() throws java.util.NoSuchElementException;
+    method @Deprecated public org.apache.http.HeaderElement nextElement() throws java.util.NoSuchElementException;
+    method @Deprecated public void remove() throws java.lang.UnsupportedOperationException;
+  }
+
+  @Deprecated public class BasicHeaderIterator implements org.apache.http.HeaderIterator {
+    ctor @Deprecated public BasicHeaderIterator(org.apache.http.Header[], String);
+    method @Deprecated protected boolean filterHeader(int);
+    method @Deprecated protected int findNext(int);
+    method @Deprecated public boolean hasNext();
+    method @Deprecated public final Object next() throws java.util.NoSuchElementException;
+    method @Deprecated public org.apache.http.Header nextHeader() throws java.util.NoSuchElementException;
+    method @Deprecated public void remove() throws java.lang.UnsupportedOperationException;
+    field @Deprecated protected final org.apache.http.Header[] allHeaders;
+    field @Deprecated protected int currentIndex;
+    field @Deprecated protected String headerName;
+  }
+
+  @Deprecated public class BasicHeaderValueFormatter implements org.apache.http.message.HeaderValueFormatter {
+    ctor @Deprecated public BasicHeaderValueFormatter();
+    method @Deprecated protected void doFormatValue(org.apache.http.util.CharArrayBuffer, String, boolean);
+    method @Deprecated protected int estimateElementsLen(org.apache.http.HeaderElement[]);
+    method @Deprecated protected int estimateHeaderElementLen(org.apache.http.HeaderElement);
+    method @Deprecated protected int estimateNameValuePairLen(org.apache.http.NameValuePair);
+    method @Deprecated protected int estimateParametersLen(org.apache.http.NameValuePair[]);
+    method @Deprecated public static final String formatElements(org.apache.http.HeaderElement[], boolean, org.apache.http.message.HeaderValueFormatter);
+    method @Deprecated public org.apache.http.util.CharArrayBuffer formatElements(org.apache.http.util.CharArrayBuffer, org.apache.http.HeaderElement[], boolean);
+    method @Deprecated public static final String formatHeaderElement(org.apache.http.HeaderElement, boolean, org.apache.http.message.HeaderValueFormatter);
+    method @Deprecated public org.apache.http.util.CharArrayBuffer formatHeaderElement(org.apache.http.util.CharArrayBuffer, org.apache.http.HeaderElement, boolean);
+    method @Deprecated public static final String formatNameValuePair(org.apache.http.NameValuePair, boolean, org.apache.http.message.HeaderValueFormatter);
+    method @Deprecated public org.apache.http.util.CharArrayBuffer formatNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.NameValuePair, boolean);
+    method @Deprecated public static final String formatParameters(org.apache.http.NameValuePair[], boolean, org.apache.http.message.HeaderValueFormatter);
+    method @Deprecated public org.apache.http.util.CharArrayBuffer formatParameters(org.apache.http.util.CharArrayBuffer, org.apache.http.NameValuePair[], boolean);
+    method @Deprecated protected boolean isSeparator(char);
+    method @Deprecated protected boolean isUnsafe(char);
+    field @Deprecated public static final org.apache.http.message.BasicHeaderValueFormatter DEFAULT;
+    field @Deprecated public static final String SEPARATORS = " ;,:@()<>\\\"/[]?={}\t";
+    field @Deprecated public static final String UNSAFE_CHARS = "\"\\";
+  }
+
+  @Deprecated public class BasicHeaderValueParser implements org.apache.http.message.HeaderValueParser {
+    ctor @Deprecated public BasicHeaderValueParser();
+    method @Deprecated protected org.apache.http.HeaderElement createHeaderElement(String, String, org.apache.http.NameValuePair[]);
+    method @Deprecated protected org.apache.http.NameValuePair createNameValuePair(String, String);
+    method @Deprecated public static final org.apache.http.HeaderElement[] parseElements(String, org.apache.http.message.HeaderValueParser) throws org.apache.http.ParseException;
+    method @Deprecated public org.apache.http.HeaderElement[] parseElements(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor);
+    method @Deprecated public static final org.apache.http.HeaderElement parseHeaderElement(String, org.apache.http.message.HeaderValueParser) throws org.apache.http.ParseException;
+    method @Deprecated public org.apache.http.HeaderElement parseHeaderElement(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor);
+    method @Deprecated public static final org.apache.http.NameValuePair parseNameValuePair(String, org.apache.http.message.HeaderValueParser) throws org.apache.http.ParseException;
+    method @Deprecated public org.apache.http.NameValuePair parseNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor);
+    method @Deprecated public org.apache.http.NameValuePair parseNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor, char[]);
+    method @Deprecated public static final org.apache.http.NameValuePair[] parseParameters(String, org.apache.http.message.HeaderValueParser) throws org.apache.http.ParseException;
+    method @Deprecated public org.apache.http.NameValuePair[] parseParameters(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor);
+    field @Deprecated public static final org.apache.http.message.BasicHeaderValueParser DEFAULT;
+  }
+
+  @Deprecated public class BasicHttpEntityEnclosingRequest extends org.apache.http.message.BasicHttpRequest implements org.apache.http.HttpEntityEnclosingRequest {
+    ctor @Deprecated public BasicHttpEntityEnclosingRequest(String, String);
+    ctor @Deprecated public BasicHttpEntityEnclosingRequest(String, String, org.apache.http.ProtocolVersion);
+    ctor @Deprecated public BasicHttpEntityEnclosingRequest(org.apache.http.RequestLine);
+    method @Deprecated public boolean expectContinue();
+    method @Deprecated public org.apache.http.HttpEntity getEntity();
+    method @Deprecated public void setEntity(org.apache.http.HttpEntity);
+  }
+
+  @Deprecated public class BasicHttpRequest extends org.apache.http.message.AbstractHttpMessage implements org.apache.http.HttpRequest {
+    ctor @Deprecated public BasicHttpRequest(String, String);
+    ctor @Deprecated public BasicHttpRequest(String, String, org.apache.http.ProtocolVersion);
+    ctor @Deprecated public BasicHttpRequest(org.apache.http.RequestLine);
+    method @Deprecated public org.apache.http.ProtocolVersion getProtocolVersion();
+    method @Deprecated public org.apache.http.RequestLine getRequestLine();
+  }
+
+  @Deprecated public class BasicHttpResponse extends org.apache.http.message.AbstractHttpMessage implements org.apache.http.HttpResponse {
+    ctor @Deprecated public BasicHttpResponse(org.apache.http.StatusLine, org.apache.http.ReasonPhraseCatalog, java.util.Locale);
+    ctor @Deprecated public BasicHttpResponse(org.apache.http.StatusLine);
+    ctor @Deprecated public BasicHttpResponse(org.apache.http.ProtocolVersion, int, String);
+    method @Deprecated public org.apache.http.HttpEntity getEntity();
+    method @Deprecated public java.util.Locale getLocale();
+    method @Deprecated public org.apache.http.ProtocolVersion getProtocolVersion();
+    method @Deprecated protected String getReason(int);
+    method @Deprecated public org.apache.http.StatusLine getStatusLine();
+    method @Deprecated public void setEntity(org.apache.http.HttpEntity);
+    method @Deprecated public void setLocale(java.util.Locale);
+    method @Deprecated public void setReasonPhrase(String);
+    method @Deprecated public void setStatusCode(int);
+    method @Deprecated public void setStatusLine(org.apache.http.StatusLine);
+    method @Deprecated public void setStatusLine(org.apache.http.ProtocolVersion, int);
+    method @Deprecated public void setStatusLine(org.apache.http.ProtocolVersion, int, String);
+  }
+
+  @Deprecated public class BasicLineFormatter implements org.apache.http.message.LineFormatter {
+    ctor @Deprecated public BasicLineFormatter();
+    method @Deprecated public org.apache.http.util.CharArrayBuffer appendProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.ProtocolVersion);
+    method @Deprecated protected void doFormatHeader(org.apache.http.util.CharArrayBuffer, org.apache.http.Header);
+    method @Deprecated protected void doFormatRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.RequestLine);
+    method @Deprecated protected void doFormatStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.StatusLine);
+    method @Deprecated protected int estimateProtocolVersionLen(org.apache.http.ProtocolVersion);
+    method @Deprecated public static final String formatHeader(org.apache.http.Header, org.apache.http.message.LineFormatter);
+    method @Deprecated public org.apache.http.util.CharArrayBuffer formatHeader(org.apache.http.util.CharArrayBuffer, org.apache.http.Header);
+    method @Deprecated public static final String formatProtocolVersion(org.apache.http.ProtocolVersion, org.apache.http.message.LineFormatter);
+    method @Deprecated public static final String formatRequestLine(org.apache.http.RequestLine, org.apache.http.message.LineFormatter);
+    method @Deprecated public org.apache.http.util.CharArrayBuffer formatRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.RequestLine);
+    method @Deprecated public static final String formatStatusLine(org.apache.http.StatusLine, org.apache.http.message.LineFormatter);
+    method @Deprecated public org.apache.http.util.CharArrayBuffer formatStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.StatusLine);
+    method @Deprecated protected org.apache.http.util.CharArrayBuffer initBuffer(org.apache.http.util.CharArrayBuffer);
+    field @Deprecated public static final org.apache.http.message.BasicLineFormatter DEFAULT;
+  }
+
+  @Deprecated public class BasicLineParser implements org.apache.http.message.LineParser {
+    ctor @Deprecated public BasicLineParser(org.apache.http.ProtocolVersion);
+    ctor @Deprecated public BasicLineParser();
+    method @Deprecated protected org.apache.http.ProtocolVersion createProtocolVersion(int, int);
+    method @Deprecated protected org.apache.http.RequestLine createRequestLine(String, String, org.apache.http.ProtocolVersion);
+    method @Deprecated protected org.apache.http.StatusLine createStatusLine(org.apache.http.ProtocolVersion, int, String);
+    method @Deprecated public boolean hasProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor);
+    method @Deprecated public static final org.apache.http.Header parseHeader(String, org.apache.http.message.LineParser) throws org.apache.http.ParseException;
+    method @Deprecated public org.apache.http.Header parseHeader(org.apache.http.util.CharArrayBuffer) throws org.apache.http.ParseException;
+    method @Deprecated public static final org.apache.http.ProtocolVersion parseProtocolVersion(String, org.apache.http.message.LineParser) throws org.apache.http.ParseException;
+    method @Deprecated public org.apache.http.ProtocolVersion parseProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
+    method @Deprecated public static final org.apache.http.RequestLine parseRequestLine(String, org.apache.http.message.LineParser) throws org.apache.http.ParseException;
+    method @Deprecated public org.apache.http.RequestLine parseRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
+    method @Deprecated public static final org.apache.http.StatusLine parseStatusLine(String, org.apache.http.message.LineParser) throws org.apache.http.ParseException;
+    method @Deprecated public org.apache.http.StatusLine parseStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
+    method @Deprecated protected void skipWhitespace(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor);
+    field @Deprecated public static final org.apache.http.message.BasicLineParser DEFAULT;
+    field @Deprecated protected final org.apache.http.ProtocolVersion protocol;
+  }
+
+  @Deprecated public class BasicListHeaderIterator implements org.apache.http.HeaderIterator {
+    ctor @Deprecated public BasicListHeaderIterator(java.util.List, String);
+    method @Deprecated protected boolean filterHeader(int);
+    method @Deprecated protected int findNext(int);
+    method @Deprecated public boolean hasNext();
+    method @Deprecated public final Object next() throws java.util.NoSuchElementException;
+    method @Deprecated public org.apache.http.Header nextHeader() throws java.util.NoSuchElementException;
+    method @Deprecated public void remove() throws java.lang.UnsupportedOperationException;
+    field @Deprecated protected final java.util.List allHeaders;
+    field @Deprecated protected int currentIndex;
+    field @Deprecated protected String headerName;
+    field @Deprecated protected int lastIndex;
+  }
+
+  @Deprecated public class BasicNameValuePair implements java.lang.Cloneable org.apache.http.NameValuePair {
+    ctor @Deprecated public BasicNameValuePair(String, String);
+    method @Deprecated public Object clone() throws java.lang.CloneNotSupportedException;
+    method @Deprecated public String getName();
+    method @Deprecated public String getValue();
+  }
+
+  @Deprecated public class BasicRequestLine implements java.lang.Cloneable org.apache.http.RequestLine {
+    ctor @Deprecated public BasicRequestLine(String, String, org.apache.http.ProtocolVersion);
+    method @Deprecated public Object clone() throws java.lang.CloneNotSupportedException;
+    method @Deprecated public String getMethod();
+    method @Deprecated public org.apache.http.ProtocolVersion getProtocolVersion();
+    method @Deprecated public String getUri();
+  }
+
+  @Deprecated public class BasicStatusLine implements java.lang.Cloneable org.apache.http.StatusLine {
+    ctor @Deprecated public BasicStatusLine(org.apache.http.ProtocolVersion, int, String);
+    method @Deprecated public Object clone() throws java.lang.CloneNotSupportedException;
+    method @Deprecated public org.apache.http.ProtocolVersion getProtocolVersion();
+    method @Deprecated public String getReasonPhrase();
+    method @Deprecated public int getStatusCode();
+  }
+
+  @Deprecated public class BasicTokenIterator implements org.apache.http.TokenIterator {
+    ctor @Deprecated public BasicTokenIterator(org.apache.http.HeaderIterator);
+    method @Deprecated protected String createToken(String, int, int);
+    method @Deprecated protected int findNext(int) throws org.apache.http.ParseException;
+    method @Deprecated protected int findTokenEnd(int);
+    method @Deprecated protected int findTokenSeparator(int);
+    method @Deprecated protected int findTokenStart(int);
+    method @Deprecated public boolean hasNext();
+    method @Deprecated protected boolean isHttpSeparator(char);
+    method @Deprecated protected boolean isTokenChar(char);
+    method @Deprecated protected boolean isTokenSeparator(char);
+    method @Deprecated protected boolean isWhitespace(char);
+    method @Deprecated public final Object next() throws java.util.NoSuchElementException, org.apache.http.ParseException;
+    method @Deprecated public String nextToken() throws java.util.NoSuchElementException, org.apache.http.ParseException;
+    method @Deprecated public final void remove() throws java.lang.UnsupportedOperationException;
+    field @Deprecated public static final String HTTP_SEPARATORS = " ,;=()<>@:\\\"/[]?{}\t";
+    field @Deprecated protected String currentHeader;
+    field @Deprecated protected String currentToken;
+    field @Deprecated protected final org.apache.http.HeaderIterator headerIt;
+    field @Deprecated protected int searchPos;
+  }
+
+  @Deprecated public class BufferedHeader implements java.lang.Cloneable org.apache.http.FormattedHeader {
+    ctor @Deprecated public BufferedHeader(org.apache.http.util.CharArrayBuffer) throws org.apache.http.ParseException;
+    method @Deprecated public Object clone() throws java.lang.CloneNotSupportedException;
+    method @Deprecated public org.apache.http.util.CharArrayBuffer getBuffer();
+    method @Deprecated public org.apache.http.HeaderElement[] getElements() throws org.apache.http.ParseException;
+    method @Deprecated public String getName();
+    method @Deprecated public String getValue();
+    method @Deprecated public int getValuePos();
+  }
+
+  @Deprecated public class HeaderGroup implements java.lang.Cloneable {
+    ctor @Deprecated public HeaderGroup();
+    method @Deprecated public void addHeader(org.apache.http.Header);
+    method @Deprecated public void clear();
+    method @Deprecated public Object clone() throws java.lang.CloneNotSupportedException;
+    method @Deprecated public boolean containsHeader(String);
+    method @Deprecated public org.apache.http.message.HeaderGroup copy();
+    method @Deprecated public org.apache.http.Header[] getAllHeaders();
+    method @Deprecated public org.apache.http.Header getCondensedHeader(String);
+    method @Deprecated public org.apache.http.Header getFirstHeader(String);
+    method @Deprecated public org.apache.http.Header[] getHeaders(String);
+    method @Deprecated public org.apache.http.Header getLastHeader(String);
+    method @Deprecated public org.apache.http.HeaderIterator iterator();
+    method @Deprecated public org.apache.http.HeaderIterator iterator(String);
+    method @Deprecated public void removeHeader(org.apache.http.Header);
+    method @Deprecated public void setHeaders(org.apache.http.Header[]);
+    method @Deprecated public void updateHeader(org.apache.http.Header);
+  }
+
+  @Deprecated public interface HeaderValueFormatter {
+    method @Deprecated public org.apache.http.util.CharArrayBuffer formatElements(org.apache.http.util.CharArrayBuffer, org.apache.http.HeaderElement[], boolean);
+    method @Deprecated public org.apache.http.util.CharArrayBuffer formatHeaderElement(org.apache.http.util.CharArrayBuffer, org.apache.http.HeaderElement, boolean);
+    method @Deprecated public org.apache.http.util.CharArrayBuffer formatNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.NameValuePair, boolean);
+    method @Deprecated public org.apache.http.util.CharArrayBuffer formatParameters(org.apache.http.util.CharArrayBuffer, org.apache.http.NameValuePair[], boolean);
+  }
+
+  @Deprecated public interface HeaderValueParser {
+    method @Deprecated public org.apache.http.HeaderElement[] parseElements(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
+    method @Deprecated public org.apache.http.HeaderElement parseHeaderElement(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
+    method @Deprecated public org.apache.http.NameValuePair parseNameValuePair(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
+    method @Deprecated public org.apache.http.NameValuePair[] parseParameters(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
+  }
+
+  @Deprecated public interface LineFormatter {
+    method @Deprecated public org.apache.http.util.CharArrayBuffer appendProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.ProtocolVersion);
+    method @Deprecated public org.apache.http.util.CharArrayBuffer formatHeader(org.apache.http.util.CharArrayBuffer, org.apache.http.Header);
+    method @Deprecated public org.apache.http.util.CharArrayBuffer formatRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.RequestLine);
+    method @Deprecated public org.apache.http.util.CharArrayBuffer formatStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.StatusLine);
+  }
+
+  @Deprecated public interface LineParser {
+    method @Deprecated public boolean hasProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor);
+    method @Deprecated public org.apache.http.Header parseHeader(org.apache.http.util.CharArrayBuffer) throws org.apache.http.ParseException;
+    method @Deprecated public org.apache.http.ProtocolVersion parseProtocolVersion(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
+    method @Deprecated public org.apache.http.RequestLine parseRequestLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
+    method @Deprecated public org.apache.http.StatusLine parseStatusLine(org.apache.http.util.CharArrayBuffer, org.apache.http.message.ParserCursor) throws org.apache.http.ParseException;
+  }
+
+  @Deprecated public class ParserCursor {
+    ctor @Deprecated public ParserCursor(int, int);
+    method @Deprecated public boolean atEnd();
+    method @Deprecated public int getLowerBound();
+    method @Deprecated public int getPos();
+    method @Deprecated public int getUpperBound();
+    method @Deprecated public void updatePos(int);
   }
 
 }
 
 package org.apache.http.params {
 
-  public abstract deprecated class AbstractHttpParams implements org.apache.http.params.HttpParams {
-    ctor protected AbstractHttpParams();
-    method public boolean getBooleanParameter(java.lang.String, boolean);
-    method public double getDoubleParameter(java.lang.String, double);
-    method public int getIntParameter(java.lang.String, int);
-    method public long getLongParameter(java.lang.String, long);
-    method public boolean isParameterFalse(java.lang.String);
-    method public boolean isParameterTrue(java.lang.String);
-    method public org.apache.http.params.HttpParams setBooleanParameter(java.lang.String, boolean);
-    method public org.apache.http.params.HttpParams setDoubleParameter(java.lang.String, double);
-    method public org.apache.http.params.HttpParams setIntParameter(java.lang.String, int);
-    method public org.apache.http.params.HttpParams setLongParameter(java.lang.String, long);
-  }
-
-  public final deprecated class BasicHttpParams extends org.apache.http.params.AbstractHttpParams implements java.lang.Cloneable java.io.Serializable {
-    ctor public BasicHttpParams();
-    method public void clear();
-    method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
-    method public org.apache.http.params.HttpParams copy();
-    method protected void copyParams(org.apache.http.params.HttpParams);
-    method public java.lang.Object getParameter(java.lang.String);
-    method public boolean isParameterSet(java.lang.String);
-    method public boolean isParameterSetLocally(java.lang.String);
-    method public boolean removeParameter(java.lang.String);
-    method public org.apache.http.params.HttpParams setParameter(java.lang.String, java.lang.Object);
-    method public void setParameters(java.lang.String[], java.lang.Object);
-  }
-
-  public abstract deprecated interface CoreConnectionPNames {
-    field public static final java.lang.String CONNECTION_TIMEOUT = "http.connection.timeout";
-    field public static final java.lang.String MAX_HEADER_COUNT = "http.connection.max-header-count";
-    field public static final java.lang.String MAX_LINE_LENGTH = "http.connection.max-line-length";
-    field public static final java.lang.String SOCKET_BUFFER_SIZE = "http.socket.buffer-size";
-    field public static final java.lang.String SO_LINGER = "http.socket.linger";
-    field public static final java.lang.String SO_TIMEOUT = "http.socket.timeout";
-    field public static final java.lang.String STALE_CONNECTION_CHECK = "http.connection.stalecheck";
-    field public static final java.lang.String TCP_NODELAY = "http.tcp.nodelay";
-  }
-
-  public abstract deprecated interface CoreProtocolPNames {
-    field public static final java.lang.String HTTP_CONTENT_CHARSET = "http.protocol.content-charset";
-    field public static final java.lang.String HTTP_ELEMENT_CHARSET = "http.protocol.element-charset";
-    field public static final java.lang.String ORIGIN_SERVER = "http.origin-server";
-    field public static final java.lang.String PROTOCOL_VERSION = "http.protocol.version";
-    field public static final java.lang.String STRICT_TRANSFER_ENCODING = "http.protocol.strict-transfer-encoding";
-    field public static final java.lang.String USER_AGENT = "http.useragent";
-    field public static final java.lang.String USE_EXPECT_CONTINUE = "http.protocol.expect-continue";
-    field public static final java.lang.String WAIT_FOR_CONTINUE = "http.protocol.wait-for-continue";
-  }
-
-  public final deprecated class DefaultedHttpParams extends org.apache.http.params.AbstractHttpParams {
-    ctor public DefaultedHttpParams(org.apache.http.params.HttpParams, org.apache.http.params.HttpParams);
-    method public org.apache.http.params.HttpParams copy();
-    method public org.apache.http.params.HttpParams getDefaults();
-    method public java.lang.Object getParameter(java.lang.String);
-    method public boolean removeParameter(java.lang.String);
-    method public org.apache.http.params.HttpParams setParameter(java.lang.String, java.lang.Object);
-  }
-
-  public abstract deprecated class HttpAbstractParamBean {
-    ctor public HttpAbstractParamBean(org.apache.http.params.HttpParams);
-    field protected final org.apache.http.params.HttpParams params;
-  }
-
-  public deprecated class HttpConnectionParamBean extends org.apache.http.params.HttpAbstractParamBean {
-    ctor public HttpConnectionParamBean(org.apache.http.params.HttpParams);
-    method public void setConnectionTimeout(int);
-    method public void setLinger(int);
-    method public void setSoTimeout(int);
-    method public void setSocketBufferSize(int);
-    method public void setStaleCheckingEnabled(boolean);
-    method public void setTcpNoDelay(boolean);
-  }
-
-  public final deprecated class HttpConnectionParams implements org.apache.http.params.CoreConnectionPNames {
-    method public static int getConnectionTimeout(org.apache.http.params.HttpParams);
-    method public static int getLinger(org.apache.http.params.HttpParams);
-    method public static int getSoTimeout(org.apache.http.params.HttpParams);
-    method public static int getSocketBufferSize(org.apache.http.params.HttpParams);
-    method public static boolean getTcpNoDelay(org.apache.http.params.HttpParams);
-    method public static boolean isStaleCheckingEnabled(org.apache.http.params.HttpParams);
-    method public static void setConnectionTimeout(org.apache.http.params.HttpParams, int);
-    method public static void setLinger(org.apache.http.params.HttpParams, int);
-    method public static void setSoTimeout(org.apache.http.params.HttpParams, int);
-    method public static void setSocketBufferSize(org.apache.http.params.HttpParams, int);
-    method public static void setStaleCheckingEnabled(org.apache.http.params.HttpParams, boolean);
-    method public static void setTcpNoDelay(org.apache.http.params.HttpParams, boolean);
-  }
-
-  public abstract deprecated interface HttpParams {
-    method public abstract org.apache.http.params.HttpParams copy();
-    method public abstract boolean getBooleanParameter(java.lang.String, boolean);
-    method public abstract double getDoubleParameter(java.lang.String, double);
-    method public abstract int getIntParameter(java.lang.String, int);
-    method public abstract long getLongParameter(java.lang.String, long);
-    method public abstract java.lang.Object getParameter(java.lang.String);
-    method public abstract boolean isParameterFalse(java.lang.String);
-    method public abstract boolean isParameterTrue(java.lang.String);
-    method public abstract boolean removeParameter(java.lang.String);
-    method public abstract org.apache.http.params.HttpParams setBooleanParameter(java.lang.String, boolean);
-    method public abstract org.apache.http.params.HttpParams setDoubleParameter(java.lang.String, double);
-    method public abstract org.apache.http.params.HttpParams setIntParameter(java.lang.String, int);
-    method public abstract org.apache.http.params.HttpParams setLongParameter(java.lang.String, long);
-    method public abstract org.apache.http.params.HttpParams setParameter(java.lang.String, java.lang.Object);
-  }
-
-  public deprecated class HttpProtocolParamBean extends org.apache.http.params.HttpAbstractParamBean {
-    ctor public HttpProtocolParamBean(org.apache.http.params.HttpParams);
-    method public void setContentCharset(java.lang.String);
-    method public void setHttpElementCharset(java.lang.String);
-    method public void setUseExpectContinue(boolean);
-    method public void setUserAgent(java.lang.String);
-    method public void setVersion(org.apache.http.HttpVersion);
-  }
-
-  public final deprecated class HttpProtocolParams implements org.apache.http.params.CoreProtocolPNames {
-    method public static java.lang.String getContentCharset(org.apache.http.params.HttpParams);
-    method public static java.lang.String getHttpElementCharset(org.apache.http.params.HttpParams);
-    method public static java.lang.String getUserAgent(org.apache.http.params.HttpParams);
-    method public static org.apache.http.ProtocolVersion getVersion(org.apache.http.params.HttpParams);
-    method public static void setContentCharset(org.apache.http.params.HttpParams, java.lang.String);
-    method public static void setHttpElementCharset(org.apache.http.params.HttpParams, java.lang.String);
-    method public static void setUseExpectContinue(org.apache.http.params.HttpParams, boolean);
-    method public static void setUserAgent(org.apache.http.params.HttpParams, java.lang.String);
-    method public static void setVersion(org.apache.http.params.HttpParams, org.apache.http.ProtocolVersion);
-    method public static boolean useExpectContinue(org.apache.http.params.HttpParams);
+  @Deprecated public abstract class AbstractHttpParams implements org.apache.http.params.HttpParams {
+    ctor @Deprecated protected AbstractHttpParams();
+    method @Deprecated public boolean getBooleanParameter(String, boolean);
+    method @Deprecated public double getDoubleParameter(String, double);
+    method @Deprecated public int getIntParameter(String, int);
+    method @Deprecated public long getLongParameter(String, long);
+    method @Deprecated public boolean isParameterFalse(String);
+    method @Deprecated public boolean isParameterTrue(String);
+    method @Deprecated public org.apache.http.params.HttpParams setBooleanParameter(String, boolean);
+    method @Deprecated public org.apache.http.params.HttpParams setDoubleParameter(String, double);
+    method @Deprecated public org.apache.http.params.HttpParams setIntParameter(String, int);
+    method @Deprecated public org.apache.http.params.HttpParams setLongParameter(String, long);
+  }
+
+  @Deprecated public final class BasicHttpParams extends org.apache.http.params.AbstractHttpParams implements java.lang.Cloneable java.io.Serializable {
+    ctor @Deprecated public BasicHttpParams();
+    method @Deprecated public void clear();
+    method @Deprecated public Object clone() throws java.lang.CloneNotSupportedException;
+    method @Deprecated public org.apache.http.params.HttpParams copy();
+    method @Deprecated protected void copyParams(org.apache.http.params.HttpParams);
+    method @Deprecated public Object getParameter(String);
+    method @Deprecated public boolean isParameterSet(String);
+    method @Deprecated public boolean isParameterSetLocally(String);
+    method @Deprecated public boolean removeParameter(String);
+    method @Deprecated public org.apache.http.params.HttpParams setParameter(String, Object);
+    method @Deprecated public void setParameters(String[], Object);
+  }
+
+  @Deprecated public interface CoreConnectionPNames {
+    field @Deprecated public static final String CONNECTION_TIMEOUT = "http.connection.timeout";
+    field @Deprecated public static final String MAX_HEADER_COUNT = "http.connection.max-header-count";
+    field @Deprecated public static final String MAX_LINE_LENGTH = "http.connection.max-line-length";
+    field @Deprecated public static final String SOCKET_BUFFER_SIZE = "http.socket.buffer-size";
+    field @Deprecated public static final String SO_LINGER = "http.socket.linger";
+    field @Deprecated public static final String SO_TIMEOUT = "http.socket.timeout";
+    field @Deprecated public static final String STALE_CONNECTION_CHECK = "http.connection.stalecheck";
+    field @Deprecated public static final String TCP_NODELAY = "http.tcp.nodelay";
+  }
+
+  @Deprecated public interface CoreProtocolPNames {
+    field @Deprecated public static final String HTTP_CONTENT_CHARSET = "http.protocol.content-charset";
+    field @Deprecated public static final String HTTP_ELEMENT_CHARSET = "http.protocol.element-charset";
+    field @Deprecated public static final String ORIGIN_SERVER = "http.origin-server";
+    field @Deprecated public static final String PROTOCOL_VERSION = "http.protocol.version";
+    field @Deprecated public static final String STRICT_TRANSFER_ENCODING = "http.protocol.strict-transfer-encoding";
+    field @Deprecated public static final String USER_AGENT = "http.useragent";
+    field @Deprecated public static final String USE_EXPECT_CONTINUE = "http.protocol.expect-continue";
+    field @Deprecated public static final String WAIT_FOR_CONTINUE = "http.protocol.wait-for-continue";
+  }
+
+  @Deprecated public final class DefaultedHttpParams extends org.apache.http.params.AbstractHttpParams {
+    ctor @Deprecated public DefaultedHttpParams(org.apache.http.params.HttpParams, org.apache.http.params.HttpParams);
+    method @Deprecated public org.apache.http.params.HttpParams copy();
+    method @Deprecated public org.apache.http.params.HttpParams getDefaults();
+    method @Deprecated public Object getParameter(String);
+    method @Deprecated public boolean removeParameter(String);
+    method @Deprecated public org.apache.http.params.HttpParams setParameter(String, Object);
+  }
+
+  @Deprecated public abstract class HttpAbstractParamBean {
+    ctor @Deprecated public HttpAbstractParamBean(org.apache.http.params.HttpParams);
+    field @Deprecated protected final org.apache.http.params.HttpParams params;
+  }
+
+  @Deprecated public class HttpConnectionParamBean extends org.apache.http.params.HttpAbstractParamBean {
+    ctor @Deprecated public HttpConnectionParamBean(org.apache.http.params.HttpParams);
+    method @Deprecated public void setConnectionTimeout(int);
+    method @Deprecated public void setLinger(int);
+    method @Deprecated public void setSoTimeout(int);
+    method @Deprecated public void setSocketBufferSize(int);
+    method @Deprecated public void setStaleCheckingEnabled(boolean);
+    method @Deprecated public void setTcpNoDelay(boolean);
+  }
+
+  @Deprecated public final class HttpConnectionParams implements org.apache.http.params.CoreConnectionPNames {
+    method @Deprecated public static int getConnectionTimeout(org.apache.http.params.HttpParams);
+    method @Deprecated public static int getLinger(org.apache.http.params.HttpParams);
+    method @Deprecated public static int getSoTimeout(org.apache.http.params.HttpParams);
+    method @Deprecated public static int getSocketBufferSize(org.apache.http.params.HttpParams);
+    method @Deprecated public static boolean getTcpNoDelay(org.apache.http.params.HttpParams);
+    method @Deprecated public static boolean isStaleCheckingEnabled(org.apache.http.params.HttpParams);
+    method @Deprecated public static void setConnectionTimeout(org.apache.http.params.HttpParams, int);
+    method @Deprecated public static void setLinger(org.apache.http.params.HttpParams, int);
+    method @Deprecated public static void setSoTimeout(org.apache.http.params.HttpParams, int);
+    method @Deprecated public static void setSocketBufferSize(org.apache.http.params.HttpParams, int);
+    method @Deprecated public static void setStaleCheckingEnabled(org.apache.http.params.HttpParams, boolean);
+    method @Deprecated public static void setTcpNoDelay(org.apache.http.params.HttpParams, boolean);
+  }
+
+  @Deprecated public interface HttpParams {
+    method @Deprecated public org.apache.http.params.HttpParams copy();
+    method @Deprecated public boolean getBooleanParameter(String, boolean);
+    method @Deprecated public double getDoubleParameter(String, double);
+    method @Deprecated public int getIntParameter(String, int);
+    method @Deprecated public long getLongParameter(String, long);
+    method @Deprecated public Object getParameter(String);
+    method @Deprecated public boolean isParameterFalse(String);
+    method @Deprecated public boolean isParameterTrue(String);
+    method @Deprecated public boolean removeParameter(String);
+    method @Deprecated public org.apache.http.params.HttpParams setBooleanParameter(String, boolean);
+    method @Deprecated public org.apache.http.params.HttpParams setDoubleParameter(String, double);
+    method @Deprecated public org.apache.http.params.HttpParams setIntParameter(String, int);
+    method @Deprecated public org.apache.http.params.HttpParams setLongParameter(String, long);
+    method @Deprecated public org.apache.http.params.HttpParams setParameter(String, Object);
+  }
+
+  @Deprecated public class HttpProtocolParamBean extends org.apache.http.params.HttpAbstractParamBean {
+    ctor @Deprecated public HttpProtocolParamBean(org.apache.http.params.HttpParams);
+    method @Deprecated public void setContentCharset(String);
+    method @Deprecated public void setHttpElementCharset(String);
+    method @Deprecated public void setUseExpectContinue(boolean);
+    method @Deprecated public void setUserAgent(String);
+    method @Deprecated public void setVersion(org.apache.http.HttpVersion);
+  }
+
+  @Deprecated public final class HttpProtocolParams implements org.apache.http.params.CoreProtocolPNames {
+    method @Deprecated public static String getContentCharset(org.apache.http.params.HttpParams);
+    method @Deprecated public static String getHttpElementCharset(org.apache.http.params.HttpParams);
+    method @Deprecated public static String getUserAgent(org.apache.http.params.HttpParams);
+    method @Deprecated public static org.apache.http.ProtocolVersion getVersion(org.apache.http.params.HttpParams);
+    method @Deprecated public static void setContentCharset(org.apache.http.params.HttpParams, String);
+    method @Deprecated public static void setHttpElementCharset(org.apache.http.params.HttpParams, String);
+    method @Deprecated public static void setUseExpectContinue(org.apache.http.params.HttpParams, boolean);
+    method @Deprecated public static void setUserAgent(org.apache.http.params.HttpParams, String);
+    method @Deprecated public static void setVersion(org.apache.http.params.HttpParams, org.apache.http.ProtocolVersion);
+    method @Deprecated public static boolean useExpectContinue(org.apache.http.params.HttpParams);
   }
 
 }
 
 package org.apache.http.protocol {
 
-  public deprecated class BasicHttpContext implements org.apache.http.protocol.HttpContext {
-    ctor public BasicHttpContext();
-    ctor public BasicHttpContext(org.apache.http.protocol.HttpContext);
-    method public java.lang.Object getAttribute(java.lang.String);
-    method public java.lang.Object removeAttribute(java.lang.String);
-    method public void setAttribute(java.lang.String, java.lang.Object);
-  }
-
-  public final deprecated class BasicHttpProcessor implements java.lang.Cloneable org.apache.http.protocol.HttpProcessor org.apache.http.protocol.HttpRequestInterceptorList org.apache.http.protocol.HttpResponseInterceptorList {
-    ctor public BasicHttpProcessor();
-    method public void addInterceptor(org.apache.http.HttpRequestInterceptor);
-    method public void addInterceptor(org.apache.http.HttpRequestInterceptor, int);
-    method public void addInterceptor(org.apache.http.HttpResponseInterceptor);
-    method public void addInterceptor(org.apache.http.HttpResponseInterceptor, int);
-    method public void addRequestInterceptor(org.apache.http.HttpRequestInterceptor);
-    method public void addRequestInterceptor(org.apache.http.HttpRequestInterceptor, int);
-    method public void addResponseInterceptor(org.apache.http.HttpResponseInterceptor, int);
-    method public void addResponseInterceptor(org.apache.http.HttpResponseInterceptor);
-    method public void clearInterceptors();
-    method public void clearRequestInterceptors();
-    method public void clearResponseInterceptors();
-    method public java.lang.Object clone() throws java.lang.CloneNotSupportedException;
-    method public org.apache.http.protocol.BasicHttpProcessor copy();
-    method protected void copyInterceptors(org.apache.http.protocol.BasicHttpProcessor);
-    method public org.apache.http.HttpRequestInterceptor getRequestInterceptor(int);
-    method public int getRequestInterceptorCount();
-    method public org.apache.http.HttpResponseInterceptor getResponseInterceptor(int);
-    method public int getResponseInterceptorCount();
-    method public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
-    method public void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
-    method public void removeRequestInterceptorByClass(java.lang.Class);
-    method public void removeResponseInterceptorByClass(java.lang.Class);
-    method public void setInterceptors(java.util.List);
-    field protected java.util.List requestInterceptors;
-    field protected java.util.List responseInterceptors;
-  }
-
-  public final deprecated class DefaultedHttpContext implements org.apache.http.protocol.HttpContext {
-    ctor public DefaultedHttpContext(org.apache.http.protocol.HttpContext, org.apache.http.protocol.HttpContext);
-    method public java.lang.Object getAttribute(java.lang.String);
-    method public org.apache.http.protocol.HttpContext getDefaults();
-    method public java.lang.Object removeAttribute(java.lang.String);
-    method public void setAttribute(java.lang.String, java.lang.Object);
-  }
-
-  public abstract deprecated interface ExecutionContext {
-    field public static final java.lang.String HTTP_CONNECTION = "http.connection";
-    field public static final java.lang.String HTTP_PROXY_HOST = "http.proxy_host";
-    field public static final java.lang.String HTTP_REQUEST = "http.request";
-    field public static final java.lang.String HTTP_REQ_SENT = "http.request_sent";
-    field public static final java.lang.String HTTP_RESPONSE = "http.response";
-    field public static final java.lang.String HTTP_TARGET_HOST = "http.target_host";
-  }
-
-  public final deprecated class HTTP {
-    method public static boolean isWhitespace(char);
-    field public static final java.lang.String ASCII = "ASCII";
-    field public static final java.lang.String CHARSET_PARAM = "; charset=";
-    field public static final java.lang.String CHUNK_CODING = "chunked";
-    field public static final java.lang.String CONN_CLOSE = "Close";
-    field public static final java.lang.String CONN_DIRECTIVE = "Connection";
-    field public static final java.lang.String CONN_KEEP_ALIVE = "Keep-Alive";
-    field public static final java.lang.String CONTENT_ENCODING = "Content-Encoding";
-    field public static final java.lang.String CONTENT_LEN = "Content-Length";
-    field public static final java.lang.String CONTENT_TYPE = "Content-Type";
-    field public static final int CR = 13; // 0xd
-    field public static final java.lang.String DATE_HEADER = "Date";
-    field public static final java.lang.String DEFAULT_CONTENT_CHARSET = "ISO-8859-1";
-    field public static final java.lang.String DEFAULT_CONTENT_TYPE = "application/octet-stream";
-    field public static final java.lang.String DEFAULT_PROTOCOL_CHARSET = "US-ASCII";
-    field public static final java.lang.String EXPECT_CONTINUE = "100-continue";
-    field public static final java.lang.String EXPECT_DIRECTIVE = "Expect";
-    field public static final int HT = 9; // 0x9
-    field public static final java.lang.String IDENTITY_CODING = "identity";
-    field public static final java.lang.String ISO_8859_1 = "ISO-8859-1";
-    field public static final int LF = 10; // 0xa
-    field public static final java.lang.String OCTET_STREAM_TYPE = "application/octet-stream";
-    field public static final java.lang.String PLAIN_TEXT_TYPE = "text/plain";
-    field public static final java.lang.String SERVER_HEADER = "Server";
-    field public static final int SP = 32; // 0x20
-    field public static final java.lang.String TARGET_HOST = "Host";
-    field public static final java.lang.String TRANSFER_ENCODING = "Transfer-Encoding";
-    field public static final java.lang.String USER_AGENT = "User-Agent";
-    field public static final java.lang.String US_ASCII = "US-ASCII";
-    field public static final java.lang.String UTF_16 = "UTF-16";
-    field public static final java.lang.String UTF_8 = "UTF-8";
-  }
-
-  public abstract deprecated interface HttpContext {
-    method public abstract java.lang.Object getAttribute(java.lang.String);
-    method public abstract java.lang.Object removeAttribute(java.lang.String);
-    method public abstract void setAttribute(java.lang.String, java.lang.Object);
-    field public static final java.lang.String RESERVED_PREFIX = "http.";
-  }
-
-  public deprecated class HttpDateGenerator {
-    ctor public HttpDateGenerator();
-    method public synchronized java.lang.String getCurrentDate();
-    field public static final java.util.TimeZone GMT;
-    field public static final java.lang.String PATTERN_RFC1123 = "EEE, dd MMM yyyy HH:mm:ss zzz";
-  }
-
-  public abstract deprecated interface HttpExpectationVerifier {
-    method public abstract void verify(org.apache.http.HttpRequest, org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException;
-  }
-
-  public abstract deprecated interface HttpProcessor implements org.apache.http.HttpRequestInterceptor org.apache.http.HttpResponseInterceptor {
-  }
-
-  public deprecated class HttpRequestExecutor {
-    ctor public HttpRequestExecutor();
-    method protected boolean canResponseHaveBody(org.apache.http.HttpRequest, org.apache.http.HttpResponse);
-    method protected org.apache.http.HttpResponse doReceiveResponse(org.apache.http.HttpRequest, org.apache.http.HttpClientConnection, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
-    method protected org.apache.http.HttpResponse doSendRequest(org.apache.http.HttpRequest, org.apache.http.HttpClientConnection, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
-    method public org.apache.http.HttpResponse execute(org.apache.http.HttpRequest, org.apache.http.HttpClientConnection, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
-    method public void postProcess(org.apache.http.HttpResponse, org.apache.http.protocol.HttpProcessor, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
-    method public void preProcess(org.apache.http.HttpRequest, org.apache.http.protocol.HttpProcessor, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
-  }
-
-  public abstract deprecated interface HttpRequestHandler {
-    method public abstract void handle(org.apache.http.HttpRequest, org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
-  }
-
-  public deprecated class HttpRequestHandlerRegistry implements org.apache.http.protocol.HttpRequestHandlerResolver {
-    ctor public HttpRequestHandlerRegistry();
-    method public org.apache.http.protocol.HttpRequestHandler lookup(java.lang.String);
-    method protected deprecated boolean matchUriRequestPattern(java.lang.String, java.lang.String);
-    method public void register(java.lang.String, org.apache.http.protocol.HttpRequestHandler);
-    method public void setHandlers(java.util.Map);
-    method public void unregister(java.lang.String);
-  }
-
-  public abstract deprecated interface HttpRequestHandlerResolver {
-    method public abstract org.apache.http.protocol.HttpRequestHandler lookup(java.lang.String);
-  }
-
-  public abstract deprecated interface HttpRequestInterceptorList {
-    method public abstract void addRequestInterceptor(org.apache.http.HttpRequestInterceptor);
-    method public abstract void addRequestInterceptor(org.apache.http.HttpRequestInterceptor, int);
-    method public abstract void clearRequestInterceptors();
-    method public abstract org.apache.http.HttpRequestInterceptor getRequestInterceptor(int);
-    method public abstract int getRequestInterceptorCount();
-    method public abstract void removeRequestInterceptorByClass(java.lang.Class);
-    method public abstract void setInterceptors(java.util.List);
-  }
-
-  public abstract deprecated interface HttpResponseInterceptorList {
-    method public abstract void addResponseInterceptor(org.apache.http.HttpResponseInterceptor);
-    method public abstract void addResponseInterceptor(org.apache.http.HttpResponseInterceptor, int);
-    method public abstract void clearResponseInterceptors();
-    method public abstract org.apache.http.HttpResponseInterceptor getResponseInterceptor(int);
-    method public abstract int getResponseInterceptorCount();
-    method public abstract void removeResponseInterceptorByClass(java.lang.Class);
-    method public abstract void setInterceptors(java.util.List);
-  }
-
-  public deprecated class HttpService {
-    ctor public HttpService(org.apache.http.protocol.HttpProcessor, org.apache.http.ConnectionReuseStrategy, org.apache.http.HttpResponseFactory);
-    method protected void doService(org.apache.http.HttpRequest, org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
-    method public org.apache.http.params.HttpParams getParams();
-    method protected void handleException(org.apache.http.HttpException, org.apache.http.HttpResponse);
-    method public void handleRequest(org.apache.http.HttpServerConnection, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
-    method public void setConnReuseStrategy(org.apache.http.ConnectionReuseStrategy);
-    method public void setExpectationVerifier(org.apache.http.protocol.HttpExpectationVerifier);
-    method public void setHandlerResolver(org.apache.http.protocol.HttpRequestHandlerResolver);
-    method public void setHttpProcessor(org.apache.http.protocol.HttpProcessor);
-    method public void setParams(org.apache.http.params.HttpParams);
-    method public void setResponseFactory(org.apache.http.HttpResponseFactory);
+  @Deprecated public class BasicHttpContext implements org.apache.http.protocol.HttpContext {
+    ctor @Deprecated public BasicHttpContext();
+    ctor @Deprecated public BasicHttpContext(org.apache.http.protocol.HttpContext);
+    method @Deprecated public Object getAttribute(String);
+    method @Deprecated public Object removeAttribute(String);
+    method @Deprecated public void setAttribute(String, Object);
+  }
+
+  @Deprecated public final class BasicHttpProcessor implements java.lang.Cloneable org.apache.http.protocol.HttpProcessor org.apache.http.protocol.HttpRequestInterceptorList org.apache.http.protocol.HttpResponseInterceptorList {
+    ctor @Deprecated public BasicHttpProcessor();
+    method @Deprecated public void addInterceptor(org.apache.http.HttpRequestInterceptor);
+    method @Deprecated public void addInterceptor(org.apache.http.HttpRequestInterceptor, int);
+    method @Deprecated public void addInterceptor(org.apache.http.HttpResponseInterceptor);
+    method @Deprecated public void addInterceptor(org.apache.http.HttpResponseInterceptor, int);
+    method @Deprecated public void addRequestInterceptor(org.apache.http.HttpRequestInterceptor);
+    method @Deprecated public void addRequestInterceptor(org.apache.http.HttpRequestInterceptor, int);
+    method @Deprecated public void addResponseInterceptor(org.apache.http.HttpResponseInterceptor, int);
+    method @Deprecated public void addResponseInterceptor(org.apache.http.HttpResponseInterceptor);
+    method @Deprecated public void clearInterceptors();
+    method @Deprecated public void clearRequestInterceptors();
+    method @Deprecated public void clearResponseInterceptors();
+    method @Deprecated public Object clone() throws java.lang.CloneNotSupportedException;
+    method @Deprecated public org.apache.http.protocol.BasicHttpProcessor copy();
+    method @Deprecated protected void copyInterceptors(org.apache.http.protocol.BasicHttpProcessor);
+    method @Deprecated public org.apache.http.HttpRequestInterceptor getRequestInterceptor(int);
+    method @Deprecated public int getRequestInterceptorCount();
+    method @Deprecated public org.apache.http.HttpResponseInterceptor getResponseInterceptor(int);
+    method @Deprecated public int getResponseInterceptorCount();
+    method @Deprecated public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public void removeRequestInterceptorByClass(Class);
+    method @Deprecated public void removeResponseInterceptorByClass(Class);
+    method @Deprecated public void setInterceptors(java.util.List);
+    field @Deprecated protected java.util.List requestInterceptors;
+    field @Deprecated protected java.util.List responseInterceptors;
+  }
+
+  @Deprecated public final class DefaultedHttpContext implements org.apache.http.protocol.HttpContext {
+    ctor @Deprecated public DefaultedHttpContext(org.apache.http.protocol.HttpContext, org.apache.http.protocol.HttpContext);
+    method @Deprecated public Object getAttribute(String);
+    method @Deprecated public org.apache.http.protocol.HttpContext getDefaults();
+    method @Deprecated public Object removeAttribute(String);
+    method @Deprecated public void setAttribute(String, Object);
+  }
+
+  @Deprecated public interface ExecutionContext {
+    field @Deprecated public static final String HTTP_CONNECTION = "http.connection";
+    field @Deprecated public static final String HTTP_PROXY_HOST = "http.proxy_host";
+    field @Deprecated public static final String HTTP_REQUEST = "http.request";
+    field @Deprecated public static final String HTTP_REQ_SENT = "http.request_sent";
+    field @Deprecated public static final String HTTP_RESPONSE = "http.response";
+    field @Deprecated public static final String HTTP_TARGET_HOST = "http.target_host";
+  }
+
+  @Deprecated public final class HTTP {
+    method @Deprecated public static boolean isWhitespace(char);
+    field @Deprecated public static final String ASCII = "ASCII";
+    field @Deprecated public static final String CHARSET_PARAM = "; charset=";
+    field @Deprecated public static final String CHUNK_CODING = "chunked";
+    field @Deprecated public static final String CONN_CLOSE = "Close";
+    field @Deprecated public static final String CONN_DIRECTIVE = "Connection";
+    field @Deprecated public static final String CONN_KEEP_ALIVE = "Keep-Alive";
+    field @Deprecated public static final String CONTENT_ENCODING = "Content-Encoding";
+    field @Deprecated public static final String CONTENT_LEN = "Content-Length";
+    field @Deprecated public static final String CONTENT_TYPE = "Content-Type";
+    field @Deprecated public static final int CR = 13; // 0xd
+    field @Deprecated public static final String DATE_HEADER = "Date";
+    field @Deprecated public static final String DEFAULT_CONTENT_CHARSET = "ISO-8859-1";
+    field @Deprecated public static final String DEFAULT_CONTENT_TYPE = "application/octet-stream";
+    field @Deprecated public static final String DEFAULT_PROTOCOL_CHARSET = "US-ASCII";
+    field @Deprecated public static final String EXPECT_CONTINUE = "100-continue";
+    field @Deprecated public static final String EXPECT_DIRECTIVE = "Expect";
+    field @Deprecated public static final int HT = 9; // 0x9
+    field @Deprecated public static final String IDENTITY_CODING = "identity";
+    field @Deprecated public static final String ISO_8859_1 = "ISO-8859-1";
+    field @Deprecated public static final int LF = 10; // 0xa
+    field @Deprecated public static final String OCTET_STREAM_TYPE = "application/octet-stream";
+    field @Deprecated public static final String PLAIN_TEXT_TYPE = "text/plain";
+    field @Deprecated public static final String SERVER_HEADER = "Server";
+    field @Deprecated public static final int SP = 32; // 0x20
+    field @Deprecated public static final String TARGET_HOST = "Host";
+    field @Deprecated public static final String TRANSFER_ENCODING = "Transfer-Encoding";
+    field @Deprecated public static final String USER_AGENT = "User-Agent";
+    field @Deprecated public static final String US_ASCII = "US-ASCII";
+    field @Deprecated public static final String UTF_16 = "UTF-16";
+    field @Deprecated public static final String UTF_8 = "UTF-8";
+  }
+
+  @Deprecated public interface HttpContext {
+    method @Deprecated public Object getAttribute(String);
+    method @Deprecated public Object removeAttribute(String);
+    method @Deprecated public void setAttribute(String, Object);
+    field @Deprecated public static final String RESERVED_PREFIX = "http.";
+  }
+
+  @Deprecated public class HttpDateGenerator {
+    ctor @Deprecated public HttpDateGenerator();
+    method @Deprecated public String getCurrentDate();
+    field @Deprecated public static final java.util.TimeZone GMT;
+    field @Deprecated public static final String PATTERN_RFC1123 = "EEE, dd MMM yyyy HH:mm:ss zzz";
+  }
+
+  @Deprecated public interface HttpExpectationVerifier {
+    method @Deprecated public void verify(org.apache.http.HttpRequest, org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException;
+  }
+
+  @Deprecated public interface HttpProcessor extends org.apache.http.HttpRequestInterceptor org.apache.http.HttpResponseInterceptor {
+  }
+
+  @Deprecated public class HttpRequestExecutor {
+    ctor @Deprecated public HttpRequestExecutor();
+    method @Deprecated protected boolean canResponseHaveBody(org.apache.http.HttpRequest, org.apache.http.HttpResponse);
+    method @Deprecated protected org.apache.http.HttpResponse doReceiveResponse(org.apache.http.HttpRequest, org.apache.http.HttpClientConnection, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated protected org.apache.http.HttpResponse doSendRequest(org.apache.http.HttpRequest, org.apache.http.HttpClientConnection, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public org.apache.http.HttpResponse execute(org.apache.http.HttpRequest, org.apache.http.HttpClientConnection, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public void postProcess(org.apache.http.HttpResponse, org.apache.http.protocol.HttpProcessor, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public void preProcess(org.apache.http.HttpRequest, org.apache.http.protocol.HttpProcessor, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+  }
+
+  @Deprecated public interface HttpRequestHandler {
+    method @Deprecated public void handle(org.apache.http.HttpRequest, org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+  }
+
+  @Deprecated public class HttpRequestHandlerRegistry implements org.apache.http.protocol.HttpRequestHandlerResolver {
+    ctor @Deprecated public HttpRequestHandlerRegistry();
+    method @Deprecated public org.apache.http.protocol.HttpRequestHandler lookup(String);
+    method @Deprecated protected boolean matchUriRequestPattern(String, String);
+    method @Deprecated public void register(String, org.apache.http.protocol.HttpRequestHandler);
+    method @Deprecated public void setHandlers(java.util.Map);
+    method @Deprecated public void unregister(String);
+  }
+
+  @Deprecated public interface HttpRequestHandlerResolver {
+    method @Deprecated public org.apache.http.protocol.HttpRequestHandler lookup(String);
+  }
+
+  @Deprecated public interface HttpRequestInterceptorList {
+    method @Deprecated public void addRequestInterceptor(org.apache.http.HttpRequestInterceptor);
+    method @Deprecated public void addRequestInterceptor(org.apache.http.HttpRequestInterceptor, int);
+    method @Deprecated public void clearRequestInterceptors();
+    method @Deprecated public org.apache.http.HttpRequestInterceptor getRequestInterceptor(int);
+    method @Deprecated public int getRequestInterceptorCount();
+    method @Deprecated public void removeRequestInterceptorByClass(Class);
+    method @Deprecated public void setInterceptors(java.util.List);
+  }
+
+  @Deprecated public interface HttpResponseInterceptorList {
+    method @Deprecated public void addResponseInterceptor(org.apache.http.HttpResponseInterceptor);
+    method @Deprecated public void addResponseInterceptor(org.apache.http.HttpResponseInterceptor, int);
+    method @Deprecated public void clearResponseInterceptors();
+    method @Deprecated public org.apache.http.HttpResponseInterceptor getResponseInterceptor(int);
+    method @Deprecated public int getResponseInterceptorCount();
+    method @Deprecated public void removeResponseInterceptorByClass(Class);
+    method @Deprecated public void setInterceptors(java.util.List);
+  }
+
+  @Deprecated public class HttpService {
+    ctor @Deprecated public HttpService(org.apache.http.protocol.HttpProcessor, org.apache.http.ConnectionReuseStrategy, org.apache.http.HttpResponseFactory);
+    method @Deprecated protected void doService(org.apache.http.HttpRequest, org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public org.apache.http.params.HttpParams getParams();
+    method @Deprecated protected void handleException(org.apache.http.HttpException, org.apache.http.HttpResponse);
+    method @Deprecated public void handleRequest(org.apache.http.HttpServerConnection, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+    method @Deprecated public void setConnReuseStrategy(org.apache.http.ConnectionReuseStrategy);
+    method @Deprecated public void setExpectationVerifier(org.apache.http.protocol.HttpExpectationVerifier);
+    method @Deprecated public void setHandlerResolver(org.apache.http.protocol.HttpRequestHandlerResolver);
+    method @Deprecated public void setHttpProcessor(org.apache.http.protocol.HttpProcessor);
+    method @Deprecated public void setParams(org.apache.http.params.HttpParams);
+    method @Deprecated public void setResponseFactory(org.apache.http.HttpResponseFactory);
   }
 
-  public deprecated class RequestConnControl implements org.apache.http.HttpRequestInterceptor {
-    ctor public RequestConnControl();
-    method public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public class RequestConnControl implements org.apache.http.HttpRequestInterceptor {
+    ctor @Deprecated public RequestConnControl();
+    method @Deprecated public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
   }
 
-  public deprecated class RequestContent implements org.apache.http.HttpRequestInterceptor {
-    ctor public RequestContent();
-    method public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public class RequestContent implements org.apache.http.HttpRequestInterceptor {
+    ctor @Deprecated public RequestContent();
+    method @Deprecated public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
   }
 
-  public deprecated class RequestDate implements org.apache.http.HttpRequestInterceptor {
-    ctor public RequestDate();
-    method public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public class RequestDate implements org.apache.http.HttpRequestInterceptor {
+    ctor @Deprecated public RequestDate();
+    method @Deprecated public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
   }
 
-  public deprecated class RequestExpectContinue implements org.apache.http.HttpRequestInterceptor {
-    ctor public RequestExpectContinue();
-    method public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public class RequestExpectContinue implements org.apache.http.HttpRequestInterceptor {
+    ctor @Deprecated public RequestExpectContinue();
+    method @Deprecated public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
   }
 
-  public deprecated class RequestTargetHost implements org.apache.http.HttpRequestInterceptor {
-    ctor public RequestTargetHost();
-    method public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public class RequestTargetHost implements org.apache.http.HttpRequestInterceptor {
+    ctor @Deprecated public RequestTargetHost();
+    method @Deprecated public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
   }
 
-  public deprecated class RequestUserAgent implements org.apache.http.HttpRequestInterceptor {
-    ctor public RequestUserAgent();
-    method public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public class RequestUserAgent implements org.apache.http.HttpRequestInterceptor {
+    ctor @Deprecated public RequestUserAgent();
+    method @Deprecated public void process(org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
   }
 
-  public deprecated class ResponseConnControl implements org.apache.http.HttpResponseInterceptor {
-    ctor public ResponseConnControl();
-    method public void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public class ResponseConnControl implements org.apache.http.HttpResponseInterceptor {
+    ctor @Deprecated public ResponseConnControl();
+    method @Deprecated public void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
   }
 
-  public deprecated class ResponseContent implements org.apache.http.HttpResponseInterceptor {
-    ctor public ResponseContent();
-    method public void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public class ResponseContent implements org.apache.http.HttpResponseInterceptor {
+    ctor @Deprecated public ResponseContent();
+    method @Deprecated public void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
   }
 
-  public deprecated class ResponseDate implements org.apache.http.HttpResponseInterceptor {
-    ctor public ResponseDate();
-    method public void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public class ResponseDate implements org.apache.http.HttpResponseInterceptor {
+    ctor @Deprecated public ResponseDate();
+    method @Deprecated public void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
   }
 
-  public deprecated class ResponseServer implements org.apache.http.HttpResponseInterceptor {
-    ctor public ResponseServer();
-    method public void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
+  @Deprecated public class ResponseServer implements org.apache.http.HttpResponseInterceptor {
+    ctor @Deprecated public ResponseServer();
+    method @Deprecated public void process(org.apache.http.HttpResponse, org.apache.http.protocol.HttpContext) throws org.apache.http.HttpException, java.io.IOException;
   }
 
-  public deprecated class SyncBasicHttpContext extends org.apache.http.protocol.BasicHttpContext {
-    ctor public SyncBasicHttpContext(org.apache.http.protocol.HttpContext);
-    method public synchronized java.lang.Object getAttribute(java.lang.String);
-    method public synchronized java.lang.Object removeAttribute(java.lang.String);
-    method public synchronized void setAttribute(java.lang.String, java.lang.Object);
+  @Deprecated public class SyncBasicHttpContext extends org.apache.http.protocol.BasicHttpContext {
+    ctor @Deprecated public SyncBasicHttpContext(org.apache.http.protocol.HttpContext);
   }
 
-  public deprecated class UriPatternMatcher {
-    ctor public UriPatternMatcher();
-    method public java.lang.Object lookup(java.lang.String);
-    method protected boolean matchUriRequestPattern(java.lang.String, java.lang.String);
-    method public void register(java.lang.String, java.lang.Object);
-    method public void setHandlers(java.util.Map);
-    method public void unregister(java.lang.String);
+  @Deprecated public class UriPatternMatcher {
+    ctor @Deprecated public UriPatternMatcher();
+    method @Deprecated public Object lookup(String);
+    method @Deprecated protected boolean matchUriRequestPattern(String, String);
+    method @Deprecated public void register(String, Object);
+    method @Deprecated public void setHandlers(java.util.Map);
+    method @Deprecated public void unregister(String);
   }
 
 }
 
 package org.apache.http.util {
 
-  public final deprecated class ByteArrayBuffer {
-    ctor public ByteArrayBuffer(int);
-    method public void append(byte[], int, int);
-    method public void append(int);
-    method public void append(char[], int, int);
-    method public void append(org.apache.http.util.CharArrayBuffer, int, int);
-    method public byte[] buffer();
-    method public int byteAt(int);
-    method public int capacity();
-    method public void clear();
-    method public boolean isEmpty();
-    method public boolean isFull();
-    method public int length();
-    method public void setLength(int);
-    method public byte[] toByteArray();
-  }
-
-  public final deprecated class CharArrayBuffer {
-    ctor public CharArrayBuffer(int);
-    method public void append(char[], int, int);
-    method public void append(java.lang.String);
-    method public void append(org.apache.http.util.CharArrayBuffer, int, int);
-    method public void append(org.apache.http.util.CharArrayBuffer);
-    method public void append(char);
-    method public void append(byte[], int, int);
-    method public void append(org.apache.http.util.ByteArrayBuffer, int, int);
-    method public void append(java.lang.Object);
-    method public char[] buffer();
-    method public int capacity();
-    method public char charAt(int);
-    method public void clear();
-    method public void ensureCapacity(int);
-    method public int indexOf(int, int, int);
-    method public int indexOf(int);
-    method public boolean isEmpty();
-    method public boolean isFull();
-    method public int length();
-    method public void setLength(int);
-    method public java.lang.String substring(int, int);
-    method public java.lang.String substringTrimmed(int, int);
-    method public char[] toCharArray();
-  }
-
-  public final deprecated class EncodingUtils {
-    method public static byte[] getAsciiBytes(java.lang.String);
-    method public static java.lang.String getAsciiString(byte[], int, int);
-    method public static java.lang.String getAsciiString(byte[]);
-    method public static byte[] getBytes(java.lang.String, java.lang.String);
-    method public static java.lang.String getString(byte[], int, int, java.lang.String);
-    method public static java.lang.String getString(byte[], java.lang.String);
-  }
-
-  public final deprecated class EntityUtils {
-    method public static java.lang.String getContentCharSet(org.apache.http.HttpEntity) throws org.apache.http.ParseException;
-    method public static byte[] toByteArray(org.apache.http.HttpEntity) throws java.io.IOException;
-    method public static java.lang.String toString(org.apache.http.HttpEntity, java.lang.String) throws java.io.IOException, org.apache.http.ParseException;
-    method public static java.lang.String toString(org.apache.http.HttpEntity) throws java.io.IOException, org.apache.http.ParseException;
-  }
-
-  public final deprecated class ExceptionUtils {
-    method public static void initCause(java.lang.Throwable, java.lang.Throwable);
-  }
-
-  public final deprecated class LangUtils {
-    method public static boolean equals(java.lang.Object, java.lang.Object);
-    method public static boolean equals(java.lang.Object[], java.lang.Object[]);
-    method public static int hashCode(int, int);
-    method public static int hashCode(int, boolean);
-    method public static int hashCode(int, java.lang.Object);
-    field public static final int HASH_OFFSET = 37; // 0x25
-    field public static final int HASH_SEED = 17; // 0x11
-  }
-
-  public deprecated class VersionInfo {
-    ctor protected VersionInfo(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
-    method protected static final org.apache.http.util.VersionInfo fromMap(java.lang.String, java.util.Map, java.lang.ClassLoader);
-    method public final java.lang.String getClassloader();
-    method public final java.lang.String getModule();
-    method public final java.lang.String getPackage();
-    method public final java.lang.String getRelease();
-    method public final java.lang.String getTimestamp();
-    method public static final org.apache.http.util.VersionInfo[] loadVersionInfo(java.lang.String[], java.lang.ClassLoader);
-    method public static final org.apache.http.util.VersionInfo loadVersionInfo(java.lang.String, java.lang.ClassLoader);
-    field public static final java.lang.String PROPERTY_MODULE = "info.module";
-    field public static final java.lang.String PROPERTY_RELEASE = "info.release";
-    field public static final java.lang.String PROPERTY_TIMESTAMP = "info.timestamp";
-    field public static final java.lang.String UNAVAILABLE = "UNAVAILABLE";
-    field public static final java.lang.String VERSION_PROPERTY_FILE = "version.properties";
+  @Deprecated public final class ByteArrayBuffer {
+    ctor @Deprecated public ByteArrayBuffer(int);
+    method @Deprecated public void append(byte[], int, int);
+    method @Deprecated public void append(int);
+    method @Deprecated public void append(char[], int, int);
+    method @Deprecated public void append(org.apache.http.util.CharArrayBuffer, int, int);
+    method @Deprecated public byte[] buffer();
+    method @Deprecated public int byteAt(int);
+    method @Deprecated public int capacity();
+    method @Deprecated public void clear();
+    method @Deprecated public boolean isEmpty();
+    method @Deprecated public boolean isFull();
+    method @Deprecated public int length();
+    method @Deprecated public void setLength(int);
+    method @Deprecated public byte[] toByteArray();
+  }
+
+  @Deprecated public final class CharArrayBuffer {
+    ctor @Deprecated public CharArrayBuffer(int);
+    method @Deprecated public void append(char[], int, int);
+    method @Deprecated public void append(String);
+    method @Deprecated public void append(org.apache.http.util.CharArrayBuffer, int, int);
+    method @Deprecated public void append(org.apache.http.util.CharArrayBuffer);
+    method @Deprecated public void append(char);
+    method @Deprecated public void append(byte[], int, int);
+    method @Deprecated public void append(org.apache.http.util.ByteArrayBuffer, int, int);
+    method @Deprecated public void append(Object);
+    method @Deprecated public char[] buffer();
+    method @Deprecated public int capacity();
+    method @Deprecated public char charAt(int);
+    method @Deprecated public void clear();
+    method @Deprecated public void ensureCapacity(int);
+    method @Deprecated public int indexOf(int, int, int);
+    method @Deprecated public int indexOf(int);
+    method @Deprecated public boolean isEmpty();
+    method @Deprecated public boolean isFull();
+    method @Deprecated public int length();
+    method @Deprecated public void setLength(int);
+    method @Deprecated public String substring(int, int);
+    method @Deprecated public String substringTrimmed(int, int);
+    method @Deprecated public char[] toCharArray();
+  }
+
+  @Deprecated public final class EncodingUtils {
+    method @Deprecated public static byte[] getAsciiBytes(String);
+    method @Deprecated public static String getAsciiString(byte[], int, int);
+    method @Deprecated public static String getAsciiString(byte[]);
+    method @Deprecated public static byte[] getBytes(String, String);
+    method @Deprecated public static String getString(byte[], int, int, String);
+    method @Deprecated public static String getString(byte[], String);
+  }
+
+  @Deprecated public final class EntityUtils {
+    method @Deprecated public static String getContentCharSet(org.apache.http.HttpEntity) throws org.apache.http.ParseException;
+    method @Deprecated public static byte[] toByteArray(org.apache.http.HttpEntity) throws java.io.IOException;
+    method @Deprecated public static String toString(org.apache.http.HttpEntity, String) throws java.io.IOException, org.apache.http.ParseException;
+    method @Deprecated public static String toString(org.apache.http.HttpEntity) throws java.io.IOException, org.apache.http.ParseException;
+  }
+
+  @Deprecated public final class ExceptionUtils {
+    method @Deprecated public static void initCause(Throwable, Throwable);
+  }
+
+  @Deprecated public final class LangUtils {
+    method @Deprecated public static boolean equals(Object, Object);
+    method @Deprecated public static boolean equals(Object[], Object[]);
+    method @Deprecated public static int hashCode(int, int);
+    method @Deprecated public static int hashCode(int, boolean);
+    method @Deprecated public static int hashCode(int, Object);
+    field @Deprecated public static final int HASH_OFFSET = 37; // 0x25
+    field @Deprecated public static final int HASH_SEED = 17; // 0x11
+  }
+
+  @Deprecated public class VersionInfo {
+    ctor @Deprecated protected VersionInfo(String, String, String, String, String);
+    method @Deprecated protected static final org.apache.http.util.VersionInfo fromMap(String, java.util.Map, ClassLoader);
+    method @Deprecated public final String getClassloader();
+    method @Deprecated public final String getModule();
+    method @Deprecated public final String getPackage();
+    method @Deprecated public final String getRelease();
+    method @Deprecated public final String getTimestamp();
+    method @Deprecated public static final org.apache.http.util.VersionInfo[] loadVersionInfo(String[], ClassLoader);
+    method @Deprecated public static final org.apache.http.util.VersionInfo loadVersionInfo(String, ClassLoader);
+    field @Deprecated public static final String PROPERTY_MODULE = "info.module";
+    field @Deprecated public static final String PROPERTY_RELEASE = "info.release";
+    field @Deprecated public static final String PROPERTY_TIMESTAMP = "info.timestamp";
+    field @Deprecated public static final String UNAVAILABLE = "UNAVAILABLE";
+    field @Deprecated public static final String VERSION_PROPERTY_FILE = "version.properties";
   }
 
 }
diff --git a/api/removed.txt b/api/removed.txt
index e69de29..d802177 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/api/system-current.txt b/api/system-current.txt
index e69de29..d802177 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/api/system-removed.txt b/api/system-removed.txt
index e69de29..d802177 100644
--- a/api/system-removed.txt
+++ b/api/system-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/api/test-current.txt b/api/test-current.txt
index e69de29..d802177 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/api/test-removed.txt b/api/test-removed.txt
index e69de29..d802177 100644
--- a/api/test-removed.txt
+++ b/api/test-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0