hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1715545 [4/10] - in /httpcomponents/httpcore/trunk: httpcore-ab/ httpcore-ab/src/main/java/org/apache/hc/ httpcore-ab/src/main/java/org/apache/hc/core5/ httpcore-ab/src/main/java/org/apache/hc/core5/http/ httpcore-ab/src/main/java/org/apac...
Date Sat, 21 Nov 2015 16:53:03 GMT
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/AbstractAsyncRequestConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/AbstractAsyncRequestConsumer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/AbstractAsyncRequestConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/AbstractAsyncRequestConsumer.java Sat Nov 21 16:52:56 2015
@@ -24,18 +24,18 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.entity.ContentType;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * Abstract {@link HttpAsyncRequestConsumer} implementation that relieves its

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/AbstractAsyncResponseConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/AbstractAsyncResponseConsumer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/AbstractAsyncResponseConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/AbstractAsyncResponseConsumer.java Sat Nov 21 16:52:56 2015
@@ -24,18 +24,18 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpException;
-import org.apache.http.HttpResponse;
-import org.apache.http.entity.ContentType;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * Abstract {@link HttpAsyncResponseConsumer} implementation that relieves its

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncClientExchangeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncClientExchangeHandler.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncClientExchangeHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncClientExchangeHandler.java Sat Nov 21 16:52:56 2015
@@ -25,26 +25,26 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.IOException;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.http.ConnectionClosedException;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.concurrent.BasicFuture;
-import org.apache.http.concurrent.FutureCallback;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.nio.NHttpClientConnection;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpCoreContext;
-import org.apache.http.protocol.HttpProcessor;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.ConnectionClosedException;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.concurrent.BasicFuture;
+import org.apache.hc.core5.http.concurrent.FutureCallback;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.nio.NHttpClientConnection;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
+import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Basic implementation of {@link HttpAsyncClientExchangeHandler} that executes

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestConsumer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestConsumer.java Sat Nov 21 16:52:56 2015
@@ -24,21 +24,21 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.IOException;
 
