You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2007/02/11 13:31:20 UTC
svn commit: r505931 - in /jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http: impl/nio/entity/ nio/protocol/

Author: olegk
Date: Sun Feb 11 04:31:19 2007
New Revision: 505931

URL: http://svn.apache.org/viewvc?view=rev&rev=505931
Log:
Moved content streaming helper classes from impl.nio.entity to nio.protocol and made them package private

Added:
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferedContent.java   (contents, props changed)
      - copied, changed from r505928, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/entity/BufferedContent.java
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ContentInputStream.java   (contents, props changed)
      - copied, changed from r505928, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/entity/ContentInputStream.java
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ContentOutputStream.java   (contents, props changed)
      - copied, changed from r505928, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/entity/ContentOutputStream.java
Removed:
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/entity/
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/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java

Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferedContent.java (from r505928, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/entity/BufferedContent.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferedContent.java?view=diff&rev=505931&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/entity/BufferedContent.java&r1=505928&p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferedContent.java&r2=505931
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/entity/BufferedContent.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferedContent.java Sun Feb 11 04:31:19 2007
@@ -29,7 +29,7 @@
  *
  */
 
-package org.apache.http.impl.nio.entity;
+package org.apache.http.nio.protocol;
 
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
@@ -38,7 +38,7 @@
 import org.apache.http.entity.BasicHttpEntity;
 import org.apache.http.nio.util.ContentInputBuffer;
 
-public class BufferedContent extends BasicHttpEntity {
+class BufferedContent extends BasicHttpEntity {
 
     /** The wrapped entity. */
     private HttpEntity wrappedEntity;

Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferedContent.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferedContent.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

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=505931&r1=505930&r2=505931
==============================================================================
--- 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 Sun Feb 11 04:31:19 2007
@@ -51,8 +51,6 @@
 import org.apache.http.nio.NHttpClientHandler;
 import org.apache.http.nio.util.InputBuffer;
 import org.apache.http.nio.util.OutputBuffer;
-import org.apache.http.impl.nio.entity.BufferedContent;
-import org.apache.http.impl.nio.entity.ContentOutputStream;
 import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpExecutionContext;

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=505931&r1=505930&r2=505931
==============================================================================
--- 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 Sun Feb 11 04:31:19 2007
@@ -56,8 +56,6 @@
 import org.apache.http.nio.NHttpServiceHandler;
 import org.apache.http.nio.util.InputBuffer;
 import org.apache.http.nio.util.OutputBuffer;
-import org.apache.http.impl.nio.entity.BufferedContent;
-import org.apache.http.impl.nio.entity.ContentOutputStream;
 import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.protocol.HttpExecutionContext;

Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ContentInputStream.java (from r505928, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/entity/ContentInputStream.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ContentInputStream.java?view=diff&rev=505931&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/entity/ContentInputStream.java&r1=505928&p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ContentInputStream.java&r2=505931
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/entity/ContentInputStream.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ContentInputStream.java Sun Feb 11 04:31:19 2007
@@ -29,14 +29,14 @@
  *
  */
 
-package org.apache.http.impl.nio.entity;
+package org.apache.http.nio.protocol;
 
 import java.io.IOException;
 import java.io.InputStream;
 
 import org.apache.http.nio.util.ContentInputBuffer;
 
-public class ContentInputStream extends InputStream {
+class ContentInputStream extends InputStream {
 
     private final ContentInputBuffer buffer;
     

Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ContentInputStream.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ContentInputStream.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ContentOutputStream.java (from r505928, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/entity/ContentOutputStream.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ContentOutputStream.java?view=diff&rev=505931&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/entity/ContentOutputStream.java&r1=505928&p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ContentOutputStream.java&r2=505931
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/entity/ContentOutputStream.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ContentOutputStream.java Sun Feb 11 04:31:19 2007
@@ -29,14 +29,14 @@
  *
  */
 
-package org.apache.http.impl.nio.entity;
+package org.apache.http.nio.protocol;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
 import org.apache.http.nio.util.ContentOutputBuffer;
 
-public class ContentOutputStream extends OutputStream {
+class ContentOutputStream extends OutputStream {
 
     private final ContentOutputBuffer buffer;
     

Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ContentOutputStream.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ContentOutputStream.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java?view=diff&rev=505931&r1=505930&r2=505931
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java Sun Feb 11 04:31:19 2007
@@ -55,8 +55,6 @@
 import org.apache.http.nio.NHttpServerConnection;
 import org.apache.http.nio.NHttpServiceHandler;
 import org.apache.http.util.concurrent.Executor;
-import org.apache.http.impl.nio.entity.BufferedContent;
-import org.apache.http.impl.nio.entity.ContentOutputStream;
 import org.apache.http.nio.params.HttpNIOParams;
 import org.apache.http.nio.util.SharedInputBuffer;
 import org.apache.http.nio.util.SharedOutputBuffer;