hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r507471 - in /jakarta/httpcomponents/httpcore/trunk/module-nio/src: main/java/org/apache/http/nio/protocol/ main/java/org/apache/http/nio/util/ test/java/org/apache/http/nio/util/
Date Wed, 14 Feb 2007 10:33:41 GMT
Author: olegk
Date: Wed Feb 14 02:33:40 2007
New Revision: 507471

URL: http://svn.apache.org/viewvc?view=rev&rev=507471
Log:
Renamed a few classes; Fixed one broken test case

Added:
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SimpleInputBuffer.java
      - copied, changed from r507469, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/InputBuffer.java
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SimpleOutputBuffer.java
      - copied, changed from r507469, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/OutputBuffer.java
Removed:
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/InputBuffer.java
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/OutputBuffer.java
Modified:
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java

Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java?view=diff&rev=507471&r1=507470&r2=507471
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java
(original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java
Wed Feb 14 02:33:40 2007
@@ -51,8 +51,8 @@
 import org.apache.http.nio.NHttpClientHandler;
 import org.apache.http.nio.util.ContentInputBuffer;
 import org.apache.http.nio.util.ContentOutputBuffer;
-import org.apache.http.nio.util.InputBuffer;
-import org.apache.http.nio.util.OutputBuffer;
+import org.apache.http.nio.util.SimpleInputBuffer;
+import org.apache.http.nio.util.SimpleOutputBuffer;
 import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpExecutionContext;
@@ -130,8 +130,8 @@
         initialize(conn, attachment);
         
         ClientConnState connState = new ClientConnState(
-                new InputBuffer(2048),
-                new OutputBuffer(2048)); 
+                new SimpleInputBuffer(2048),
+                new SimpleOutputBuffer(2048)); 
 
         context.setAttribute(CONN_STATE, connState);
 

Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java?view=diff&rev=507471&r1=507470&r2=507471
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java
(original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpServiceHandler.java
Wed Feb 14 02:33:40 2007
@@ -56,8 +56,8 @@
 import org.apache.http.nio.NHttpServiceHandler;
 import org.apache.http.nio.util.ContentInputBuffer;
 import org.apache.http.nio.util.ContentOutputBuffer;
-import org.apache.http.nio.util.InputBuffer;
-import org.apache.http.nio.util.OutputBuffer;
+import org.apache.http.nio.util.SimpleInputBuffer;
+import org.apache.http.nio.util.SimpleOutputBuffer;
 import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpExecutionContext;
@@ -133,8 +133,8 @@
         HttpContext context = conn.getContext();
 
         ServerConnState connState = new ServerConnState(
-                new InputBuffer(2048),
-                new OutputBuffer(2048)); 
+                new SimpleInputBuffer(2048),
+                new SimpleOutputBuffer(2048)); 
 
         context.setAttribute(CONN_STATE, connState);
 

Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SimpleInputBuffer.java
(from r507469, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/InputBuffer.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SimpleInputBuffer.java?view=diff&rev=507471&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/InputBuffer.java&r1=507469&p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SimpleInputBuffer.java&r2=507471
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/InputBuffer.java
(original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SimpleInputBuffer.java
Wed Feb 14 02:33:40 2007
@@ -34,11 +34,11 @@
 
 import org.apache.http.nio.ContentDecoder;
 
-public class InputBuffer extends ExpandableBuffer implements ContentInputBuffer {
+public class SimpleInputBuffer extends ExpandableBuffer implements ContentInputBuffer {
 
     private boolean endOfStream = false;
     
-    public InputBuffer(int buffersize) {
+    public SimpleInputBuffer(int buffersize) {
         super(buffersize);
     }
     

Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SimpleOutputBuffer.java
(from r507469, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/OutputBuffer.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SimpleOutputBuffer.java?view=diff&rev=507471&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/OutputBuffer.java&r1=507469&p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SimpleOutputBuffer.java&r2=507471
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/OutputBuffer.java
(original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SimpleOutputBuffer.java
Wed Feb 14 02:33:40 2007
@@ -34,11 +34,11 @@
 
 import org.apache.http.nio.ContentEncoder;
 
-public class OutputBuffer extends ExpandableBuffer implements ContentOutputBuffer {
+public class SimpleOutputBuffer extends ExpandableBuffer implements ContentOutputBuffer {
     
     private boolean endOfStream;
     
-    public OutputBuffer(int buffersize) {
+    public SimpleOutputBuffer(int buffersize) {
         super(buffersize);
         this.endOfStream = false;
     }

Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java?view=diff&rev=507471&r1=507470&r2=507471
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java
(original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java
Wed Feb 14 02:33:40 2007
@@ -41,8 +41,8 @@
 import org.apache.http.nio.mockup.MockupDecoder;
 import org.apache.http.nio.mockup.MockupEncoder;
 import org.apache.http.nio.mockup.ReadableByteChannelMockup;
-import org.apache.http.nio.util.InputBuffer;
-import org.apache.http.nio.util.OutputBuffer;
+import org.apache.http.nio.util.SimpleInputBuffer;
+import org.apache.http.nio.util.SimpleOutputBuffer;
 import org.apache.http.util.EncodingUtils;
 
 import junit.framework.Test;
@@ -81,7 +81,7 @@
         
         ContentDecoder decoder = new MockupDecoder(channel); 
         
-        InputBuffer buffer = new InputBuffer(4);
+        SimpleInputBuffer buffer = new SimpleInputBuffer(4);
         int count = buffer.consumeContent(decoder);
         assertEquals(16, count);
         assertTrue(decoder.isCompleted());
@@ -104,7 +104,7 @@
         assertEquals(-1, buffer.read(b2, 0, b2.length));
         assertTrue(buffer.isEndOfStream());
         
-        buffer.clear();
+        buffer.reset();
         assertFalse(buffer.isEndOfStream());
     }
 
@@ -114,7 +114,7 @@
         
         ContentEncoder encoder = new MockupEncoder(channel);
         
-        OutputBuffer buffer = new OutputBuffer(4); 
+        SimpleOutputBuffer buffer = new SimpleOutputBuffer(4); 
         
         buffer.write(EncodingUtils.getAsciiBytes("stuff"));
         buffer.write(';');
@@ -129,13 +129,13 @@
     }
 
     public void testInputBufferNullInput() throws IOException {
-        InputBuffer buffer = new InputBuffer(4);
+        SimpleInputBuffer buffer = new SimpleInputBuffer(4);
         assertEquals(0, buffer.read(null));
         assertEquals(0, buffer.read(null, 0, 0));
     }
     
     public void testOutputBufferNullInput() throws IOException {
-        OutputBuffer buffer = new OutputBuffer(4);
+        SimpleOutputBuffer buffer = new SimpleOutputBuffer(4);
         buffer.write(null);
         buffer.write(null, 0, 10);
         assertFalse(buffer.hasData());



Mime
View raw message