-import org.apache.http.ContentTooLongException;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpRequest;
-import org.apache.http.entity.ContentType;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.nio.entity.ContentBufferEntity;
-import org.apache.http.nio.util.HeapByteBufferAllocator;
-import org.apache.http.nio.util.SimpleInputBuffer;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.util.Asserts;
+import org.apache.hc.core5.http.ContentTooLongException;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.nio.entity.ContentBufferEntity;
+import org.apache.hc.core5.http.nio.util.HeapByteBufferAllocator;
+import org.apache.hc.core5.http.nio.util.SimpleInputBuffer;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.util.Asserts;
 
 /**
  * Basic implementation of {@link HttpAsyncRequestConsumer}. Please note that

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestHandler.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestHandler.java Sat Nov 21 16:52:56 2015
@@ -25,16 +25,16 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.IOException;
 
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpRequestHandler;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.protocol.HttpRequestHandler;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Basic implementation of {@link HttpAsyncRequestHandler} that delegates

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestProducer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncRequestProducer.java Sat Nov 21 16:52:56 2015
@@ -24,19 +24,19 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.IOException;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.nio.entity.EntityAsyncContentProducer;
-import org.apache.http.nio.entity.HttpAsyncContentProducer;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.nio.entity.EntityAsyncContentProducer;
+import org.apache.hc.core5.http.nio.entity.HttpAsyncContentProducer;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Basic implementation of {@link HttpAsyncRequestProducer}. The producer

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncResponseConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncResponseConsumer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncResponseConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncResponseConsumer.java Sat Nov 21 16:52:56 2015
@@ -24,21 +24,21 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.IOException;
 
-import org.apache.http.ContentTooLongException;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.entity.ContentType;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.nio.entity.ContentBufferEntity;
-import org.apache.http.nio.util.HeapByteBufferAllocator;
-import org.apache.http.nio.util.SimpleInputBuffer;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.util.Asserts;
+import org.apache.hc.core5.http.ContentTooLongException;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.nio.entity.ContentBufferEntity;
+import org.apache.hc.core5.http.nio.util.HeapByteBufferAllocator;
+import org.apache.hc.core5.http.nio.util.SimpleInputBuffer;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.util.Asserts;
 
 /**
  * Basic implementation of {@link HttpAsyncResponseConsumer}. Please note that

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncResponseProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncResponseProducer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncResponseProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/BasicAsyncResponseProducer.java Sat Nov 21 16:52:56 2015
@@ -25,18 +25,18 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.IOException;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.nio.entity.EntityAsyncContentProducer;
-import org.apache.http.nio.entity.HttpAsyncContentProducer;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.nio.entity.EntityAsyncContentProducer;
+import org.apache.hc.core5.http.nio.entity.HttpAsyncContentProducer;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Basic implementation of {@link HttpAsyncResponseProducer}. The producer

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/ErrorResponseProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/ErrorResponseProducer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/ErrorResponseProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/ErrorResponseProducer.java Sat Nov 21 16:52:56 2015
@@ -25,19 +25,19 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.IOException;
 
-import org.apache.http.HeaderElements;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpResponse;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.nio.entity.EntityAsyncContentProducer;
-import org.apache.http.nio.entity.HttpAsyncContentProducer;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.HeaderElements;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.nio.entity.EntityAsyncContentProducer;
+import org.apache.hc.core5.http.nio.entity.HttpAsyncContentProducer;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 class ErrorResponseProducer implements HttpAsyncResponseProducer {
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncClientExchangeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncClientExchangeHandler.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncClientExchangeHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncClientExchangeHandler.java Sat Nov 21 16:52:56 2015
@@ -25,19 +25,19 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.Closeable;
 import java.io.IOException;
 
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.concurrent.Cancellable;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.concurrent.Cancellable;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * {@code HttpAsyncClientExchangeHandler} represents a callback interface whose
@@ -45,7 +45,7 @@ import org.apache.http.protocol.HttpCont
  * on the client side.
  * <p>
  * Individual {@code HttpAsyncClientExchangeHandler} are expected to make use of
- * a {@link org.apache.http.protocol.HttpProcessor} to generate mandatory protocol
+ * a {@link org.apache.hc.core5.http.protocol.HttpProcessor} to generate mandatory protocol
  * headers for all outgoing messages and apply common, cross-cutting message
  * transformations to all incoming and outgoing messages.
  * {@code HttpAsyncClientExchangeHandler}s can delegate implementation

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncExchange.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncExchange.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncExchange.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncExchange.java Sat Nov 21 16:52:56 2015
@@ -25,11 +25,11 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.concurrent.Cancellable;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.concurrent.Cancellable;
 
 /**
  * {@code HttpAsyncExchange} represents a server-side HTTP message exchange
@@ -57,9 +57,9 @@ public interface HttpAsyncExchange {
 
     /**
      * Submits the default HTTP response and completed the message exchange.
-     * If the response encloses an {@link org.apache.http.HttpEntity} instance
+     * If the response encloses an {@link org.apache.hc.core5.http.HttpEntity} instance
      * the entity is also expected to implement the
-     * {@link org.apache.http.nio.entity.HttpAsyncContentProducer }
+     * {@link org.apache.hc.core5.http.nio.entity.HttpAsyncContentProducer }
      * interface for efficient content streaming to a non-blocking HTTP
      * connection.
      *

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncExpectationVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncExpectationVerifier.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncExpectationVerifier.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncExpectationVerifier.java Sat Nov 21 16:52:56 2015
@@ -25,12 +25,12 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.IOException;
 
-import org.apache.http.HttpException;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * {@code HttpAsyncExpectationVerifier} defines a strategy to verify whether

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestConsumer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestConsumer.java Sat Nov 21 16:52:56 2015
@@ -24,16 +24,16 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.Closeable;
 import java.io.IOException;
 
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * {@code HttpAsyncRequestConsumer} is a callback interface whose methods
@@ -49,7 +49,7 @@ public interface HttpAsyncRequestConsume
      * Invoked when a HTTP request message is received. Please note
      * that the {@link #consumeContent(ContentDecoder, IOControl)} method
      * will be invoked only for if the request message implements
-     * {@link org.apache.http.HttpEntityEnclosingRequest} interface and
+     * {@link org.apache.hc.core5.http.HttpEntityEnclosingRequest} interface and
      * has a content entity enclosed.
      *
      * @param request HTTP request message.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestExecutor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestExecutor.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestExecutor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestExecutor.java Sat Nov 21 16:52:56 2015
@@ -25,37 +25,37 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.IOException;
 import java.net.SocketTimeoutException;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.apache.http.ConnectionClosedException;
-import org.apache.http.ConnectionReuseStrategy;
-import org.apache.http.ExceptionLogger;
-import org.apache.http.Header;
-import org.apache.http.HeaderElements;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpException;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.HttpVersion;
-import org.apache.http.ProtocolException;
-import org.apache.http.ProtocolVersion;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.impl.DefaultConnectionReuseStrategy;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.NHttpClientConnection;
-import org.apache.http.nio.NHttpClientEventHandler;
-import org.apache.http.nio.NHttpConnection;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.util.Args;
-import org.apache.http.util.Asserts;
+import org.apache.hc.core5.http.ConnectionClosedException;
+import org.apache.hc.core5.http.ConnectionReuseStrategy;
+import org.apache.hc.core5.http.ExceptionLogger;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HeaderElements;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.HttpVersion;
+import org.apache.hc.core5.http.ProtocolException;
+import org.apache.hc.core5.http.ProtocolVersion;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.NHttpClientConnection;
+import org.apache.hc.core5.http.nio.NHttpClientEventHandler;
+import org.apache.hc.core5.http.nio.NHttpConnection;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.Asserts;
 
 /**
  * {@code HttpAsyncRequestExecutor} is a fully asynchronous HTTP client side
@@ -72,7 +72,7 @@ import org.apache.http.util.Asserts;
  * be used to facilitate initiation of asynchronous HTTP request execution.
  * <p>
  * Individual {@code HttpAsyncClientExchangeHandler} are expected to make use of
- * a {@link org.apache.http.protocol.HttpProcessor} to generate mandatory protocol
+ * a {@link org.apache.hc.core5.http.protocol.HttpProcessor} to generate mandatory protocol
  * headers for all outgoing messages and apply common, cross-cutting message
  * transformations to all incoming and outgoing messages.
  * {@code HttpAsyncClientExchangeHandler}s can delegate implementation of
@@ -101,7 +101,7 @@ public class HttpAsyncRequestExecutor im
      * @param exceptionLogger Exception logger. If {@code null}
      *   {@link ExceptionLogger#NO_OP} will be used. Please note that the exception
      *   logger will be only used to log I/O exception thrown while closing
-     *   {@link java.io.Closeable} objects (such as {@link org.apache.http.HttpConnection}).
+     *   {@link java.io.Closeable} objects (such as {@link org.apache.hc.core5.http.HttpConnection}).
      *
      * @since 5.0
      */
