hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1329866 - in /httpcomponents/httpcore/trunk: httpcore-nio/src/main/java/org/apache/http/impl/nio/ httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/ httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/ httpcore-nio/src/main/j...
Date Tue, 24 Apr 2012 17:15:44 GMT
Author: olegk
Date: Tue Apr 24 17:15:42 2012
New Revision: 1329866

URL: http://svn.apache.org/viewvc?rev=1329866&view=rev
Log:
Add since markers to @deprecated annotations

Modified:
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIOEventDispatch.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIOEventDispatch.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientEventHandlerAdaptor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerEventHandlerAdaptor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLClientIOEventDispatch.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLServerIOEventDispatch.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSession.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSessionHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSessionHandlerAdaptor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLMode.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLSetupHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLSetupHandlerAdaptor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionHandle.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientIOTarget.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerIOTarget.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServiceHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntity.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentListener.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NHttpEntityWrapper.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ProducingNHttpEntity.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/SkipContentListener.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorPNames.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorParamBean.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorParams.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpServiceHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/EventListener.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpRequestExecutionHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpHandlerBase.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestExecutionHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerRegistry.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerResolver.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpResponseTrigger.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullNHttpEntity.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/SimpleNHttpRequestHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/BufferInfo.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ContentOutputBuffer.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HTTP.java

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIOEventDispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIOEventDispatch.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIOEventDispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultClientIOEventDispatch.java Tue Apr 24 17:15:42 2012
@@ -59,7 +59,7 @@ import org.apache.http.params.HttpParams
  *
  * @since 4.0
  *
- * @deprecated use {@link DefaultHttpClientIODispatch}
+ * @deprecated (4.2) use {@link DefaultHttpClientIODispatch}
  */
 @Deprecated
 @Immutable // provided injected dependencies are immutable

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIOEventDispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIOEventDispatch.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIOEventDispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultServerIOEventDispatch.java Tue Apr 24 17:15:42 2012
@@ -59,7 +59,7 @@ import org.apache.http.params.HttpParams
  *
  * @since 4.0
  *
- * @deprecated use {@link DefaultHttpServerIODispatch}
+ * @deprecated (4.2) use {@link DefaultHttpServerIODispatch}
  */
 @Deprecated
 @Immutable // provided injected dependencies are immutable

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientEventHandlerAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientEventHandlerAdaptor.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientEventHandlerAdaptor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientEventHandlerAdaptor.java Tue Apr 24 17:15:42 2012
@@ -36,6 +36,9 @@ import org.apache.http.nio.NHttpClientCo
 import org.apache.http.nio.NHttpClientHandler;
 import org.apache.http.nio.NHttpClientEventHandler;
 
