[prev in list] [next in list] [prev in thread] [next in thread] 

List:       httpcomponents-commits
Subject:    svn commit: r560344 -
From:       olegk () apache ! org
Date:       2007-07-27 18:19:33
Message-ID: 20070727181936.0FA8F1A981A () eris ! apache ! org
[Download RAW message or body]

Author: olegk
Date: Fri Jul 27 11:19:32 2007
New Revision: 560344

URL: http://svn.apache.org/viewvc?view=rev&rev=560344
Log:
HTTPCORE-105: Ensure class name consistency in HttpCore base and NIO modules (first \
pass)

Added:
    jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionInputBuffer.java
                
      - copied, changed from r560340, \
jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java
  jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java
                
      - copied, changed from r560340, \
jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java
 Removed:
    jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java
  jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java
 Modified:
    jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java


Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java
                
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-clien \
t/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java?view=diff&rev=560344&r1=560343&r2=560344
 ==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java \
                (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java \
Fri Jul 27 11:19:32 2007 @@ -44,8 +44,8 @@
 import org.apache.http.HttpResponse;
 import org.apache.http.params.HttpParams;
 import org.apache.http.impl.SocketHttpClientConnection;
-import org.apache.http.io.HttpDataReceiver;
-import org.apache.http.io.HttpDataTransmitter;
+import org.apache.http.io.SessionInputBuffer;
+import org.apache.http.io.SessionOutputBuffer;
 
 import org.apache.http.conn.OperatedClientConnection;
 
@@ -136,33 +136,33 @@
     }
 
 
-    protected HttpDataReceiver createHttpDataReceiver(
+    protected SessionInputBuffer createHttpDataReceiver(
             final Socket socket,
             int buffersize,
             final HttpParams params) throws IOException {
-        HttpDataReceiver receiver = super.createHttpDataReceiver(
+        SessionInputBuffer inbuffer = super.createSessionInputBuffer(
                 socket, 
                 buffersize,
                 params);
         if (WIRE_LOG.isDebugEnabled()) {
-            receiver = new LoggingHttpDataReceiverDecorator(receiver, new \
Wire(WIRE_LOG)); +            inbuffer = new LoggingSessionInputBuffer(inbuffer, new \
Wire(WIRE_LOG));  }
-        return receiver;
+        return inbuffer;
     }
 
     
-    protected HttpDataTransmitter createHttpDataTransmitter(
+    protected SessionOutputBuffer createHttpDataTransmitter(
             final Socket socket,
             int buffersize,
             final HttpParams params) throws IOException {
-        HttpDataTransmitter transmitter = super.createHttpDataTransmitter(
+        SessionOutputBuffer outbuffer = super.createSessionOutputBuffer(
                 socket,
                 buffersize,
                 params);
         if (WIRE_LOG.isDebugEnabled()) {
-            transmitter = new LoggingHttpDataTransmitterDecorator(transmitter, new \
Wire(WIRE_LOG)); +            outbuffer = new LoggingSessionOutputBuffer(outbuffer, \
new Wire(WIRE_LOG));  }
-        return transmitter;
+        return outbuffer;
     }
 
     

Copied: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionInputBuffer.java \
(from r560340, jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java)
                
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-clien \
t/src/main/java/org/apache/http/impl/conn/LoggingSessionInputBuffer.java?view=diff&rev \
=560344&p1=jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apa \
che/http/impl/conn/LoggingHttpDataReceiverDecorator.java&r1=560340&p2=jakarta/httpcomp \
onents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionInputBuffer.java&r2=560344
 ==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java \
                (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionInputBuffer.java \
Fri Jul 27 11:19:32 2007 @@ -32,8 +32,8 @@
 
 import java.io.IOException;
 
-import org.apache.http.io.HttpDataReceiver;
 import org.apache.http.io.HttpTransportMetrics;
+import org.apache.http.io.SessionInputBuffer;
 import org.apache.http.util.CharArrayBuffer;
 
 /**
@@ -45,20 +45,20 @@
  * 
  * @since 4.0
  */
-class LoggingHttpDataReceiverDecorator implements HttpDataReceiver {
+class LoggingSessionInputBuffer implements SessionInputBuffer {
      
-    /** Original data receiver. */
-    private final HttpDataReceiver in;
+    /** Original session input buffer. */
+    private final SessionInputBuffer in;
 
     /** The wire log to use for writing. */
     private final Wire wire;
     
     /**
-     * Create an instance that wraps the specified HTTP data receiver.
-     * @param in The input stream.
+     * Create an instance that wraps the specified session input buffer.
+     * @param in The session input buffer.
      * @param wire The wire log to use.
      */
-    public LoggingHttpDataReceiverDecorator(final HttpDataReceiver in, final Wire \
wire) { +    public LoggingSessionInputBuffer(final SessionInputBuffer in, final Wire \
wire) {  super();
         this.in = in;
         this.wire = wire;

Copied: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java \
(from r560340, jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java)
                
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-clien \
t/src/main/java/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java?view=diff&re \
v=560344&p1=jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/ap \
ache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java&r1=560340&p2=jakarta/http \
components/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java&r2=560344
 ==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java \
                (original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java \
Fri Jul 27 11:19:32 2007 @@ -32,8 +32,8 @@
 
 import java.io.IOException;
 
-import org.apache.http.io.HttpDataTransmitter;
 import org.apache.http.io.HttpTransportMetrics;
+import org.apache.http.io.SessionOutputBuffer;
 import org.apache.http.util.CharArrayBuffer;
 
 /**
@@ -43,20 +43,20 @@
  * 
  * @since 4.0
  */
-class LoggingHttpDataTransmitterDecorator implements HttpDataTransmitter {
+class LoggingSessionOutputBuffer implements SessionOutputBuffer {
 
     /** Original data transmitter. */
-    private final HttpDataTransmitter out;
+    private final SessionOutputBuffer out;
     
     /** The wire log to use. */
     private final Wire wire;
 
     /**
-     * Create an instance that wraps the specified output stream.
-     * @param out The output stream.
+     * Create an instance that wraps the specified session output buffer.
+     * @param out The session output buffer.
      * @param wire The Wire log to use.
      */
-    public LoggingHttpDataTransmitterDecorator(final HttpDataTransmitter out, final \
Wire wire) { +    public LoggingSessionOutputBuffer(final SessionOutputBuffer out, \
final Wire wire) {  super();
         this.out = out;
         this.wire = wire;


[prev in list] [next in list] [prev in thread] [next in thread]