@@ -438,7 +438,7 @@ public class HttpAsyncRequestExecutor im
     /**
      * This method can be used to log I/O exception thrown while closing
      * {@link java.io.Closeable} objects (such as
-     * {@link org.apache.http.HttpConnection}}).
+     * {@link org.apache.hc.core5.http.HttpConnection}}).
      *
      * @param ex I/O exception thrown by {@link java.io.Closeable#close()}
      */

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestHandler.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestHandler.java Sat Nov 21 16:52:56 2015
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.IOException;
 
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * {@code HttpAsyncRequestHandler} represents a routine for asynchronous

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestHandlerMapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestHandlerMapper.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestHandlerMapper.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestHandlerMapper.java Sat Nov 21 16:52:56 2015
@@ -25,10 +25,10 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
-import org.apache.http.HttpRequest;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * {@code HttpAsyncRequestHandlerMapper} can be used to resolve an instance

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestProducer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequestProducer.java Sat Nov 21 16:52:56 2015
@@ -24,17 +24,17 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.Closeable;
 import java.io.IOException;
 
-import org.apache.http.HttpException;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * {@code HttpAsyncRequestProducer} is a callback interface whose methods
@@ -58,10 +58,10 @@ public interface HttpAsyncRequestProduce
 
     /**
      * Invoked to generate a HTTP request message head. The message is expected
-     * to implement the {@link org.apache.http.HttpEntityEnclosingRequest} interface
+     * to implement the {@link org.apache.hc.core5.http.HttpEntityEnclosingRequest} interface
      * if it is to enclose a content entity. The {@link #produceContent(
      * ContentEncoder, IOControl)} method will not be invoked if
-     * {@link org.apache.http.HttpEntityEnclosingRequest#getEntity()}
+     * {@link org.apache.hc.core5.http.HttpEntityEnclosingRequest#getEntity()}
      * returns {@code null}.
      *
      * @return HTTP request message.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequester.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequester.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequester.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncRequester.java Sat Nov 21 16:52:56 2015
@@ -24,26 +24,26 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.Future;
 
-import org.apache.http.ConnectionClosedException;
-import org.apache.http.ExceptionLogger;
-import org.apache.http.HttpHost;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.concurrent.BasicFuture;
-import org.apache.http.concurrent.FutureCallback;
-import org.apache.http.nio.NHttpClientConnection;
-import org.apache.http.pool.ConnPool;
-import org.apache.http.pool.PoolEntry;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpProcessor;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.ConnectionClosedException;
+import org.apache.hc.core5.http.ExceptionLogger;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.concurrent.BasicFuture;
+import org.apache.hc.core5.http.concurrent.FutureCallback;
+import org.apache.hc.core5.http.nio.NHttpClientConnection;
+import org.apache.hc.core5.http.pool.ConnPool;
+import org.apache.hc.core5.http.pool.PoolEntry;
+import org.apache.hc.core5.http.protocol.BasicHttpContext;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * {@code HttpAsyncRequester} is a utility class that can be used
@@ -66,7 +66,7 @@ public class HttpAsyncRequester {
      * @param exceptionLogger Exception logger. If {@code null}
      *   {@link ExceptionLogger#NO_OP} will be used. Please note that the exception
      *   logger will be only used to log I/O exception thrown while closing
-     *   {@link java.io.Closeable} objects (such as {@link org.apache.http.HttpConnection}).
+     *   {@link java.io.Closeable} objects (such as {@link org.apache.hc.core5.http.HttpConnection}).
      *
      * @since 4.4
      */
