hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r937477 [4/9] - in /httpcomponents/httpcore/trunk/httpcore-nio/src: main/java/org/apache/http/impl/nio/ main/java/org/apache/http/impl/nio/codecs/ main/java/org/apache/http/impl/nio/reactor/ main/java/org/apache/http/impl/nio/ssl/ main/java...
Date Fri, 23 Apr 2010 19:11:57 GMT
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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -32,7 +32,7 @@ import java.io.IOException;
 import org.apache.http.HttpException;
 
 /**
- * Abstract server-side HTTP protocol handler.   
+ * Abstract server-side HTTP protocol handler.
  *
  * @since 4.0
  */
@@ -40,71 +40,71 @@ public interface NHttpServiceHandler {
 
     /**
      * Triggered when a new incoming connection is created.
-     * 
+     *
      * @param conn new incoming connection HTTP connection.
      */
     void connected(NHttpServerConnection conn);
-    
+
     /**
      * Triggered when a new HTTP request is received. The connection
      * passed as a parameter to this method is guaranteed to return
      * a valid HTTP request object.
      * <p/>
-     * If the request received encloses a request entity this method will 
-     * be followed a series of 
+     * If the request received encloses a request entity this method will
+     * be followed a series of
      * {@link #inputReady(NHttpServerConnection, ContentDecoder)} calls
      * to transfer the request content.
-     * 
+     *
      * @see NHttpServerConnection
-     * 
+     *
      * @param conn HTTP connection that contains a new HTTP request
      */
     void requestReceived(NHttpServerConnection conn);
 
     /**
      * Triggered when the underlying channel is ready for reading a
-     * new portion of the request entity through the corresponding 
-     * content decoder. 
+     * new portion of the request entity through the corresponding
+     * content decoder.
      * <p/>
      * If the content consumer is unable to process the incoming content,
-     * input event notifications can be temporarily suspended using 
+     * input event notifications can be temporarily suspended using
      * {@link IOControl} interface.
-     * 
+     *
      * @see NHttpServerConnection
      * @see ContentDecoder
      * @see IOControl
-     *  
+     *
      * @param conn HTTP connection that can produce a new portion of the
      * incoming request content.
      * @param decoder The content decoder to use to read content.
      */
     void inputReady(NHttpServerConnection conn, ContentDecoder decoder);
-    
+
     /**
-     * Triggered when the connection is ready to accept a new HTTP response. 
-     * The protocol handler does not have to submit a response if it is not 
+     * Triggered when the connection is ready to accept a new HTTP response.
+     * The protocol handler does not have to submit a response if it is not
      * ready.
-     * 
+     *
      * @see NHttpServerConnection
-     * 
+     *
      * @param conn HTTP connection that contains an HTTP response
      */
     void responseReady(NHttpServerConnection conn);
 
     /**
      * Triggered when the underlying channel is ready for writing a
-     * next portion of the response entity through the corresponding 
-     * content encoder. 
+     * next portion of the response entity through the corresponding
+     * content encoder.
      * <p/>
      * If the content producer is unable to generate the outgoing content,
-     * output event notifications can be temporarily suspended using 
+     * output event notifications can be temporarily suspended using
      * {@link IOControl} interface.
-     * 
+     *
      * @see NHttpServerConnection
      * @see ContentEncoder
      * @see IOControl
-     *  
-     * @param conn HTTP connection that can accommodate a new portion 
+     *
+     * @param conn HTTP connection that can accommodate a new portion
      * of the outgoing response content.
      * @param encoder The content encoder to use to write content.
      */
@@ -113,16 +113,16 @@ public interface NHttpServiceHandler {
     /**
      * Triggered when an I/O error occurs while reading from or writing
      * to the underlying channel.
-     * 
+     *
      * @param conn HTTP connection that caused an I/O error
      * @param ex I/O exception
      */
     void exception(NHttpServerConnection conn, IOException ex);
-    
+
     /**
-     * Triggered when an HTTP protocol violation occurs while receiving 
+     * Triggered when an HTTP protocol violation occurs while receiving
      * an HTTP request.
-     * 
+     *
      * @param conn HTTP connection that caused an HTTP protocol violation
      * @param ex HTTP protocol violation exception
      */
@@ -131,16 +131,16 @@ public interface NHttpServiceHandler {
     /**
      * Triggered when no input is detected on this connection over the
      * maximum period of inactivity.
-     * 
+     *
      * @param conn HTTP connection that caused timeout condition.
      */
     void timeout(NHttpServerConnection conn);
-    
+
     /**
      * Triggered when the connection is closed.
-     * 
+     *
      * @param conn closed HTTP connection.
      */
     void closed(NHttpServerConnection conn);
-        
+
 }

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -81,9 +81,9 @@ public class BufferingNHttpEntity extend
 
     /**
      * Obtains entity's content as {@link InputStream}.
-     * 
+     *
      *  @throws IllegalStateException if content of the entity has not been
-     *    fully received or has already been consumed. 
+     *    fully received or has already been consumed.
      */
     @Override
     public InputStream getContent() throws IOException {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ByteArrayNIOEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ByteArrayNIOEntity.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ByteArrayNIOEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ByteArrayNIOEntity.java Fri Apr 23 19:11:53 2010
@@ -35,12 +35,12 @@ import org.apache.http.HttpEntity;
 import org.apache.http.entity.ByteArrayEntity;
 
 /**
- * An entity whose content is retrieved from a byte array. In addition to the 
- * standard {@link HttpEntity} interface this class also implements NIO specific 
+ * An entity whose content is retrieved from a byte array. In addition to the
+ * standard {@link HttpEntity} interface this class also implements NIO specific
  * {@link HttpNIOEntity}.
  *
  * @deprecated Use {@link NByteArrayEntity}
- * 
+ *
  * @since 4.0
  */
 @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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -34,7 +34,7 @@ import org.apache.http.nio.ContentDecode
 import org.apache.http.nio.IOControl;
 
 /**
- * A non-blocking {@link HttpEntity} that allows content to be streamed from a 
+ * A non-blocking {@link HttpEntity} that allows content to be streamed from a
  * {@link ContentDecoder}.
  *
  * @since 4.0
@@ -43,10 +43,10 @@ public interface ConsumingNHttpEntity ex
 
     /**
      * Notification that content is available to be read from the decoder.
-     * {@link IOControl} instance passed as a parameter to the method can be 
-     * used to suspend input events if the entity is temporarily unable to 
-     * allocate more storage to accommodate all incoming content. 
-     * 
+     * {@link IOControl} instance passed as a parameter to the method can be
+     * used to suspend input events if the entity is temporarily unable to
+     * allocate more storage to accommodate all incoming content.
+     *
      * @param decoder content decoder.
      * @param ioctrl I/O control of the underlying connection.
      */

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -48,7 +48,7 @@ public class ConsumingNHttpEntityTemplat
     private final ContentListener contentListener;
 
     public ConsumingNHttpEntityTemplate(
-            final HttpEntity httpEntity, 
+            final HttpEntity httpEntity,
             final ContentListener contentListener) {
         super(httpEntity);
         this.contentListener = contentListener;
@@ -75,7 +75,7 @@ public class ConsumingNHttpEntityTemplat
 
     /**
      * This method is equivalent to the {@link #finish()} method.
-     * <br/> 
+     * <br/>
      * TODO: The name of this method is misnomer. It will be renamed to
      * #finish() in the next major release.
      */

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentBufferEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentBufferEntity.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentBufferEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentBufferEntity.java Fri Apr 23 19:11:53 2010
@@ -33,18 +33,18 @@ import org.apache.http.entity.BasicHttpE
 import org.apache.http.nio.util.ContentInputBuffer;
 
 /**
- * HTTP entity wrapper whose content is provided by a 
- * {@link ContentInputBuffer}. 
+ * HTTP entity wrapper whose content is provided by a
+ * {@link ContentInputBuffer}.
  *
  * @since 4.0
  */
 public class ContentBufferEntity extends BasicHttpEntity {
 
     private HttpEntity wrappedEntity;
-    
+
     /**
      * Creates new instance of ContentBufferEntity.
-     * 
+     *
      * @param entity the original entity.
      * @param buffer the content buffer.
      */
@@ -76,5 +76,5 @@ public class ContentBufferEntity extends
     public Header getContentEncoding() {
         return this.wrappedEntity.getContentEncoding();
     }
-    
+
 }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentInputStream.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentInputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentInputStream.java Fri Apr 23 19:11:53 2010
@@ -34,14 +34,14 @@ import org.apache.http.io.BufferInfo;
 import org.apache.http.nio.util.ContentInputBuffer;
 
 /**
- * {@link InputStream} adaptor for {@link ContentInputBuffer}. 
+ * {@link InputStream} adaptor for {@link ContentInputBuffer}.
  *
  * @since 4.0
  */
 public class ContentInputStream extends InputStream {
 
     private final ContentInputBuffer buffer;
-    
+
     public ContentInputStream(final ContentInputBuffer buffer) {
         super();
         if (buffer == null) {
@@ -49,7 +49,7 @@ public class ContentInputStream extends 
         }
         this.buffer = buffer;
     }
-    
+
     @Override
     public int available() throws IOException {
         if (this.buffer instanceof BufferInfo) {
@@ -63,7 +63,7 @@ public class ContentInputStream extends 
     public int read(final byte[] b, int off, int len) throws IOException {
         return this.buffer.read(b, off, len);
     }
-    
+
     @Override
     public int read(final byte[] b) throws IOException {
         if (b == null) {
@@ -71,7 +71,7 @@ public class ContentInputStream extends 
         }
         return this.buffer.read(b, 0, b.length);
     }
-    
+
     @Override
     public int read() throws IOException {
         return this.buffer.read();
@@ -85,5 +85,5 @@ public class ContentInputStream extends 
         }
         super.close();
     }
-    
+
 }
\ No newline at end of file

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -41,11 +41,11 @@ public interface ContentListener {
 
     /**
      * Notification that content is available to be read from the decoder.
-     * 
+     *
      * @param decoder content decoder.
      * @param ioctrl I/O control of the underlying connection.
      */
-    void contentAvailable(ContentDecoder decoder, IOControl ioctrl) 
+    void contentAvailable(ContentDecoder decoder, IOControl ioctrl)
         throws IOException;
 
     /**

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentOutputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentOutputStream.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentOutputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ContentOutputStream.java Fri Apr 23 19:11:53 2010
@@ -40,7 +40,7 @@ import org.apache.http.nio.util.ContentO
 public class ContentOutputStream extends OutputStream {
 
     private final ContentOutputBuffer buffer;
-    
+
     public ContentOutputStream(final ContentOutputBuffer buffer) {
         super();
         if (buffer == null) {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/FileNIOEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/FileNIOEntity.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/FileNIOEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/FileNIOEntity.java Fri Apr 23 19:11:53 2010
@@ -36,12 +36,12 @@ import org.apache.http.HttpEntity;
 import org.apache.http.entity.FileEntity;
 
 /**
- * An entity whose content is retrieved from from a file. In addition to the standard 
- * {@link HttpEntity} interface this class also implements NIO specific 
+ * An entity whose content is retrieved from from a file. In addition to the standard
+ * {@link HttpEntity} interface this class also implements NIO specific
  * {@link HttpNIOEntity}.
  *
  * @deprecated Use {@link NFileEntity}
- * 
+ *
  * @since 4.0
  */
 @Deprecated

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/HttpNIOEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/HttpNIOEntity.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/HttpNIOEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/HttpNIOEntity.java Fri Apr 23 19:11:53 2010
@@ -34,12 +34,12 @@ import org.apache.http.HttpEntity;
 
 /**
  * @deprecated Use {@link ProducingNHttpEntity}
- * 
+ *
  * @since 4.0
  */
 @Deprecated
 public interface HttpNIOEntity extends HttpEntity  {
 
     ReadableByteChannel getChannel() throws IOException;
-    
+
 }

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -39,7 +39,7 @@ import org.apache.http.nio.IOControl;
 import org.apache.http.nio.protocol.AsyncNHttpServiceHandler;
 
 /**
- * A simple self contained, repeatable non-blocking entity that retrieves 
+ * A simple self contained, repeatable non-blocking entity that retrieves
  * its content from a byte array.
  *
  * @see AsyncNHttpServiceHandler

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -41,9 +41,9 @@ import org.apache.http.nio.FileContentEn
 import org.apache.http.nio.IOControl;
 
 /**
- * A self contained, repeatable non-blocking entity that retrieves its content 
- * from a file. This class is mostly used to stream large files of different 
- * types, so one needs to supply the content type of the file to make sure 
+ * A self contained, repeatable non-blocking entity that retrieves its content
+ * from a file. This class is mostly used to stream large files of different
+ * types, so one needs to supply the content type of the file to make sure
  * the content can be correctly recognized and processed by the recipient.
  *
  * @since 4.0
@@ -60,11 +60,11 @@ public class NFileEntity extends Abstrac
      * with the given content type. If <code>useFileChannels</code> is set to
      * <code>true</code>, the entity will try to use {@link FileContentEncoder}
      * interface to stream file content directly from the file channel.
-     * 
+     *
      * @param file the source file.
      * @param contentType the content type of the file.
      * @param useFileChannels flag whether the direct transfer from the file
-     *   channel should be attempted. 
+     *   channel should be attempted.
      */
     public NFileEntity(final File file, final String contentType, boolean useFileChannels) {
         if (file == null) {

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -40,8 +40,8 @@ import org.apache.http.nio.ContentEncode
 import org.apache.http.nio.IOControl;
 
 /**
- * {@link ProducingNHttpEntity} compatibility adaptor for blocking HTTP 
- * entities. 
+ * {@link ProducingNHttpEntity} compatibility adaptor for blocking HTTP
+ * entities.
  *
  * @since 4.0
  */
@@ -58,7 +58,7 @@ public class NHttpEntityWrapper
     }
 
     /**
-     * This method throws {@link UnsupportedOperationException}. 
+     * This method throws {@link UnsupportedOperationException}.
      */
     @Override
     public InputStream getContent() throws IOException, UnsupportedOperationException {
@@ -71,7 +71,7 @@ public class NHttpEntityWrapper
     }
 
     /**
-     * This method throws {@link UnsupportedOperationException}. 
+     * This method throws {@link UnsupportedOperationException}.
      */
     @Override
     public void writeTo(OutputStream out) throws IOException, UnsupportedOperationException {
@@ -80,7 +80,7 @@ public class NHttpEntityWrapper
 
     /**
      * This method is equivalent to the {@link #finish()} method.
-     * <br/> 
+     * <br/>
      * TODO: The name of this method is misnomer. It will be renamed to
      * #finish() in the next major release.
      */
@@ -95,7 +95,7 @@ public class NHttpEntityWrapper
         int i = this.channel.read(this.buffer);
         this.buffer.flip();
         encoder.write(this.buffer);
-        boolean buffering = this.buffer.hasRemaining(); 
+        boolean buffering = this.buffer.hasRemaining();
         this.buffer.compact();
         if (i == -1 && !buffering) {
             encoder.complete();

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -41,7 +41,7 @@ import org.apache.http.nio.protocol.Asyn
 import org.apache.http.protocol.HTTP;
 
 /**
- * A simple, self contained, repeatable non-blocking entity that retrieves 
+ * A simple, self contained, repeatable non-blocking entity that retrieves
  * its content from a {@link String} object.
  *
  * @see AsyncNHttpServiceHandler

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -34,7 +34,7 @@ import org.apache.http.nio.ContentEncode
 import org.apache.http.nio.IOControl;
 
 /**
- * An {@link HttpEntity} that can stream content out into a 
+ * An {@link HttpEntity} that can stream content out into a
  * {@link ContentEncoder}.
  *
  * @since 4.0
@@ -42,14 +42,14 @@ import org.apache.http.nio.IOControl;
 public interface ProducingNHttpEntity extends HttpEntity {
 
     /**
-     * Notification that content should be written to the encoder. 
-     * {@link IOControl} instance passed as a parameter to the method can be 
-     * used to suspend output events if the entity is temporarily unable to 
+     * Notification that content should be written to the encoder.
+     * {@link IOControl} instance passed as a parameter to the method can be
+     * used to suspend output events if the entity is temporarily unable to
      * produce more content.
      * <p>
      * When all content is finished, this <b>MUST</b> call {@link ContentEncoder#complete()}.
      * Failure to do so could result in the entity never being written.
-     * 
+     *
      * @param encoder content encoder.
      * @param ioctrl I/O control of the underlying connection.
      */

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/StringNIOEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/StringNIOEntity.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/StringNIOEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/StringNIOEntity.java Fri Apr 23 19:11:53 2010
@@ -36,19 +36,19 @@ import org.apache.http.HttpEntity;
 import org.apache.http.entity.StringEntity;
 
 /**
- * An entity whose content is retrieved from a string. In addition to the 
- * standard {@link HttpEntity} interface this class also implements NIO specific 
+ * An entity whose content is retrieved from a string. In addition to the
+ * standard {@link HttpEntity} interface this class also implements NIO specific
  * {@link HttpNIOEntity}.
  *
  * @deprecated Use {@link NStringEntity}
- * 
+ *
  * @since 4.0
  */
 @Deprecated
 public class StringNIOEntity extends StringEntity implements HttpNIOEntity {
 
     public StringNIOEntity(
-            final String s, 
+            final String s,
             String charset) throws UnsupportedEncodingException {
         super(s, charset);
     }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/package.html
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/package.html?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/package.html (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/package.html Fri Apr 23 19:11:53 2010
@@ -34,15 +34,15 @@ Representations for non-blocking HTTP me
 
 An {@link org.apache.http.HttpEntity entity} is the optional content of a
 {@link org.apache.http.HttpMessage message}.
-This package provides a basic selection of entity implementations 
+This package provides a basic selection of entity implementations
 that can obtain content from
 {@link org.apache.http.nio.entity.NByteArrayEntity byte array},
 {@link org.apache.http.nio.entity.NStringEntity string},
 {@link org.apache.http.nio.entity.NFileEntity file}, or through an
 {@link org.apache.http.nio.entity.NHttpEntityWrapper compatibility adaptor}
 for blocking HTTP entities.
-If a message is received from an open non-blocking connection, usually it is 
-represented by 
+If a message is received from an open non-blocking connection, usually it is
+represented by
 {@link org.apache.http.nio.entity.ConsumingNHttpEntity consuming} entity.
 </body>
 </html>

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/package.html
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/package.html?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/package.html (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/package.html Fri Apr 23 19:11:53 2010
@@ -33,7 +33,7 @@
 The core HTTP components based on non-blocking I/O model (HttpCore NIO).
 <p/>
 This layer defines interfaces for transferring HTTP messages over non-blocking
-HTTP connections and protocol handlers for processing HTTP messages 
+HTTP connections and protocol handlers for processing HTTP messages
 asynchronously.
 </body>
 </html>

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -29,7 +29,7 @@ package org.apache.http.nio.params;
 
 /**
  * Parameter names for I/O reactors.
- * 
+ *
  * @since 4.0
  */
 public interface NIOReactorPNames {
@@ -41,7 +41,7 @@ public interface NIOReactorPNames {
      * This parameter expects a value of type {@link Integer}.
      * </p>
      */
-    public static final String CONTENT_BUFFER_SIZE = "http.nio.content-buffer-size"; 
+    public static final String CONTENT_BUFFER_SIZE = "http.nio.content-buffer-size";
 
     /**
      * Determines the time interval in milliseconds at which the
@@ -50,7 +50,7 @@ public interface NIOReactorPNames {
      * This parameter expects a value of type {@link Long}.
      * </p>
      */
-    public static final String SELECT_INTERVAL = "http.nio.select-interval"; 
+    public static final String SELECT_INTERVAL = "http.nio.select-interval";
 
     /**
      * Determines the grace period the I/O reactors are expected to block
@@ -59,14 +59,14 @@ public interface NIOReactorPNames {
      * This parameter expects a value of type {@link Long}.
      * </p>
      */
-    public static final String GRACE_PERIOD = "http.nio.grace-period"; 
+    public static final String GRACE_PERIOD = "http.nio.grace-period";
 
     /**
      * Determines whether interestOps() queueing is enabled for the I/O reactors.
      * <p>
      * This parameter expects a value of type {@link Boolean}.
      * </p>
-     * 
+     *
      * @since 4.1
      */
     public static final String INTEREST_OPS_QUEUEING = "http.nio.interest-ops-queueing";

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -34,7 +34,7 @@ import org.apache.http.params.HttpParams
  * @since 4.0
  */
 public class NIOReactorParamBean extends HttpAbstractParamBean {
-    
+
     public NIOReactorParamBean (final HttpParams params) {
         super(params);
     }
@@ -46,5 +46,5 @@ public class NIOReactorParamBean extends
     public void setSelectInterval (long selectInterval) {
         NIOReactorParams.setSelectInterval(params, selectInterval);
     }
-    
+
 }

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -31,7 +31,7 @@ import org.apache.http.params.HttpParams
 
 /**
  * Utility class for accessing I/O reactor parameters in {@link HttpParams}.
- * 
+ *
  * @since 4.0
  *
  * @see NIOReactorPNames
@@ -45,7 +45,7 @@ public final class NIOReactorParams impl
     /**
      * Obtains the value of {@link NIOReactorPNames#CONTENT_BUFFER_SIZE} parameter.
      * If not set, defaults to <code>4096</code>.
-     * 
+     *
      * @param params HTTP parameters.
      * @return content buffer size.
      */
@@ -55,9 +55,9 @@ public final class NIOReactorParams impl
         }
         return params.getIntParameter(CONTENT_BUFFER_SIZE, 4096);
     }
-    
+
     /**
-     * Sets value of the {@link NIOReactorPNames#CONTENT_BUFFER_SIZE} parameter. 
+     * Sets value of the {@link NIOReactorPNames#CONTENT_BUFFER_SIZE} parameter.
      *
      * @param params HTTP parameters.
      * @param size content buffer size.
@@ -72,7 +72,7 @@ public final class NIOReactorParams impl
     /**
      * Obtains the value of {@link NIOReactorPNames#SELECT_INTERVAL} parameter.
      * If not set, defaults to <code>1000</code>.
-     * 
+     *
      * @param params HTTP parameters.
      * @return I/O select interval in milliseconds.
      */
@@ -82,9 +82,9 @@ public final class NIOReactorParams impl
         }
         return params.getLongParameter(SELECT_INTERVAL, 1000);
     }
-    
+
     /**
-     * Sets value of the {@link NIOReactorPNames#SELECT_INTERVAL} parameter. 
+     * Sets value of the {@link NIOReactorPNames#SELECT_INTERVAL} parameter.
      *
      * @param params HTTP parameters.
      * @param ms I/O select interval in milliseconds.
@@ -99,7 +99,7 @@ public final class NIOReactorParams impl
     /**
      * Obtains the value of {@link NIOReactorPNames#GRACE_PERIOD} parameter.
      * If not set, defaults to <code>500</code>.
-     * 
+     *
      * @param params HTTP parameters.
      * @return shutdown grace period in milliseconds.
      */
@@ -109,9 +109,9 @@ public final class NIOReactorParams impl
         }
         return params.getLongParameter(GRACE_PERIOD, 500);
     }
-    
+
     /**
-     * Sets value of the {@link NIOReactorPNames#GRACE_PERIOD} parameter. 
+     * Sets value of the {@link NIOReactorPNames#GRACE_PERIOD} parameter.
      *
      * @param params HTTP parameters.
      * @param ms shutdown grace period in milliseconds.
@@ -126,10 +126,10 @@ public final class NIOReactorParams impl
     /**
      * Obtains the value of {@link NIOReactorPNames#INTEREST_OPS_QUEUEING} parameter.
      * If not set, defaults to <code>false</code>.
-     * 
+     *
      * @param params HTTP parameters.
      * @return interest ops queuing flag.
-     * 
+     *
      * @since 4.1
      */
     public static boolean getInterestOpsQueueing(final HttpParams params) {
@@ -140,11 +140,11 @@ public final class NIOReactorParams impl
     }
 
     /**
-     * Sets value of the {@link NIOReactorPNames#INTEREST_OPS_QUEUEING} parameter. 
+     * Sets value of the {@link NIOReactorPNames#INTEREST_OPS_QUEUEING} parameter.
      *
      * @param params HTTP parameters.
      * @param interestOpsQueueing interest ops queuing.
-     * 
+     *
      * @since 4.1
      */
     public static void setInterestOpsQueueing(

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -55,33 +55,33 @@ import org.apache.http.protocol.HttpCont
 import org.apache.http.protocol.HttpProcessor;
 
 /**
- * Fully asynchronous HTTP client side protocol handler that implements the 
- * essential requirements of the HTTP protocol for the server side message 
- * processing as described by RFC 2616. It is capable of executing HTTP requests 
- * with nearly constant memory footprint. Only HTTP message heads are stored in 
- * memory, while content of message bodies is streamed directly from the entity 
+ * Fully asynchronous HTTP client side protocol handler that implements the
+ * essential requirements of the HTTP protocol for the server side message
+ * processing as described by RFC 2616. It is capable of executing HTTP requests
+ * with nearly constant memory footprint. Only HTTP message heads are stored in
+ * memory, while content of message bodies is streamed directly from the entity
  * to the underlying channel (and vice versa) using {@link ConsumingNHttpEntity}
  * and {@link ProducingNHttpEntity} interfaces.
- * 
- * When using this implementation, it is important to ensure that entities 
- * supplied for writing implement {@link ProducingNHttpEntity}. Doing so will allow 
- * the entity to be written out asynchronously. If entities supplied for writing 
- * do not implement the {@link ProducingNHttpEntity} interface, a delegate is 
- * added that buffers the entire contents in memory. Additionally, the 
- * buffering might take place in the I/O dispatch thread, which could cause I/O 
- * to block temporarily. For best results, one must ensure that all entities 
- * set on {@link HttpRequest}s from {@link NHttpRequestExecutionHandler} 
+ *
+ * When using this implementation, it is important to ensure that entities
+ * supplied for writing implement {@link ProducingNHttpEntity}. Doing so will allow
+ * the entity to be written out asynchronously. If entities supplied for writing
+ * do not implement the {@link ProducingNHttpEntity} interface, a delegate is
+ * added that buffers the entire contents in memory. Additionally, the
+ * buffering might take place in the I/O dispatch thread, which could cause I/O
+ * to block temporarily. For best results, one must ensure that all entities
+ * set on {@link HttpRequest}s from {@link NHttpRequestExecutionHandler}
  * implement {@link ProducingNHttpEntity}.
- * 
- * If incoming responses enclose a content entity, 
- * {@link NHttpRequestExecutionHandler} are expected to return a 
- * {@link ConsumingNHttpEntity} for reading the content. After the entity is 
- * finished reading the data, 
- * {@link NHttpRequestExecutionHandler#handleResponse(HttpResponse, HttpContext)} 
- * method is called to process the response. 
+ *
+ * If incoming responses enclose a content entity,
+ * {@link NHttpRequestExecutionHandler} are expected to return a
+ * {@link ConsumingNHttpEntity} for reading the content. After the entity is
+ * finished reading the data,
+ * {@link NHttpRequestExecutionHandler#handleResponse(HttpResponse, HttpContext)}
+ * method is called to process the response.
  * <p>
- * The following parameters can be used to customize the behavior of this 
- * class: 
+ * The following parameters can be used to customize the behavior of this
+ * class:
  * <ul>
  *  <li>{@link org.apache.http.params.CoreProtocolPNames#WAIT_FOR_CONTINUE}</li>
  * </ul>
@@ -165,7 +165,7 @@ public class AsyncNHttpClientHandler ext
             this.eventListener.fatalIOException(ex, conn);
         }
     }
-    
+
     public void requestReady(final NHttpClientConnection conn) {
         HttpContext context = conn.getContext();
 
@@ -186,10 +186,10 @@ public class AsyncNHttpClientHandler ext
 
             context.setAttribute(ExecutionContext.HTTP_REQUEST, request);
             this.httpProcessor.process(request, context);
-            
+
             HttpEntityEnclosingRequest entityReq = null;
             HttpEntity entity = null;
-            
+
             if (request instanceof HttpEntityEnclosingRequest) {
                 entityReq = (HttpEntityEnclosingRequest) request;
                 entity = entityReq.getEntity();
@@ -200,7 +200,7 @@ public class AsyncNHttpClientHandler ext
             } else if (entity != null) {
                 connState.setProducingEntity(new NHttpEntityWrapper(entity));
             }
-            
+
             connState.setRequest(request);
             conn.submitRequest(request);
             connState.setOutputState(ClientConnState.REQUEST_SENT);
@@ -302,7 +302,7 @@ public class AsyncNHttpClientHandler ext
             }
 
             context.setAttribute(ExecutionContext.HTTP_RESPONSE, response);
-            
+
             if (!canResponseHaveBody(request, response)) {
                 conn.resetInput();
                 response.setEntity(null);
@@ -368,7 +368,7 @@ public class AsyncNHttpClientHandler ext
     }
 
     /**
-     * @throws IOException - not thrown currently 
+     * @throws IOException - not thrown currently
      */
     private void continueRequest(
             final NHttpClientConnection conn,
@@ -393,7 +393,7 @@ public class AsyncNHttpClientHandler ext
     }
 
     /**
-     * @throws HttpException - not thrown currently 
+     * @throws HttpException - not thrown currently
      */
     private void processResponse(
             final NHttpClientConnection conn,

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -64,34 +64,34 @@ import org.apache.http.protocol.HttpProc
 import org.apache.http.util.EncodingUtils;
 
 /**
- * Fully asynchronous HTTP server side protocol handler implementation that 
- * implements the essential requirements of the HTTP protocol for the server 
- * side message processing as described by RFC 2616. It is capable of processing 
- * HTTP requests with nearly constant memory footprint. Only HTTP message heads 
- * are stored in memory, while content of message bodies is streamed directly 
- * from the entity to the underlying channel (and vice versa) 
+ * Fully asynchronous HTTP server side protocol handler implementation that
+ * implements the essential requirements of the HTTP protocol for the server
+ * side message processing as described by RFC 2616. It is capable of processing
+ * HTTP requests with nearly constant memory footprint. Only HTTP message heads
+ * are stored in memory, while content of message bodies is streamed directly
+ * from the entity to the underlying channel (and vice versa)
  * {@link ConsumingNHttpEntity} and {@link ProducingNHttpEntity} interfaces.
  * <p/>
- * When using this class, it is important to ensure that entities supplied for 
- * writing implement {@link ProducingNHttpEntity}. Doing so will allow the 
- * entity to be written out asynchronously. If entities supplied for writing do 
- * not implement {@link ProducingNHttpEntity}, a delegate is added that buffers 
- * the entire contents in memory. Additionally, the buffering might take place 
- * in the I/O thread, which could cause I/O to block temporarily. For best 
- * results, ensure that all entities set on {@link HttpResponse}s from  
+ * When using this class, it is important to ensure that entities supplied for
+ * writing implement {@link ProducingNHttpEntity}. Doing so will allow the
+ * entity to be written out asynchronously. If entities supplied for writing do
+ * not implement {@link ProducingNHttpEntity}, a delegate is added that buffers
+ * the entire contents in memory. Additionally, the buffering might take place
+ * in the I/O thread, which could cause I/O to block temporarily. For best
+ * results, ensure that all entities set on {@link HttpResponse}s from
  * {@link NHttpRequestHandler}s implement {@link ProducingNHttpEntity}.
  * <p/>
- * If incoming requests enclose a content entity, {@link NHttpRequestHandler}s 
- * are expected to return a {@link ConsumingNHttpEntity} for reading the 
+ * If incoming requests enclose a content entity, {@link NHttpRequestHandler}s
+ * are expected to return a {@link ConsumingNHttpEntity} for reading the
  * content. After the entity is finished reading the data,
  * {@link NHttpRequestHandler#handle(HttpRequest, HttpResponse, NHttpResponseTrigger, HttpContext)}
  * is called to generate a response.
  * <p/>
- * Individual {@link NHttpRequestHandler}s do not have to submit a response 
- * immediately. They can defer transmission of the HTTP response back to the 
- * client without blocking the I/O thread and to delegate the processing the 
- * HTTP request to a worker thread. The worker thread in its turn can use an 
- * instance of {@link NHttpResponseTrigger} passed as a parameter to submit 
+ * Individual {@link NHttpRequestHandler}s do not have to submit a response
+ * immediately. They can defer transmission of the HTTP response back to the
+ * client without blocking the I/O thread and to delegate the processing the
+ * HTTP request to a worker thread. The worker thread in its turn can use an
+ * instance of {@link NHttpResponseTrigger} passed as a parameter to submit
  * a response as at a later point of time once the response becomes available.
  *
  * @see ConsumingNHttpEntity
@@ -423,7 +423,7 @@ public class AsyncNHttpServiceHandler ex
     }
 
     /**
-     * @throws HttpException - not thrown currently 
+     * @throws HttpException - not thrown currently
      */
     private void processRequest(
             final NHttpServerConnection conn,

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -49,21 +49,21 @@ import org.apache.http.protocol.HttpCont
 import org.apache.http.protocol.HttpProcessor;
 
 /**
- * Client protocol handler implementation that provides compatibility with the 
- * blocking I/O by storing the full content of HTTP messages in memory. 
+ * Client protocol handler implementation that provides compatibility with the
+ * blocking I/O by storing the full content of HTTP messages in memory.
  * The {@link HttpRequestExecutionHandler#handleResponse(HttpResponse, HttpContext)}
- * method will fire only when the entire message content has been read into a 
- * in-memory buffer. Please note that request execution / response processing 
- * take place the main I/O thread and therefore 
+ * method will fire only when the entire message content has been read into a
+ * in-memory buffer. Please note that request execution / response processing
+ * take place the main I/O thread and therefore
  * {@link HttpRequestExecutionHandler} methods should not block indefinitely.
  * <p>
- * When using this protocol handler {@link HttpEntity}'s content can be 
- * generated / consumed using standard {@link InputStream}/{@link OutputStream} 
+ * When using this protocol handler {@link HttpEntity}'s content can be
+ * generated / consumed using standard {@link InputStream}/{@link OutputStream}
  * classes.
  * <p>
- * IMPORTANT: This protocol handler should be used only when dealing with HTTP 
+ * IMPORTANT: This protocol handler should be used only when dealing with HTTP
  * messages that are known to be limited in length.
- * 
+ *
  *
  * @since 4.0
  */
@@ -72,7 +72,7 @@ public class BufferingHttpClientHandler 
     private final AsyncNHttpClientHandler asyncHandler;
 
     public BufferingHttpClientHandler(
-            final HttpProcessor httpProcessor, 
+            final HttpProcessor httpProcessor,
             final HttpRequestExecutionHandler execHandler,
             final ConnectionReuseStrategy connStrategy,
             final ByteBufferAllocator allocator,
@@ -84,16 +84,16 @@ public class BufferingHttpClientHandler 
                 allocator,
                 params);
     }
-    
+
     public BufferingHttpClientHandler(
-            final HttpProcessor httpProcessor, 
+            final HttpProcessor httpProcessor,
             final HttpRequestExecutionHandler execHandler,
             final ConnectionReuseStrategy connStrategy,
             final HttpParams params) {
-        this(httpProcessor, execHandler, connStrategy, 
+        this(httpProcessor, execHandler, connStrategy,
                 new HeapByteBufferAllocator(), params);
     }
-    
+
     public void setEventListener(final EventListener eventListener) {
         this.asyncHandler.setEventListener(eventListener);
     }
@@ -133,11 +133,11 @@ public class BufferingHttpClientHandler 
     public void timeout(final NHttpClientConnection conn) {
         this.asyncHandler.timeout(conn);
     }
-    
+
     static class ExecutionHandlerAdaptor implements NHttpRequestExecutionHandler {
-        
+
         private final HttpRequestExecutionHandler execHandler;
-        
+
         public ExecutionHandlerAdaptor(final HttpRequestExecutionHandler execHandler) {
             super();
             this.execHandler = execHandler;
@@ -153,9 +153,9 @@ public class BufferingHttpClientHandler 
         public HttpRequest submitRequest(final HttpContext context) {
             return this.execHandler.submitRequest(context);
         }
-        
+
         public ConsumingNHttpEntity responseEntity(
-                final HttpResponse response, 
+                final HttpResponse response,
                 final HttpContext context) throws IOException {
             return new BufferingNHttpEntity(
                     response.getEntity(),
@@ -163,11 +163,11 @@ public class BufferingHttpClientHandler 
         }
 
         public void handleResponse(
-                final HttpResponse response, 
+                final HttpResponse response,
                 final HttpContext context) throws IOException {
             this.execHandler.handleResponse(response, context);
         }
 
     }
-    
+
 }

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -54,19 +54,19 @@ import org.apache.http.protocol.HttpRequ
 import org.apache.http.protocol.HttpRequestHandlerResolver;
 
 /**
- * Service protocol handler implementations that provide compatibility with 
- * the blocking I/O by storing the full content of HTTP messages in memory. 
+ * Service protocol handler implementations that provide compatibility with
+ * the blocking I/O by storing the full content of HTTP messages in memory.
  * The {@link HttpRequestHandler#handle(HttpRequest, HttpResponse, HttpContext)}
- * method will fire only when the entire message content has been read into 
- * an in-memory buffer. Please note that request processing take place the 
- * main I/O thread and therefore individual HTTP request handlers should not 
- * block indefinitely. 
+ * method will fire only when the entire message content has been read into
+ * an in-memory buffer. Please note that request processing take place the
+ * main I/O thread and therefore individual HTTP request handlers should not
+ * block indefinitely.
  * <p>
- * When using this protocol handler {@link HttpEntity}'s content can be 
- * generated / consumed using standard {@link InputStream}/{@link OutputStream} 
+ * When using this protocol handler {@link HttpEntity}'s content can be
+ * generated / consumed using standard {@link InputStream}/{@link OutputStream}
  * classes.
  * <p>
- * IMPORTANT: This protocol handler should be used only when dealing with HTTP 
+ * IMPORTANT: This protocol handler should be used only when dealing with HTTP
  * messages that are known to be limited in length.
  *
  *

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -33,49 +33,49 @@ import org.apache.http.HttpException;
 import org.apache.http.nio.NHttpConnection;
 
 /**
- * Event listener used by the HTTP protocol layer to report fatal exceptions 
+ * Event listener used by the HTTP protocol layer to report fatal exceptions
  * and events that may need to be logged using a logging toolkit.
- * 
+ *
  * @since 4.0
  */
 public interface EventListener {
 
     /**
      * Triggered when an I/O error caused a connection to be terminated.
-     * 
-     * @param ex the I/O exception. 
+     *
+     * @param ex the I/O exception.
      * @param conn the connection.
      */
     void fatalIOException(IOException ex, NHttpConnection conn);
 
     /**
-     * Triggered when an HTTP protocol error caused a connection to be 
+     * Triggered when an HTTP protocol error caused a connection to be
      * terminated.
-     * 
-     * @param ex the protocol exception. 
+     *
+     * @param ex the protocol exception.
      * @param conn the connection.
      */
     void fatalProtocolException(HttpException ex, NHttpConnection conn);
 
     /**
      * Triggered when a new connection has been established.
-     * 
+     *
      * @param conn the connection.
      */
     void connectionOpen(NHttpConnection conn);
 
     /**
      * Triggered when a connection has been terminated.
-     * 
+     *
      * @param conn the connection.
      */
     void connectionClosed(NHttpConnection conn);
 
     /**
      * Triggered when a connection has timed out.
-     * 
+     *
      * @param conn the connection.
      */
     void connectionTimeout(NHttpConnection conn);
-    
+
 }

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -35,26 +35,26 @@ import org.apache.http.nio.reactor.Conne
 import org.apache.http.protocol.HttpContext;
 
 /**
- * HTTP request execution handler can be used by client-side protocol handlers 
- * to trigger the submission of a new HTTP request and the processing of an 
+ * HTTP request execution handler can be used by client-side protocol handlers
+ * to trigger the submission of a new HTTP request and the processing of an
  * HTTP response.
- * 
+ *
  *
  * @since 4.0
  */
 public interface HttpRequestExecutionHandler {
 
     /**
-     * Triggered when a new connection has been established and the 
-     * HTTP context needs to be initialized. 
-     * 
-     * <p>The attachment object is the same object which was passed 
-     * to the connecting I/O reactor when the connection request was 
+     * Triggered when a new connection has been established and the
+     * HTTP context needs to be initialized.
+     *
+     * <p>The attachment object is the same object which was passed
+     * to the connecting I/O reactor when the connection request was
      * made. The attachment may optionally contain some state information
      * required in order to correctly initialize the HTTP context.
-     * 
+     *
      * @see ConnectingIOReactor#connect
-     * 
+     *
      * @param context the actual HTTP context
      * @param attachment the object passed to the connecting I/O reactor
      *   upon the request for a new connection.
@@ -62,34 +62,34 @@ public interface HttpRequestExecutionHan
     void initalizeContext(HttpContext context, Object attachment);
 
     /**
-     * Triggered when the underlying connection is ready to send a new 
-     * HTTP request to the target host. This method may return 
+     * Triggered when the underlying connection is ready to send a new
+     * HTTP request to the target host. This method may return
      * <code>null</null> if the client is not yet ready to send a
      * request. In this case the connection will remain open and
      * can be activated at a later point.
-     * 
+     *
      * @param context the actual HTTP context
      * @return an HTTP request to be sent or <code>null</null> if no
      *   request needs to be sent
      */
     HttpRequest submitRequest(HttpContext context);
-    
+
     /**
      * Triggered when an HTTP response is ready to be processed.
-     * 
+     *
      * @param response the HTTP response to be processed
      * @param context the actual HTTP context
      */
-    void handleResponse(HttpResponse response, HttpContext context) 
+    void handleResponse(HttpResponse response, HttpContext context)
         throws IOException;
-    
+
     /**
      * Triggered when the connection is terminated. This event can be used
-     * to release objects stored in the context or perform some other kind 
+     * to release objects stored in the context or perform some other kind
      * of cleanup.
-     * 
+     *
      * @param context the actual HTTP context
      */
     void finalizeContext(HttpContext context);
-    
+
 }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpClientHandlerBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpClientHandlerBase.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpClientHandlerBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpClientHandlerBase.java Fri Apr 23 19:11:53 2010
@@ -39,7 +39,7 @@ import org.apache.http.protocol.HttpProc
 
 /**
  * @deprecated No longer used.
- * 
+ *
  * @since 4.0
  */
 @Deprecated

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -37,14 +37,14 @@ import org.apache.http.nio.entity.Consum
 import org.apache.http.protocol.HttpContext;
 
 /**
- * NHttpRequestHandler represents a routine for asynchronous processing of 
- * a specific group of non-blocking HTTP requests. Protocol handlers are 
- * designed to take care of protocol specific aspects, whereas individual 
- * request handlers are expected to take care of application specific HTTP 
- * processing. The main purpose of a request handler is to generate a response 
- * object with a content entity to be sent back to the client in response to 
+ * NHttpRequestHandler represents a routine for asynchronous processing of
+ * a specific group of non-blocking HTTP requests. Protocol handlers are
+ * designed to take care of protocol specific aspects, whereas individual
+ * request handlers are expected to take care of application specific HTTP
+ * processing. The main purpose of a request handler is to generate a response
+ * object with a content entity to be sent back to the client in response to
  * the given request
- * 
+ *
  * @since 4.0
  */
 public interface NHttpRequestHandler {
@@ -58,12 +58,12 @@ public interface NHttpRequestHandler {
      * After the entity is fully consumed,
      * {@link #handle(HttpRequest, HttpResponse, NHttpResponseTrigger, HttpContext)}
      * is called to notify a full request & entity are ready to be processed.
-     * 
+     *
      * @param request the entity enclosing request.
      * @param context the execution context.
      * @return non-blocking HTTP entity.
      * @throws IOException in case of an I/O error.
-     * @throws HttpException in case of HTTP protocol violation or a processing 
+     * @throws HttpException in case of HTTP protocol violation or a processing
      *   problem.
      */
     ConsumingNHttpEntity entityRequest(HttpEntityEnclosingRequest request,
@@ -71,20 +71,20 @@ public interface NHttpRequestHandler {
         throws HttpException, IOException;
 
     /**
-     * Initiates processing of the request. This method does not have to submit 
-     * a response immediately. It can defer transmission of the HTTP response 
-     * back to the client without blocking the I/O thread by delegating the 
-     * process of handling the HTTP request to a worker thread. The worker 
-     * thread in its turn can use the instance of {@link NHttpResponseTrigger} 
-     * passed as a parameter to submit a response as at a later point of time 
+     * Initiates processing of the request. This method does not have to submit
+     * a response immediately. It can defer transmission of the HTTP response
+     * back to the client without blocking the I/O thread by delegating the
+     * process of handling the HTTP request to a worker thread. The worker
+     * thread in its turn can use the instance of {@link NHttpResponseTrigger}
+     * passed as a parameter to submit a response as at a later point of time
      * once content of the response becomes available.
-     * 
+     *
      * @param request the HTTP request.
      * @param response the HTTP response.
      * @param trigger the response trigger.
      * @param context the HTTP execution context.
      * @throws IOException in case of an I/O error.
-     * @throws HttpException in case of HTTP protocol violation or a processing 
+     * @throws HttpException in case of HTTP protocol violation or a processing
      *   problem.
      */
     void handle(HttpRequest request, HttpResponse response,

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -41,9 +41,9 @@ import org.apache.http.protocol.UriPatte
  *   <li><code>&lt;uri&gt;*</code></li>
  * </ul>
  * <br>
- * This class can be used to resolve an instance of 
- * {@link NHttpRequestHandler} matching a particular request URI. Usually the 
- * resolved request handler will be used to process the request with the 
+ * This class can be used to resolve an instance of
+ * {@link NHttpRequestHandler} matching a particular request URI. Usually the
+ * resolved request handler will be used to process the request with the
  * specified request URI.
  *
  * @since 4.0
@@ -59,7 +59,7 @@ public class NHttpRequestHandlerRegistry
     /**
      * Registers the given {@link NHttpRequestHandler} as a handler for URIs
      * matching the given pattern.
-     * 
+     *
      * @param pattern the pattern to register the handler for.
      * @param handler the handler.
      */
@@ -69,7 +69,7 @@ public class NHttpRequestHandlerRegistry
 
     /**
      * Removes registered handler, if exists, for the given pattern.
-     *  
+     *
      * @param pattern the pattern to unregister the handler for.
      */
     public void unregister(final String pattern) {

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -28,9 +28,9 @@
 package org.apache.http.nio.protocol;
 
 /**
- * HttpRequestHandlerResolver can be used to resolve an instance of 
- * {@link NHttpRequestHandler} matching a particular request URI. Usually the 
- * resolved request handler will be used to process the request with the 
+ * HttpRequestHandlerResolver can be used to resolve an instance of
+ * {@link NHttpRequestHandler} matching a particular request URI. Usually the
+ * resolved request handler will be used to process the request with the
  * specified request URI.
  *
  * @since 4.0
@@ -39,7 +39,7 @@ public interface NHttpRequestHandlerReso
 
     /**
      * Looks up a handler matching the given request URI.
-     * 
+     *
      * @param requestURI the request URI
      * @return HTTP request handler or <code>null</code> if no match
      * is found.

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=937477&r1=937476&r2=937477&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 Fri Apr 23 19:11:53 2010
@@ -35,11 +35,11 @@ import org.apache.http.HttpResponse;
 /**
  * Callback interface to submit HTTP responses asynchronously.
  * <p/>
- * The {@link NHttpRequestHandler#handle(org.apache.http.HttpRequest, HttpResponse, NHttpResponseTrigger, org.apache.http.protocol.HttpContext)} 
- * method does not have to submit a response immediately. It can defer 
- * transmission of the HTTP response back to the client without blocking the 
- * I/O thread by delegating the process of handling the HTTP request to a worker 
- * thread. The worker thread in its turn can use the instance of 
+ * The {@link NHttpRequestHandler#handle(org.apache.http.HttpRequest, HttpResponse, NHttpResponseTrigger, org.apache.http.protocol.HttpContext)}
+ * method does not have to submit a response immediately. It can defer
+ * transmission of the HTTP response back to the client without blocking the
+ * I/O thread by delegating the process of handling the HTTP request to a worker
+ * thread. The worker thread in its turn can use the instance of
  * {@link NHttpResponseTrigger} passed as a parameter to submit a response as at
  * a later point of time once the response becomes available.
  *
@@ -48,7 +48,7 @@ import org.apache.http.HttpResponse;
 public interface NHttpResponseTrigger {
 
     /**
-     * Submits a response to be sent back to the client as a result of 
+     * Submits a response to be sent back to the client as a result of
      * processing of the request.
      */
     void submitResponse(HttpResponse response);

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpServiceHandlerBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpServiceHandlerBase.java?rev=937477&r1=937476&r2=937477&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpServiceHandlerBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpServiceHandlerBase.java Fri Apr 23 19:11:53 2010
@@ -42,7 +42,7 @@ import org.apache.http.protocol.HttpRequ
 
 /**
  * @deprecated No longer used.
- * 
+ *
  * @since 4.0
  */
 @Deprecated
@@ -72,7 +72,7 @@ public abstract class NHttpServiceHandle
             final HttpResponseFactory responseFactory,
             final ConnectionReuseStrategy connStrategy,
             final HttpParams params) {
-        this(httpProcessor, responseFactory, connStrategy, 
+        this(httpProcessor, responseFactory, connStrategy,
                 new HeapByteBufferAllocator(), params);
     }
 



Mime
View raw message