+/**
+ * @deprecated (4.2)
+ */
 @Deprecated
 class NHttpClientEventHandlerAdaptor implements NHttpClientEventHandler {
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerEventHandlerAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerEventHandlerAdaptor.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerEventHandlerAdaptor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerEventHandlerAdaptor.java Tue Apr 24 17:15:42 2012
@@ -36,6 +36,9 @@ import org.apache.http.nio.NHttpServerCo
 import org.apache.http.nio.NHttpServerEventHandler;
 import org.apache.http.nio.NHttpServiceHandler;
 
+/**
+ * @deprecated (4.2)
+ */
 @Deprecated
 class NHttpServerEventHandlerAdaptor implements NHttpServerEventHandler {
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLClientIOEventDispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLClientIOEventDispatch.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLClientIOEventDispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLClientIOEventDispatch.java Tue Apr 24 17:15:42 2012
@@ -62,7 +62,7 @@ import org.apache.http.protocol.Executio
  *
  * @since 4.0
  *
- * @deprecated use {@link org.apache.http.impl.nio.ssl.SSLClientIOEventDispatch}
+ * @deprecated (4.2) use {@link org.apache.http.impl.nio.ssl.SSLClientIOEventDispatch}
  */
 @Deprecated
 public class SSLClientIOEventDispatch implements IOEventDispatch {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLServerIOEventDispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLServerIOEventDispatch.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLServerIOEventDispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLServerIOEventDispatch.java Tue Apr 24 17:15:42 2012
@@ -62,7 +62,7 @@ import org.apache.http.protocol.Executio
  *
  * @since 4.0
  *
- * @deprecated use {@link org.apache.http.impl.nio.ssl.SSLServerIOEventDispatch}
+ * @deprecated (4.2) use {@link org.apache.http.impl.nio.ssl.SSLServerIOEventDispatch}
  */
 @Deprecated
 public class SSLServerIOEventDispatch implements IOEventDispatch {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java Tue Apr 24 17:15:42 2012
@@ -111,7 +111,10 @@ public abstract class AbstractMultiworke
 
     protected volatile IOReactorStatus status;
 
-    @Deprecated // 4.2
+    /**
+     * @deprecated (4.2)
+     */
+    @Deprecated
     protected final HttpParams params;
     protected final IOReactorConfig config;
     protected final Selector selector;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSession.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSession.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSession.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSession.java Tue Apr 24 17:15:42 2012
@@ -39,7 +39,7 @@ import org.apache.http.params.HttpParams
  *
  * @since 4.0
  *
- * @deprecated use {@link org.apache.http.nio.reactor.ssl.SSLIOSession}
+ * @deprecated (4.2) use {@link org.apache.http.nio.reactor.ssl.SSLIOSession}
  */
 @Deprecated
 public class SSLIOSession extends org.apache.http.nio.reactor.ssl.SSLIOSession {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSessionHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSessionHandler.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSessionHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSessionHandler.java Tue Apr 24 17:15:42 2012
@@ -41,7 +41,7 @@ import org.apache.http.params.HttpParams
  *
  * @since 4.0
  *
- * @deprecated Use {@link SSLSetupHandler}
+ * @deprecated (4.2) Use {@link SSLSetupHandler}
  */
 @Deprecated
 public interface SSLIOSessionHandler {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSessionHandlerAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSessionHandlerAdaptor.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSessionHandlerAdaptor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLIOSessionHandlerAdaptor.java Tue Apr 24 17:15:42 2012
@@ -35,6 +35,9 @@ import org.apache.http.nio.reactor.IOSes
 import org.apache.http.params.BasicHttpParams;
 import org.apache.http.params.HttpParams;
 
+/**
+ * @deprecated (4.2)
+ */
 @Deprecated
 class SSLIOSessionHandlerAdaptor implements org.apache.http.nio.reactor.ssl.SSLSetupHandler {
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLMode.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLMode.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLMode.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLMode.java Tue Apr 24 17:15:42 2012
@@ -29,6 +29,8 @@ package org.apache.http.impl.nio.reactor
 
 /**
  * @since 4.0
+ * 
+ * @deprecated (4.2)
  */
 @Deprecated
 public enum SSLMode {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLSetupHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLSetupHandler.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLSetupHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLSetupHandler.java Tue Apr 24 17:15:42 2012
@@ -40,7 +40,7 @@ import org.apache.http.params.HttpParams
  *
  * @since 4.1
  *
- * @deprecated use {@link org.apache.http.nio.reactor.ssl.SSLSetupHandler}
+ * @deprecated (4.2) use {@link org.apache.http.nio.reactor.ssl.SSLSetupHandler}
  */
 @Deprecated
 public interface SSLSetupHandler {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLSetupHandlerAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLSetupHandlerAdaptor.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLSetupHandlerAdaptor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLSetupHandlerAdaptor.java Tue Apr 24 17:15:42 2012
@@ -35,6 +35,9 @@ import org.apache.http.nio.reactor.IOSes
 import org.apache.http.params.BasicHttpParams;
 import org.apache.http.params.HttpParams;
 
+/**
+* @deprecated (4.2)
+*/
 @Deprecated
 class SSLSetupHandlerAdaptor implements org.apache.http.nio.reactor.ssl.SSLSetupHandler {
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionHandle.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionHandle.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionHandle.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionHandle.java Tue Apr 24 17:15:42 2012
@@ -34,9 +34,9 @@ import org.apache.http.nio.reactor.IOSes
  * to a {@link IOSession} along with information about time of last I/O
  * operations on that session.
  *
- * @deprecated use {@link IOSessionImpl}
- *
  * @since 4.0
+ * 
+ * @deprecated (4.2) use {@link IOSessionImpl}
  */
 @Deprecated
 public class SessionHandle {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java Tue Apr 24 17:15:42 2012
@@ -58,7 +58,7 @@ import org.apache.http.params.HttpParams
  *
  * @since 4.1
  *
- * @deprecated use {@link DefaultHttpClientIODispatch}
+ * @deprecated (4.2) use {@link DefaultHttpClientIODispatch}
  */
 @Deprecated
 @Immutable // provided injected dependencies are immutable

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java Tue Apr 24 17:15:42 2012
@@ -58,7 +58,7 @@ import org.apache.http.params.HttpParams
  *
  * @since 4.1
  *
- * @deprecated use {@link DefaultHttpServerIODispatch}
+ * @deprecated (4.2) use {@link DefaultHttpServerIODispatch}
  */
 @Deprecated
 @Immutable // provided injected dependencies are immutable

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientHandler.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientHandler.java Tue Apr 24 17:15:42 2012
@@ -36,7 +36,7 @@ import org.apache.http.HttpException;
  *
  * @since 4.0
  *
- * @deprecated use {@link NHttpClientEventHandler}
+ * @deprecated (4.2) use {@link NHttpClientEventHandler}
  */
 @Deprecated
 public interface NHttpClientHandler {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientIOTarget.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientIOTarget.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientIOTarget.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientIOTarget.java Tue Apr 24 17:15:42 2012
@@ -36,7 +36,7 @@ import org.apache.http.nio.reactor.IOEve
  *
  * @since 4.0
  *
- * @deprecated no longer used
+ * @deprecated (4.2) no longer used
  */
 @Deprecated
 public interface NHttpClientIOTarget extends NHttpClientConnection {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerIOTarget.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerIOTarget.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerIOTarget.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerIOTarget.java Tue Apr 24 17:15:42 2012
@@ -36,7 +36,7 @@ import org.apache.http.nio.reactor.IOEve
  *
  * @since 4.0
  *
- * @deprecated no longer used
+ * @deprecated (4.2) no longer used
  */
 @Deprecated
 public interface NHttpServerIOTarget extends NHttpServerConnection {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServiceHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServiceHandler.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServiceHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServiceHandler.java Tue Apr 24 17:15:42 2012
@@ -36,7 +36,7 @@ import org.apache.http.HttpException;
  *
  * @since 4.0
  *
- * @deprecated use {@link NHttpServerEventHandler}
+ * @deprecated (4.2) use {@link NHttpServerEventHandler}
  */
 @Deprecated
 public interface NHttpServiceHandler {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/BufferingNHttpEntity.java Tue Apr 24 17:15:42 2012
@@ -49,7 +49,7 @@ import org.apache.http.nio.util.SimpleIn
  *
  * @since 4.0
  *
- * @deprecated use {@link BasicAsyncRequestConsumer} or {@link BasicAsyncResponseConsumer}
+ * @deprecated (4.2) use {@link BasicAsyncRequestConsumer} or {@link BasicAsyncResponseConsumer}
  */
 @NotThreadSafe
 @Deprecated

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntity.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntity.java Tue Apr 24 17:15:42 2012
@@ -41,7 +41,7 @@ import org.apache.http.nio.protocol.Basi
  *
  * @since 4.0
  *
- * @deprecated use {@link BasicAsyncRequestConsumer} or {@link BasicAsyncResponseConsumer}
+ * @deprecated (4.2) use {@link BasicAsyncRequestConsumer} or {@link BasicAsyncResponseConsumer}
  */
 @Deprecated
 public interface ConsumingNHttpEntity extends HttpEntity {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntityTemplate.java Tue Apr 24 17:15:42 2012
@@ -44,7 +44,7 @@ import org.apache.http.nio.protocol.Basi
  *
  * @since 4.0
  *
- * @deprecated use {@link BasicAsyncRequestConsumer} or {@link BasicAsyncResponseConsumer}
+ * @deprecated (4.2) use {@link BasicAsyncRequestConsumer} or {@link BasicAsyncResponseConsumer}
  */
 @Deprecated
 public class ConsumingNHttpEntityTemplate

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentListener.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentListener.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentListener.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentListener.java Tue Apr 24 17:15:42 2012
@@ -36,6 +36,8 @@ import org.apache.http.nio.IOControl;
  * A listener for available data on a non-blocking {@link ConsumingNHttpEntity}.
  *
  * @since 4.0
+ * 
+ * @deprecated (4.2)
  */
 @Deprecated
 public interface ContentListener {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java Tue Apr 24 17:15:42 2012
@@ -53,8 +53,14 @@ public class NByteArrayEntity extends Ab
     private final byte[] b;
     private final int off, len;
     private final ByteBuffer buf;
+    /**
+     * @deprecated (4.2)
+     */
     @Deprecated
     protected final byte[] content;
+    /**
+     * @deprecated (4.2)
+     */
     @Deprecated
     protected final ByteBuffer buffer;
 
@@ -120,7 +126,7 @@ public class NByteArrayEntity extends Ab
     /**
      * {@inheritDoc}
      *
-     * @deprecated use {@link #close()}
+     * @deprecated (4.2) use {@link #close()}
      */
     public void finish() {
         close();

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java Tue Apr 24 17:15:42 2012
@@ -107,7 +107,7 @@ public class NFileEntity extends Abstrac
     }
 
     /**
-     * @deprecated use {@link #NFileEntity(File, ContentType, boolean)}
+     * @deprecated (4.2) use {@link #NFileEntity(File, ContentType, boolean)}
      */
     @Deprecated
     public NFileEntity(final File file, final String contentType, boolean useFileChannels) {
@@ -120,7 +120,7 @@ public class NFileEntity extends Abstrac
     }
 
     /**
-     * @deprecated use {@link #NFileEntity(File, ContentType)}
+     * @deprecated (4.2) use {@link #NFileEntity(File, ContentType)}
      */
     @Deprecated
     public NFileEntity(final File file, final String contentType) {
@@ -143,7 +143,7 @@ public class NFileEntity extends Abstrac
     /**
      * {@inheritDoc}
      *
-     * @deprecated use {@link #close()}
+     * @deprecated (4.2) use {@link #close()}
      */
     public void finish() throws IOException {
         close();

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NHttpEntityWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NHttpEntityWrapper.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NHttpEntityWrapper.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NHttpEntityWrapper.java Tue Apr 24 17:15:42 2012
@@ -46,7 +46,7 @@ import org.apache.http.nio.IOControl;
  *
  * @since 4.0
  *
- * @deprecated use {@link EntityAsyncContentProducer}
+ * @deprecated (4.2) use {@link EntityAsyncContentProducer}
  */
 @NotThreadSafe
 @Deprecated

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java Tue Apr 24 17:15:42 2012
@@ -57,8 +57,14 @@ public class NStringEntity extends Abstr
 
     private final byte[] b;
     private final ByteBuffer buf;
+    /**
+     * @deprecated (4.2)
+     */
     @Deprecated
     protected final byte[] content;
+    /**
+     * @deprecated (4.2)
+     */
     @Deprecated
     protected final ByteBuffer buffer;
 
@@ -160,7 +166,7 @@ public class NStringEntity extends Abstr
     /**
      * {@inheritDoc}
      *
-     * @deprecated use {@link #close()}
+     * @deprecated (4.2) use {@link #close()}
      */
     public void finish() {
         close();

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ProducingNHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ProducingNHttpEntity.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ProducingNHttpEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ProducingNHttpEntity.java Tue Apr 24 17:15:42 2012
@@ -41,7 +41,7 @@ import org.apache.http.nio.protocol.Basi
  *
  * @since 4.0
  *
- * @deprecated use {@link BasicAsyncRequestProducer} or {@link BasicAsyncResponseProducer}
+ * @deprecated use (4.2) {@link BasicAsyncRequestProducer} or {@link BasicAsyncResponseProducer}
  */
 @Deprecated
 public interface ProducingNHttpEntity extends HttpEntity {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/SkipContentListener.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/SkipContentListener.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/SkipContentListener.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/SkipContentListener.java Tue Apr 24 17:15:42 2012
@@ -39,7 +39,7 @@ import org.apache.http.nio.util.ByteBuff
  *
  * @since 4.0
  *
- * @deprecated
+ * @deprecated (4.2)
  */
 @Deprecated
 public class SkipContentListener implements ContentListener {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorPNames.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorPNames.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorPNames.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorPNames.java Tue Apr 24 17:15:42 2012
@@ -34,7 +34,7 @@ import org.apache.http.impl.nio.reactor.
  *
  * @since 4.0
  *
- * @deprecated use {@link IOReactorConfig}
+ * @deprecated (4.2) use {@link IOReactorConfig}
  */
 @Deprecated
 public interface NIOReactorPNames {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorParamBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorParamBean.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorParamBean.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorParamBean.java Tue Apr 24 17:15:42 2012
@@ -34,7 +34,7 @@ import org.apache.http.params.HttpParams
 /**
  * @since 4.0
  *
- * @deprecated use {@link IOReactorConfig}
+ * @deprecated (4.2) use {@link IOReactorConfig}
  */
 @Deprecated
 public class NIOReactorParamBean extends HttpAbstractParamBean {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorParams.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorParams.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/NIOReactorParams.java Tue Apr 24 17:15:42 2012
@@ -37,7 +37,7 @@ import org.apache.http.params.HttpParams
  *
  * @see NIOReactorPNames
  *
- * @deprecated use {@link IOReactorConfig}
+ * @deprecated (4.2) use {@link IOReactorConfig}
  */
 @Deprecated
 public final class NIOReactorParams implements NIOReactorPNames {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpClientHandler.java Tue Apr 24 17:15:42 2012
@@ -87,7 +87,7 @@ import org.apache.http.protocol.HttpProc
  *
  * @since 4.0
  *
- * @deprecated use {@link HttpAsyncRequestExecutor} and {@link HttpAsyncRequester}
+ * @deprecated (4.2) use {@link HttpAsyncRequestExecutor} and {@link HttpAsyncRequester}
  */
 @Deprecated
 @Immutable // provided injected dependencies are immutable

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpServiceHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpServiceHandler.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpServiceHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AsyncNHttpServiceHandler.java Tue Apr 24 17:15:42 2012
@@ -95,7 +95,7 @@ import org.apache.http.util.EncodingUtil
  *
  * @since 4.0
  *
- * @deprecated use {@link HttpAsyncService}
+ * @deprecated (4.2) use {@link HttpAsyncService}
  */
 @Deprecated
 @Immutable // provided injected dependencies are immutable
@@ -607,7 +607,6 @@ public class AsyncNHttpServiceHandler ex
             return this.ioex;
         }
 
-        @Deprecated
         public IOException getIOExepction() {
             return this.ioex;
         }
@@ -616,7 +615,6 @@ public class AsyncNHttpServiceHandler ex
             this.ioex = ex;
         }
 
-        @Deprecated
         public void setIOExepction(final IOException ex) {
             this.ioex = ex;
         }
@@ -625,7 +623,6 @@ public class AsyncNHttpServiceHandler ex
             return this.httpex;
         }
 
-        @Deprecated
         public HttpException getHttpExepction() {
             return this.httpex;
         }
@@ -634,7 +631,6 @@ public class AsyncNHttpServiceHandler ex
             this.httpex = ex;
         }
 
-        @Deprecated
         public void setHttpExepction(final HttpException ex) {
             this.httpex = ex;
         }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java Tue Apr 24 17:15:42 2012
@@ -67,7 +67,7 @@ import org.apache.http.protocol.HttpProc
  *
  * @since 4.0
  *
- * @deprecated use {@link HttpAsyncRequestExecutor} and {@link HttpAsyncRequester}
+ * @deprecated (4.2) use {@link HttpAsyncRequestExecutor} and {@link HttpAsyncRequester}
  */
 @Deprecated
 @Immutable // provided injected dependencies are immutable

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java Tue Apr 24 17:15:42 2012
@@ -72,7 +72,7 @@ import org.apache.http.protocol.HttpRequ
  *
  * @since 4.0
  *
- * @deprecated use {@link HttpAsyncService}
+ * @deprecated (4.2) use {@link HttpAsyncService}
  */
 @Deprecated
 @Immutable // provided injected dependencies are immutable

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/EventListener.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/EventListener.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/EventListener.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/EventListener.java Tue Apr 24 17:15:42 2012
@@ -38,7 +38,7 @@ import org.apache.http.nio.NHttpConnecti
  *
  * @since 4.0
  *
- * @deprecated do not use
+ * @deprecated (4.2) do not use
  */
 @Deprecated
 public interface EventListener {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpRequestExecutionHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpRequestExecutionHandler.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpRequestExecutionHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpRequestExecutionHandler.java Tue Apr 24 17:15:42 2012
@@ -41,7 +41,7 @@ import org.apache.http.protocol.HttpCont
  *
  * @since 4.0
  *
- * @deprecated use {@link HttpAsyncRequestExecutor} and {@link HttpAsyncRequester}
+ * @deprecated (4.2) use {@link HttpAsyncRequestExecutor} and {@link HttpAsyncRequester}
  */
 @Deprecated
 public interface HttpRequestExecutionHandler {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpHandlerBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpHandlerBase.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpHandlerBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpHandlerBase.java Tue Apr 24 17:15:42 2012
@@ -42,7 +42,7 @@ import org.apache.http.protocol.HttpProc
 /**
  * @since 4.0
  *
- * @deprecated do not use
+ * @deprecated (4.2) do not use
  */
 @Deprecated
 @Immutable // provided injected dependencies are immutable

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestExecutionHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestExecutionHandler.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestExecutionHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestExecutionHandler.java Tue Apr 24 17:15:42 2012
@@ -47,7 +47,7 @@ import org.apache.http.protocol.HttpCont
  *
  * @since 4.0
  *
- * @deprecated use {@link HttpAsyncRequestExecutor} and {@link HttpAsyncRequester}
+ * @deprecated (4.2) use {@link HttpAsyncRequestExecutor} and {@link HttpAsyncRequester}
  */
 @Deprecated
 public interface NHttpRequestExecutionHandler {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandler.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandler.java Tue Apr 24 17:15:42 2012
@@ -47,7 +47,7 @@ import org.apache.http.protocol.HttpCont
  *
  * @since 4.0
  *
- * @deprecated use {@link HttpAsyncRequestHandler}
+ * @deprecated (4.2) use {@link HttpAsyncRequestHandler}
  */
 @Deprecated
 public interface NHttpRequestHandler {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerRegistry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerRegistry.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerRegistry.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerRegistry.java Tue Apr 24 17:15:42 2012
@@ -48,7 +48,7 @@ import org.apache.http.protocol.UriPatte
  *
  * @since 4.0
  *
- * @deprecated use {@link HttpAsyncRequestHandlerRegistry}
+ * @deprecated (4.2) use {@link HttpAsyncRequestHandlerRegistry}
  */
 @Deprecated
 public class NHttpRequestHandlerRegistry implements NHttpRequestHandlerResolver {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerResolver.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerResolver.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerResolver.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestHandlerResolver.java Tue Apr 24 17:15:42 2012
@@ -35,7 +35,7 @@ package org.apache.http.nio.protocol;
  *
  * @since 4.0
  *
- * @deprecated use {@link HttpAsyncRequestHandlerResolver}
+ * @deprecated (4.2) use {@link HttpAsyncRequestHandlerResolver}
  */
 @Deprecated
 public interface NHttpRequestHandlerResolver {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpResponseTrigger.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpResponseTrigger.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpResponseTrigger.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpResponseTrigger.java Tue Apr 24 17:15:42 2012
@@ -45,7 +45,7 @@ import org.apache.http.HttpResponse;
  *
  * @since 4.0
  *
- * @deprecated use {@link HttpAsyncExchange}
+ * @deprecated (4.2) use {@link HttpAsyncExchange}
  */
 @Deprecated
 public interface NHttpResponseTrigger {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullNHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullNHttpEntity.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullNHttpEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullNHttpEntity.java Tue Apr 24 17:15:42 2012
@@ -38,6 +38,9 @@ import org.apache.http.nio.ContentDecode
 import org.apache.http.nio.IOControl;
 import org.apache.http.nio.entity.ConsumingNHttpEntity;
 
+/**
+ * @deprecated (4.2)
+ */
 @Deprecated
 class NullNHttpEntity extends HttpEntityWrapper implements ConsumingNHttpEntity {
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/SimpleNHttpRequestHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/SimpleNHttpRequestHandler.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/SimpleNHttpRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/SimpleNHttpRequestHandler.java Tue Apr 24 17:15:42 2012
@@ -42,7 +42,7 @@ import org.apache.http.protocol.HttpCont
  *
  * @since 4.0
  *
- * @deprecated use {@link BasicAsyncRequestHandler}
+ * @deprecated (4.2) use {@link BasicAsyncRequestHandler}
  */
 @Deprecated
 @Immutable

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java Tue Apr 24 17:15:42 2012
@@ -94,7 +94,7 @@ import org.apache.http.protocol.HttpProc
  *
  * @since 4.0
  *
- * @deprecated use {@link HttpAsyncRequestExecutor} and {@link HttpAsyncRequester}
+ * @deprecated (4.2) use {@link HttpAsyncRequestExecutor} and {@link HttpAsyncRequester}
  */
 @Deprecated
 @ThreadSafe // provided injected dependencies are immutable or thread safe

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java Tue Apr 24 17:15:42 2012
@@ -105,7 +105,7 @@ import org.apache.http.util.EntityUtils;
  *
  * @since 4.0
  *
- * @deprecated use {@link HttpAsyncService}
+ * @deprecated (4.2) use {@link HttpAsyncService}
  */
 @Deprecated
 @ThreadSafe // provided injected dependencies are immutable or thread safe

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/BufferInfo.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/BufferInfo.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/BufferInfo.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/BufferInfo.java Tue Apr 24 17:15:42 2012
@@ -32,7 +32,7 @@ package org.apache.http.nio.util;
  *
  * @since 4.0
  *
- * @deprecated Use {@link org.apache.http.io.BufferInfo}
+ * @deprecated (4.1) Use {@link org.apache.http.io.BufferInfo}
  */
 @Deprecated
 public interface BufferInfo {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ContentOutputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ContentOutputBuffer.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ContentOutputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ContentOutputBuffer.java Tue Apr 24 17:15:42 2012
@@ -53,7 +53,7 @@ public interface ContentOutputBuffer {
     void reset();
 
     /**
-     * @deprecated No longer used.
+     * @deprecated (4.2) No longer used.
      */
     @Deprecated
     void flush() throws IOException;

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java Tue Apr 24 17:15:42 2012
@@ -42,7 +42,10 @@ import org.apache.http.annotation.NotThr
 @NotThreadSafe
 public class ByteArrayEntity extends AbstractHttpEntity implements Cloneable {
 
-    @Deprecated // 4.1.2
+    /**
+     * @deprecated (4.2)
+     */
+    @Deprecated
     protected final byte[] content;
     private final byte[] b;
     private final int off, len;

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HTTP.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HTTP.java?rev=1329866&r1=1329865&r2=1329866&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HTTP.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HTTP.java Tue Apr 24 17:15:42 2012
@@ -69,27 +69,60 @@ public final class HTTP {
     public static final Charset DEF_CONTENT_CHARSET = Consts.ISO_8859_1;
     public static final Charset DEF_PROTOCOL_CHARSET = Consts.ASCII;
     
-    @Deprecated // 4.2
+    /**
+     * @deprecated (4.2)
+     */
+    @Deprecated
     public static final String UTF_8 = "UTF-8";
-    @Deprecated // 4.2
+    /**
+     * @deprecated (4.2)
+     */
+    @Deprecated
     public static final String UTF_16 = "UTF-16";
-    @Deprecated // 4.2
+    /**
+     * @deprecated (4.2)
+     */
+    @Deprecated
     public static final String US_ASCII = "US-ASCII";
-    @Deprecated // 4.2
+    /**
+     * @deprecated (4.2)
+     */
+    @Deprecated
     public static final String ASCII = "ASCII";
-    @Deprecated // 4.2
+    /**
+     * @deprecated (4.2)
+     */
+    @Deprecated
     public static final String ISO_8859_1 = "ISO-8859-1";
-    @Deprecated // 4.2
+    /**
+     * @deprecated (4.2)
+     */
+    @Deprecated
     public static final String DEFAULT_CONTENT_CHARSET = ISO_8859_1;
-    @Deprecated // 4.2
+    /**
+     * @deprecated (4.2)
+     */
+    @Deprecated
     public static final String DEFAULT_PROTOCOL_CHARSET = US_ASCII;
-    @Deprecated // 4.2
+    /**
+     * @deprecated (4.2)
+     */
+    @Deprecated
     public final static String OCTET_STREAM_TYPE = "application/octet-stream";
-    @Deprecated // 4.2
+    /**
+     * @deprecated (4.2)
+     */
+    @Deprecated
     public final static String PLAIN_TEXT_TYPE = "text/plain";
-    @Deprecated // 4.2
+    /**
+     * @deprecated (4.2)
+     */
+    @Deprecated
     public final static String CHARSET_PARAM = "; charset=";
-    @Deprecated // 4.2
+    /**
+     * @deprecated (4.2)
+     */
+    @Deprecated
     public final static String DEFAULT_CONTENT_TYPE = OCTET_STREAM_TYPE;
 
     public static boolean isWhitespace(char ch) {



Mime
View raw message