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/01/23 12:56:15 UTC
svn commit: r498997 - in
/jakarta/httpcomponents/httpcore/trunk/module-nio/src:
main/java/org/apache/http/nio/impl/
main/java/org/apache/http/nio/impl/entity/
main/java/org/apache/http/nio/impl/reactor/
main/java/org/apache/http/nio/protocol/ main/java...
Author: olegk
Date: Tue Jan 23 03:56:13 2007
New Revision: 498997
URL: http://svn.apache.org/viewvc?view=rev&rev=498997
Log:
Moved all buffering classes to the impl package
Added:
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ContentInputBuffer.java (contents, props changed)
- copied, changed from r498996, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/ContentInputBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ContentOutputBuffer.java (contents, props changed)
- copied, changed from r498996, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/ContentOutputBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ExpandableBuffer.java (contents, props changed)
- copied, changed from r498979, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/InputBuffer.java (contents, props changed)
- copied, changed from r498996, 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/impl/OutputBuffer.java (contents, props changed)
- copied, changed from r498996, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/OutputBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SharedInputBuffer.java (contents, props changed)
- copied, changed from r498996, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SharedInputBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SharedOutputBuffer.java (contents, props changed)
- copied, changed from r498996, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SharedOutputBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/TestBuffers.java (contents, props changed)
- copied, changed from r498979, jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java
Removed:
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/ContentInputBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/ContentOutputBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java
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
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SharedInputBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SharedOutputBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/util/TestAllUtil.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/impl/entity/BufferedContent.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/entity/ContentInputStream.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/entity/ContentOutputStream.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/reactor/SessionInputBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/reactor/SessionOutputBuffer.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
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/TestAll.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/TestAllImpl.java
Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ContentInputBuffer.java (from r498996, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/ContentInputBuffer.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ContentInputBuffer.java?view=diff&rev=498997&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/ContentInputBuffer.java&r1=498996&p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ContentInputBuffer.java&r2=498997
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/ContentInputBuffer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ContentInputBuffer.java Tue Jan 23 03:56:13 2007
@@ -29,7 +29,7 @@
*
*/
-package org.apache.http.nio.util;
+package org.apache.http.nio.impl;
import java.io.IOException;
Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ContentInputBuffer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ContentInputBuffer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ContentOutputBuffer.java (from r498996, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/ContentOutputBuffer.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ContentOutputBuffer.java?view=diff&rev=498997&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/ContentOutputBuffer.java&r1=498996&p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ContentOutputBuffer.java&r2=498997
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/ContentOutputBuffer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ContentOutputBuffer.java Tue Jan 23 03:56:13 2007
@@ -29,7 +29,7 @@
*
*/
-package org.apache.http.nio.util;
+package org.apache.http.nio.impl;
import java.io.IOException;
Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ContentOutputBuffer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ContentOutputBuffer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ExpandableBuffer.java (from r498979, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ExpandableBuffer.java?view=diff&rev=498997&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java&r1=498979&p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ExpandableBuffer.java&r2=498997
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ExpandableBuffer.java Tue Jan 23 03:56:13 2007
@@ -29,7 +29,7 @@
*
*/
-package org.apache.http.nio.util;
+package org.apache.http.nio.impl;
import java.nio.ByteBuffer;
Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ExpandableBuffer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/ExpandableBuffer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/InputBuffer.java (from r498996, 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/impl/InputBuffer.java?view=diff&rev=498997&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/InputBuffer.java&r1=498996&p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/InputBuffer.java&r2=498997
==============================================================================
--- 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/impl/InputBuffer.java Tue Jan 23 03:56:13 2007
@@ -28,7 +28,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.nio.util;
+package org.apache.http.nio.impl;
import java.io.IOException;
Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/InputBuffer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/InputBuffer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/OutputBuffer.java (from r498996, 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/impl/OutputBuffer.java?view=diff&rev=498997&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/OutputBuffer.java&r1=498996&p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/OutputBuffer.java&r2=498997
==============================================================================
--- 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/impl/OutputBuffer.java Tue Jan 23 03:56:13 2007
@@ -28,7 +28,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.nio.util;
+package org.apache.http.nio.impl;
import java.io.IOException;
Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/OutputBuffer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/OutputBuffer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SharedInputBuffer.java (from r498996, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SharedInputBuffer.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SharedInputBuffer.java?view=diff&rev=498997&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SharedInputBuffer.java&r1=498996&p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SharedInputBuffer.java&r2=498997
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SharedInputBuffer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SharedInputBuffer.java Tue Jan 23 03:56:13 2007
@@ -28,7 +28,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.nio.util;
+package org.apache.http.nio.impl;
import java.io.IOException;
Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SharedInputBuffer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SharedInputBuffer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SharedOutputBuffer.java (from r498996, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SharedOutputBuffer.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SharedOutputBuffer.java?view=diff&rev=498997&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SharedOutputBuffer.java&r1=498996&p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SharedOutputBuffer.java&r2=498997
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SharedOutputBuffer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SharedOutputBuffer.java Tue Jan 23 03:56:13 2007
@@ -28,7 +28,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.nio.util;
+package org.apache.http.nio.impl;
import java.io.IOException;
Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SharedOutputBuffer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SharedOutputBuffer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/entity/BufferedContent.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/entity/BufferedContent.java?view=diff&rev=498997&r1=498996&r2=498997
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/entity/BufferedContent.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/entity/BufferedContent.java Tue Jan 23 03:56:13 2007
@@ -35,7 +35,7 @@
import org.apache.http.HttpEntity;
import org.apache.http.HttpEntityEnclosingRequest;
import org.apache.http.entity.BasicHttpEntity;
-import org.apache.http.nio.util.ContentInputBuffer;
+import org.apache.http.nio.impl.ContentInputBuffer;
public class BufferedContent extends BasicHttpEntity {
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/entity/ContentInputStream.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/entity/ContentInputStream.java?view=diff&rev=498997&r1=498996&r2=498997
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/entity/ContentInputStream.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/entity/ContentInputStream.java Tue Jan 23 03:56:13 2007
@@ -34,7 +34,7 @@
import java.io.IOException;
import java.io.InputStream;
-import org.apache.http.nio.util.ContentInputBuffer;
+import org.apache.http.nio.impl.ContentInputBuffer;
public class ContentInputStream extends InputStream {
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/entity/ContentOutputStream.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/entity/ContentOutputStream.java?view=diff&rev=498997&r1=498996&r2=498997
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/entity/ContentOutputStream.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/entity/ContentOutputStream.java Tue Jan 23 03:56:13 2007
@@ -34,7 +34,7 @@
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.http.nio.util.ContentOutputBuffer;
+import org.apache.http.nio.impl.ContentOutputBuffer;
public class ContentOutputStream extends OutputStream {
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/reactor/SessionInputBuffer.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/reactor/SessionInputBuffer.java?view=diff&rev=498997&r1=498996&r2=498997
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/reactor/SessionInputBuffer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/reactor/SessionInputBuffer.java Tue Jan 23 03:56:13 2007
@@ -39,7 +39,7 @@
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CoderResult;
-import org.apache.http.nio.util.ExpandableBuffer;
+import org.apache.http.nio.impl.ExpandableBuffer;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.HTTP;
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/reactor/SessionOutputBuffer.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/reactor/SessionOutputBuffer.java?view=diff&rev=498997&r1=498996&r2=498997
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/reactor/SessionOutputBuffer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/reactor/SessionOutputBuffer.java Tue Jan 23 03:56:13 2007
@@ -39,7 +39,7 @@
import java.nio.charset.CharsetEncoder;
import java.nio.charset.CoderResult;
-import org.apache.http.nio.util.ExpandableBuffer;
+import org.apache.http.nio.impl.ExpandableBuffer;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.HTTP;
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=498997&r1=498996&r2=498997
==============================================================================
--- 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 Tue Jan 23 03:56:13 2007
@@ -54,10 +54,10 @@
import org.apache.http.nio.NHttpConnection;
import org.apache.http.nio.NHttpServerConnection;
import org.apache.http.nio.NHttpServiceHandler;
+import org.apache.http.nio.impl.InputBuffer;
+import org.apache.http.nio.impl.OutputBuffer;
import org.apache.http.nio.impl.entity.BufferedContent;
import org.apache.http.nio.impl.entity.ContentOutputStream;
-import org.apache.http.nio.util.InputBuffer;
-import org.apache.http.nio.util.OutputBuffer;
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/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=498997&r1=498996&r2=498997
==============================================================================
--- 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 Tue Jan 23 03:56:13 2007
@@ -55,11 +55,11 @@
import org.apache.http.nio.NHttpServerConnection;
import org.apache.http.nio.NHttpServiceHandler;
import org.apache.http.nio.concurrent.Executor;
+import org.apache.http.nio.impl.SharedInputBuffer;
+import org.apache.http.nio.impl.SharedOutputBuffer;
import org.apache.http.nio.impl.entity.BufferedContent;
import org.apache.http.nio.impl.entity.ContentOutputStream;
import org.apache.http.nio.params.HttpNIOParams;
-import org.apache.http.nio.util.SharedInputBuffer;
-import org.apache.http.nio.util.SharedOutputBuffer;
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/test/java/org/apache/http/nio/TestAll.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/TestAll.java?view=diff&rev=498997&r1=498996&r2=498997
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/TestAll.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/TestAll.java Tue Jan 23 03:56:13 2007
@@ -31,7 +31,6 @@
package org.apache.http.nio;
import org.apache.http.nio.impl.TestAllImpl;
-import org.apache.http.nio.util.TestAllUtil;
import junit.framework.*;
@@ -44,7 +43,6 @@
public static Test suite() {
TestSuite suite = new TestSuite();
suite.addTest(TestAllImpl.suite());
- suite.addTest(TestAllUtil.suite());
return suite;
}
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/TestAllImpl.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/TestAllImpl.java?view=diff&rev=498997&r1=498996&r2=498997
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/TestAllImpl.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/TestAllImpl.java Tue Jan 23 03:56:13 2007
@@ -45,6 +45,7 @@
TestSuite suite = new TestSuite();
suite.addTest(TestAllImplReactor.suite());
suite.addTest(TestAllImplCodecs.suite());
+ suite.addTest(TestBuffers.suite());
return suite;
}
Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/TestBuffers.java (from r498979, 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/impl/TestBuffers.java?view=diff&rev=498997&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java&r1=498979&p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/TestBuffers.java&r2=498997
==============================================================================
--- 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/impl/TestBuffers.java Tue Jan 23 03:56:13 2007
@@ -28,7 +28,7 @@
*
*/
-package org.apache.http.nio.util;
+package org.apache.http.nio.impl;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -38,6 +38,8 @@
import org.apache.http.nio.ContentDecoder;
import org.apache.http.nio.ContentEncoder;
+import org.apache.http.nio.impl.InputBuffer;
+import org.apache.http.nio.impl.OutputBuffer;
import org.apache.http.nio.mockup.MockupDecoder;
import org.apache.http.nio.mockup.MockupEncoder;
import org.apache.http.nio.mockup.ReadableByteChannelMockup;
Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/TestBuffers.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/TestBuffers.java
------------------------------------------------------------------------------
svn:mime-type = text/plain