@@ -540,7 +540,7 @@ public class HttpAsyncRequester {
     /**
      * This method can be used to log I/O exception thrown while closing
      * {@link java.io.Closeable} objects (such as
-     * {@link org.apache.http.HttpConnection}}).
+     * {@link org.apache.hc.core5.http.HttpConnection}}).
      *
      * @param ex I/O exception thrown by {@link java.io.Closeable#close()}
      */

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncResponseConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncResponseConsumer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncResponseConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncResponseConsumer.java Sat Nov 21 16:52:56 2015
@@ -24,17 +24,17 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.Closeable;
 import java.io.IOException;
 
-import org.apache.http.HttpException;
-import org.apache.http.HttpResponse;
-import org.apache.http.concurrent.Cancellable;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.concurrent.Cancellable;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * {@code HttpAsyncResponseConsumer} is a callback interface whose methods

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncResponseProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncResponseProducer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncResponseProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncResponseProducer.java Sat Nov 21 16:52:56 2015
@@ -25,15 +25,15 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.Closeable;
 import java.io.IOException;
 
-import org.apache.http.HttpResponse;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 /**
  * {@code HttpAsyncResponseProducer} is a callback interface whose methods

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncService.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/HttpAsyncService.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.IOException;
 import java.net.SocketTimeoutException;
@@ -34,37 +34,37 @@ import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.http.ConnectionReuseStrategy;
-import org.apache.http.ExceptionLogger;
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpException;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpResponseFactory;
-import org.apache.http.HttpStatus;
-import org.apache.http.MethodNotSupportedException;
-import org.apache.http.NotImplementedException;
-import org.apache.http.ProtocolException;
-import org.apache.http.UnsupportedHttpVersionException;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.concurrent.Cancellable;
-import org.apache.http.entity.ContentType;
-import org.apache.http.impl.DefaultConnectionReuseStrategy;
-import org.apache.http.impl.DefaultHttpResponseFactory;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.NHttpConnection;
-import org.apache.http.nio.NHttpServerConnection;
-import org.apache.http.nio.NHttpServerEventHandler;
-import org.apache.http.nio.entity.NStringEntity;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpCoreContext;
-import org.apache.http.protocol.HttpProcessor;
-import org.apache.http.util.Args;
-import org.apache.http.util.Asserts;
+import org.apache.hc.core5.http.ConnectionReuseStrategy;
+import org.apache.hc.core5.http.ExceptionLogger;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpResponseFactory;
+import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.MethodNotSupportedException;
+import org.apache.hc.core5.http.NotImplementedException;
+import org.apache.hc.core5.http.ProtocolException;
+import org.apache.hc.core5.http.UnsupportedHttpVersionException;
+import org.apache.hc.core5.http.annotation.Immutable;
+import org.apache.hc.core5.http.concurrent.Cancellable;
+import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
+import org.apache.hc.core5.http.impl.DefaultHttpResponseFactory;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.NHttpConnection;
+import org.apache.hc.core5.http.nio.NHttpServerConnection;
+import org.apache.hc.core5.http.nio.NHttpServerEventHandler;
+import org.apache.hc.core5.http.nio.entity.NStringEntity;
+import org.apache.hc.core5.http.protocol.BasicHttpContext;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
+import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.Asserts;
 
 /**
  * {@code HttpAsyncService} is a fully asynchronous HTTP server side protocol
@@ -144,7 +144,7 @@ public class HttpAsyncService implements
      * @param exceptionLogger Exception logger. If {@code null}
      *   {@link ExceptionLogger#NO_OP} will be used. Please note that the exception
      *   logger will be only used to log I/O exception thrown while closing
-     *   {@link java.io.Closeable} objects (such as {@link org.apache.http.HttpConnection}).
+     *   {@link java.io.Closeable} objects (such as {@link org.apache.hc.core5.http.HttpConnection}).
      *
      * @since 4.4
      */
@@ -188,7 +188,7 @@ public class HttpAsyncService implements
      * @param exceptionLogger Exception logger. If {@code null}
      *   {@link ExceptionLogger#NO_OP} will be used. Please note that the exception
      *   logger will be only used to log I/O exception thrown while closing
-     *   {@link java.io.Closeable} objects (such as {@link org.apache.http.HttpConnection}).
+     *   {@link java.io.Closeable} objects (such as {@link org.apache.hc.core5.http.HttpConnection}).
      *
      * @since 4.4
      */
@@ -476,7 +476,7 @@ public class HttpAsyncService implements
     /**
      * This method can be used to log I/O exception thrown while closing
      * {@link java.io.Closeable} objects (such as
-     * {@link org.apache.http.HttpConnection}).
+     * {@link org.apache.hc.core5.http.HttpConnection}).
      *
      * @param ex I/O exception thrown by {@link java.io.Closeable#close()}
      */

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/MessageState.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/MessageState.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/MessageState.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/MessageState.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 enum MessageState {
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/NullRequestConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/NullRequestConsumer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/NullRequestConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/NullRequestConsumer.java Sat Nov 21 16:52:56 2015
@@ -25,15 +25,15 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-import org.apache.http.HttpRequest;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 class NullRequestConsumer implements HttpAsyncRequestConsumer<Object> {
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/NullRequestHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/NullRequestHandler.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/NullRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/NullRequestHandler.java Sat Nov 21 16:52:56 2015
@@ -25,14 +25,14 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.entity.ContentType;
-import org.apache.http.nio.entity.NStringEntity;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.nio.entity.NStringEntity;
+import org.apache.hc.core5.http.protocol.HttpContext;
 
 class NullRequestHandler implements HttpAsyncRequestHandler<Object> {
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/Pipelined.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/Pipelined.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/Pipelined.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/Pipelined.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/PipeliningClientExchangeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/PipeliningClientExchangeHandler.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/PipeliningClientExchangeHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/PipeliningClientExchangeHandler.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -37,24 +37,24 @@ import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.http.ConnectionClosedException;
-import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.concurrent.BasicFuture;
-import org.apache.http.concurrent.FutureCallback;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.nio.NHttpClientConnection;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpCoreContext;
-import org.apache.http.protocol.HttpProcessor;
-import org.apache.http.util.Args;
-import org.apache.http.util.Asserts;
+import org.apache.hc.core5.http.ConnectionClosedException;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.concurrent.BasicFuture;
+import org.apache.hc.core5.http.concurrent.FutureCallback;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.nio.NHttpClientConnection;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
+import org.apache.hc.core5.http.protocol.HttpProcessor;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.Asserts;
 
 /**
- * Pipelining implementation of {@link org.apache.http.nio.protocol.HttpAsyncClientExchangeHandler}
+ * Pipelining implementation of {@link org.apache.hc.core5.http.nio.protocol.HttpAsyncClientExchangeHandler}
  * that executes a series of pipelined HTTP requests.
  *
  * @param <T> the result type of request execution.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/UriHttpAsyncRequestHandlerMapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/UriHttpAsyncRequestHandlerMapper.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/UriHttpAsyncRequestHandlerMapper.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/UriHttpAsyncRequestHandlerMapper.java Sat Nov 21 16:52:56 2015
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;
 
-import org.apache.http.HttpRequest;
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.UriPatternMatcher;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.protocol.UriPatternMatcher;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * Maintains a map of HTTP request handlers keyed by a request URI pattern.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/package-info.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/protocol/package-info.java Sat Nov 21 16:52:56 2015
@@ -29,4 +29,4 @@
  * Core HTTP protocol execution framework and HTTP protocol handlers
  * for asynchronous, event driven communication.
  */
-package org.apache.http.nio.protocol;
+package org.apache.hc.core5.http.nio.protocol;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ConnectingIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ConnectingIOReactor.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ConnectingIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ConnectingIOReactor.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.reactor;
+package org.apache.hc.core5.http.nio.reactor;
 
 import java.net.SocketAddress;
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/EventMask.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/EventMask.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/EventMask.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/EventMask.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.reactor;
+package org.apache.hc.core5.http.nio.reactor;
 
 import java.nio.channels.SelectionKey;
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOEventDispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOEventDispatch.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOEventDispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOEventDispatch.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.reactor;
+package org.apache.hc.core5.http.nio.reactor;
 
 /**
  * IOEventDispatch interface is used by I/O reactors to notify clients of I/O

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactor.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactor.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.reactor;
+package org.apache.hc.core5.http.nio.reactor;
 
 import java.io.IOException;
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorException.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorException.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorException.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.reactor;
+package org.apache.hc.core5.http.nio.reactor;
 
 import java.io.IOException;
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorExceptionHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorExceptionHandler.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorExceptionHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorExceptionHandler.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.reactor;
+package org.apache.hc.core5.http.nio.reactor;
 
 import java.io.IOException;
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorStatus.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorStatus.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorStatus.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOReactorStatus.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.reactor;
+package org.apache.hc.core5.http.nio.reactor;
 
 /**
  * IOReactorStatus represents an internal status of an I/O reactor.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOSession.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOSession.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOSession.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/IOSession.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.reactor;
+package org.apache.hc.core5.http.nio.reactor;
 
 import java.net.SocketAddress;
 import java.nio.channels.ByteChannel;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ListenerEndpoint.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ListenerEndpoint.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ListenerEndpoint.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ListenerEndpoint.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.reactor;
+package org.apache.hc.core5.http.nio.reactor;
 
 import java.io.IOException;
 import java.net.SocketAddress;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ListeningIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ListeningIOReactor.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ListeningIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ListeningIOReactor.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.reactor;
+package org.apache.hc.core5.http.nio.reactor;
 
 import java.io.IOException;
 import java.net.SocketAddress;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionBufferStatus.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionBufferStatus.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionBufferStatus.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionBufferStatus.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.reactor;
+package org.apache.hc.core5.http.nio.reactor;
 
 /**
  * SessionBufferStatus interface is intended to query the status of session

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionInputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionInputBuffer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionInputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionInputBuffer.java Sat Nov 21 16:52:56 2015
@@ -25,14 +25,14 @@
  *
  */
 
-package org.apache.http.nio.reactor;
+package org.apache.hc.core5.http.nio.reactor;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
 
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * Session input buffer for non-blocking connections. This interface facilitates
@@ -163,7 +163,7 @@ public interface SessionInputBuffer {
      *
      * @throws java.nio.charset.CharacterCodingException in case a character encoding or decoding
      *   error occurs.
-     * @throws org.apache.http.MessageConstraintException in case a message constraint violation.
+     * @throws org.apache.hc.core5.http.MessageConstraintException in case a message constraint violation.
      */
     boolean readLine(CharArrayBuffer dst, boolean endOfStream) throws IOException;
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionOutputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionOutputBuffer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionOutputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionOutputBuffer.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.reactor;
+package org.apache.hc.core5.http.nio.reactor;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -33,7 +33,7 @@ import java.nio.channels.ReadableByteCha
 import java.nio.channels.WritableByteChannel;
 import java.nio.charset.CharacterCodingException;
 
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.hc.core5.http.util.CharArrayBuffer;
 
 /**
  * Session output buffer for non-blocking connections. This interface

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequest.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequest.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequest.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.reactor;
+package org.apache.hc.core5.http.nio.reactor;
 
 import java.io.IOException;
 import java.net.SocketAddress;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequestCallback.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequestCallback.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequestCallback.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SessionRequestCallback.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.reactor;
+package org.apache.hc.core5.http.nio.reactor;
 
 /**
  * SessionRequestCallback interface can be used to get notifications of

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SocketAccessor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SocketAccessor.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SocketAccessor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/SocketAccessor.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.reactor;
+package org.apache.hc.core5.http.nio.reactor;
 
 import java.net.Socket;
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/package-info.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/package-info.java Sat Nov 21 16:52:56 2015
@@ -34,4 +34,4 @@
  in the sense that it defines only what is required within the scope
  of HTTP protocol.
  */
-package org.apache.http.nio.reactor;
+package org.apache.hc.core5.http.nio.reactor;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/PermanentSSLBufferManagementStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/PermanentSSLBufferManagementStrategy.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/PermanentSSLBufferManagementStrategy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/PermanentSSLBufferManagementStrategy.java Sat Nov 21 16:52:56 2015
@@ -24,10 +24,10 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.reactor.ssl;
+package org.apache.hc.core5.http.nio.reactor.ssl;
 
 import java.nio.ByteBuffer;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * A {@link SSLBufferManagementStrategy} that never releases the underlying buffer.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/ReleasableSSLBufferManagementStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/ReleasableSSLBufferManagementStrategy.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/ReleasableSSLBufferManagementStrategy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/ReleasableSSLBufferManagementStrategy.java Sat Nov 21 16:52:56 2015
@@ -24,10 +24,10 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.reactor.ssl;
+package org.apache.hc.core5.http.nio.reactor.ssl;
 
 import java.nio.ByteBuffer;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * A {@link SSLBufferManagementStrategy} that releases the underlying buffer when deactivated.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLBuffer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLBuffer.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.reactor.ssl;
+package org.apache.hc.core5.http.nio.reactor.ssl;
 
 import java.nio.ByteBuffer;
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLBufferManagementStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLBufferManagementStrategy.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLBufferManagementStrategy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLBufferManagementStrategy.java Sat Nov 21 16:52:56 2015
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.reactor.ssl;
+package org.apache.hc.core5.http.nio.reactor.ssl;
 
 /**
  * Encapsulates logic to manager SSL input/output buffers.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLIOSession.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLIOSession.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLIOSession.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLIOSession.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.reactor.ssl;
+package org.apache.hc.core5.http.nio.reactor.ssl;
 
 import java.io.IOException;
 import java.net.Socket;
@@ -42,14 +42,14 @@ import javax.net.ssl.SSLEngineResult.Sta
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLSession;
 
-import org.apache.http.HttpHost;
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.nio.reactor.EventMask;
-import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.reactor.SessionBufferStatus;
-import org.apache.http.nio.reactor.SocketAccessor;
-import org.apache.http.util.Args;
-import org.apache.http.util.Asserts;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.http.nio.reactor.EventMask;
+import org.apache.hc.core5.http.nio.reactor.IOSession;
+import org.apache.hc.core5.http.nio.reactor.SessionBufferStatus;
+import org.apache.hc.core5.http.nio.reactor.SocketAccessor;
+import org.apache.hc.core5.http.util.Args;
+import org.apache.hc.core5.http.util.Asserts;
 
 /**
  * {@code SSLIOSession} is a decorator class intended to transparently extend

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLMode.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLMode.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLMode.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLMode.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.reactor.ssl;
+package org.apache.hc.core5.http.nio.reactor.ssl;
 
 /**
  * @since 4.2

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLSetupHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLSetupHandler.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLSetupHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/SSLSetupHandler.java Sat Nov 21 16:52:56 2015
@@ -25,13 +25,13 @@
  *
  */
 
-package org.apache.http.nio.reactor.ssl;
+package org.apache.hc.core5.http.nio.reactor.ssl;
 
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLSession;
 
-import org.apache.http.nio.reactor.IOSession;
+import org.apache.hc.core5.http.nio.reactor.IOSession;
 
 /**
  * Callback interface that can be used to customize various aspects of

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/package-info.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/package-info.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/package-info.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/reactor/ssl/package-info.java Sat Nov 21 16:52:56 2015
@@ -28,4 +28,4 @@
 /**
  * TLS/SSL support for asynchronous, event driven communication.
  */
-package org.apache.http.nio.reactor.ssl;
+package org.apache.hc.core5.http.nio.reactor.ssl;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/ByteBufferAllocator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/ByteBufferAllocator.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/ByteBufferAllocator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/ByteBufferAllocator.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.util;
+package org.apache.hc.core5.http.nio.util;
 
 import java.nio.ByteBuffer;
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/ContentInputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/ContentInputBuffer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/ContentInputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/ContentInputBuffer.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.util;
+package org.apache.hc.core5.http.nio.util;
 
 import java.io.IOException;
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/ContentOutputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/ContentOutputBuffer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/ContentOutputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/ContentOutputBuffer.java Sat Nov 21 16:52:56 2015
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.http.nio.util;
+package org.apache.hc.core5.http.nio.util;
 
 import java.io.IOException;
 

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/DirectByteBufferAllocator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/DirectByteBufferAllocator.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/DirectByteBufferAllocator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/DirectByteBufferAllocator.java Sat Nov 21 16:52:56 2015
@@ -25,11 +25,11 @@
  *
  */
 
-package org.apache.http.nio.util;
+package org.apache.hc.core5.http.nio.util;
 
 import java.nio.ByteBuffer;
 
-import org.apache.http.annotation.Immutable;
+import org.apache.hc.core5.http.annotation.Immutable;
 
 /**
  * Allocates {@link ByteBuffer} instances using

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/ExpandableBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/ExpandableBuffer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/ExpandableBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/ExpandableBuffer.java Sat Nov 21 16:52:56 2015
@@ -25,12 +25,12 @@
  *
  */
 
-package org.apache.http.nio.util;
+package org.apache.hc.core5.http.nio.util;
 
 import java.nio.ByteBuffer;
 
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.util.Args;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.util.Args;
 
 /**
  * A buffer that expand its capacity on demand using {@link ByteBufferAllocator}

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/HeapByteBufferAllocator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/HeapByteBufferAllocator.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/HeapByteBufferAllocator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/HeapByteBufferAllocator.java Sat Nov 21 16:52:56 2015
@@ -25,11 +25,11 @@
  *
  */
 
-package org.apache.http.nio.util;
+package org.apache.hc.core5.http.nio.util;
 
 import java.nio.ByteBuffer;
 
-import org.apache.http.annotation.Immutable;
+import org.apache.hc.core5.http.annotation.Immutable;
 
 /**
  * Allocates {@link ByteBuffer} instances using

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/SharedInputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/SharedInputBuffer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/SharedInputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/SharedInputBuffer.java Sat Nov 21 16:52:56 2015
@@ -24,16 +24,16 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.util;
+package org.apache.hc.core5.http.nio.util;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.IOControl;
+import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.nio.IOControl;
 
 /**
  * Implementation of the {@link ContentInputBuffer} interface that can be
@@ -41,8 +41,8 @@ import org.apache.http.nio.IOControl;
  * a worker thread.
  * <p>
  * The I/O dispatch thread is expect to transfer data from {@link ContentDecoder} to the buffer
- *   by calling {@link #consumeContent(org.apache.http.nio.ContentDecoder,
- *   org.apache.http.nio.IOControl)}.
+ *   by calling {@link #consumeContent(org.apache.hc.core5.http.nio.ContentDecoder,
+ *   org.apache.hc.core5.http.nio.IOControl)}.
  * <p>
  * The worker thread is expected to read the data from the buffer by calling
  *   {@link #read()} or {@link #read(byte[], int, int)} methods.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/SharedOutputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/SharedOutputBuffer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/SharedOutputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/SharedOutputBuffer.java Sat Nov 21 16:52:56 2015
@@ -24,17 +24,17 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.util;
+package org.apache.hc.core5.http.nio.util;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.IOControl;
-import org.apache.http.util.Asserts;
+import org.apache.hc.core5.http.annotation.ThreadSafe;
+import org.apache.hc.core5.http.nio.ContentEncoder;
+import org.apache.hc.core5.http.nio.IOControl;
+import org.apache.hc.core5.http.util.Asserts;
 
 /**
  * Implementation of the {@link ContentOutputBuffer} interface that can be
@@ -42,8 +42,8 @@ import org.apache.http.util.Asserts;
  * a worker thread.
  * <p>
  * The I/O dispatch thread is expected to transfer data from the buffer to
- *   {@link ContentEncoder} by calling {@link #produceContent(org.apache.http.nio.ContentEncoder,
- *    org.apache.http.nio.IOControl)}.
+ *   {@link ContentEncoder} by calling {@link #produceContent(org.apache.hc.core5.http.nio.ContentEncoder,
+ *    org.apache.hc.core5.http.nio.IOControl)}.
  * <p>
  * The worker thread is expected to write data to the buffer by calling
  * {@link #write(int)}, {@link #write(byte[], int, int)} or {@link #writeCompleted()}

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/SimpleInputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/SimpleInputBuffer.java?rev=1715545&r1=1715521&r2=1715545&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/SimpleInputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/hc/core5/http/nio/util/SimpleInputBuffer.java Sat Nov 21 16:52:56 2015
@@ -24,12 +24,12 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.http.nio.util;
+package org.apache.hc.core5.http.nio.util;
 
 import java.io.IOException;
 
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.nio.ContentDecoder;
+import org.apache.hc.core5.http.annotation.NotThreadSafe;
+import org.apache.hc.core5.http.nio.ContentDecoder;
 
 /**
  * Basic implementation of the {@link ContentInputBuffer} interface.




Mime
View raw message