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 2006/11/12 17:17:45 UTC
svn commit: r473982 - in /jakarta/httpcomponents/httpcore/trunk:
module-main/src/main/java/org/apache/http/
module-main/src/main/java/org/apache/http/impl/
module-main/src/main/java/org/apache/http/impl/io/
module-main/src/main/java/org/apache/http/io/...
Author: olegk
Date: Sun Nov 12 08:17:43 2006
New Revision: 473982
URL: http://svn.apache.org/viewvc?view=rev&rev=473982
Log:
Moved some classes around
Added:
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/MalformedChunkCodingException.java (contents, props changed)
- copied, changed from r451782, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/MalformedChunkCodingException.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/ByteArrayBuffer.java (contents, props changed)
- copied, changed from r451782, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/ByteArrayBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/CharArrayBuffer.java (contents, props changed)
- copied, changed from r451782, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/CharArrayBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestByteArrayBuffer.java (contents, props changed)
- copied, changed from r451782, jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/io/TestByteArrayBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestCharArrayBuffer.java (contents, props changed)
- copied, changed from r451782, jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/io/TestCharArrayBuffer.java
Removed:
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/ByteArrayBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/CharArrayBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/MalformedChunkCodingException.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/io/TestByteArrayBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/io/TestCharArrayBuffer.java
Modified:
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpHost.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpVersion.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/HeaderGroup.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/io/AbstractHttpDataReceiver.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/io/AbstractHttpDataTransmitter.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/ChunkedInputStream.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/HttpDataReceiver.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/HttpDataTransmitter.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHeader.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHeaderElement.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHttpVersion.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicNameValuePair.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicRequestLine.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicStatusLine.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BufferedHeader.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/EntityUtils.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/HeaderUtils.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestHttpDataReceiverAndTransmitter.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/io/TestAllIO.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/io/TestChunkCoding.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestHeader.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestHeaderElement.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestHttpVersion.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestNameValuePair.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestRequestLine.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestStatusLine.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestAllUtil.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SessionInputBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SessionOutputBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/ChunkDecoder.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/ChunkEncoder.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/HttpMessageParser.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/HttpRequestParser.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/HttpResponseParser.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/handler/NHttpConnectionBase.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/TestSessionInOutBuffers.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/codecs/TestChunkDecoder.java
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpHost.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpHost.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpHost.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpHost.java Sun Nov 12 08:17:43 2006
@@ -29,7 +29,7 @@
package org.apache.http;
-import org.apache.http.io.CharArrayBuffer;
+import org.apache.http.util.CharArrayBuffer;
import org.apache.http.util.LangUtils;
/**
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpVersion.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpVersion.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpVersion.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpVersion.java Sun Nov 12 08:17:43 2006
@@ -29,7 +29,7 @@
package org.apache.http;
-import org.apache.http.io.CharArrayBuffer;
+import org.apache.http.util.CharArrayBuffer;
/**
* <p>HTTP version, as specified in RFC 2616.</p>
Copied: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/MalformedChunkCodingException.java (from r451782, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/MalformedChunkCodingException.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/MalformedChunkCodingException.java?view=diff&rev=473982&p1=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/MalformedChunkCodingException.java&r1=451782&p2=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/MalformedChunkCodingException.java&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/MalformedChunkCodingException.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/MalformedChunkCodingException.java Sun Nov 12 08:17:43 2006
@@ -27,7 +27,7 @@
*
*/
-package org.apache.http.io;
+package org.apache.http;
import java.io.IOException;
Propchange: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/MalformedChunkCodingException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/MalformedChunkCodingException.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/MalformedChunkCodingException.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java Sun Nov 12 08:17:43 2006
@@ -47,7 +47,6 @@
import org.apache.http.impl.entity.EntitySerializer;
import org.apache.http.impl.entity.LaxContentLengthStrategy;
import org.apache.http.impl.entity.StrictContentLengthStrategy;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.io.HttpDataReceiver;
import org.apache.http.io.HttpDataTransmitter;
import org.apache.http.message.BasicHeader;
@@ -57,6 +56,7 @@
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.HTTP;
+import org.apache.http.util.CharArrayBuffer;
import org.apache.http.util.HeaderUtils;
/**
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java Sun Nov 12 08:17:43 2006
@@ -46,7 +46,6 @@
import org.apache.http.impl.entity.EntitySerializer;
import org.apache.http.impl.entity.LaxContentLengthStrategy;
import org.apache.http.impl.entity.StrictContentLengthStrategy;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.io.HttpDataReceiver;
import org.apache.http.io.HttpDataTransmitter;
import org.apache.http.message.BasicHeader;
@@ -54,6 +53,7 @@
import org.apache.http.message.BasicStatusLine;
import org.apache.http.message.BufferedHeader;
import org.apache.http.params.HttpParams;
+import org.apache.http.util.CharArrayBuffer;
import org.apache.http.util.HeaderUtils;
/**
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/HeaderGroup.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/HeaderGroup.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/HeaderGroup.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/HeaderGroup.java Sun Nov 12 08:17:43 2006
@@ -34,8 +34,8 @@
import java.util.List;
import org.apache.http.Header;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.message.BasicHeader;
+import org.apache.http.util.CharArrayBuffer;
/**
* A class for combining a set of headers. This class allows for multiple
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/io/AbstractHttpDataReceiver.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/io/AbstractHttpDataReceiver.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/io/AbstractHttpDataReceiver.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/io/AbstractHttpDataReceiver.java Sun Nov 12 08:17:43 2006
@@ -32,13 +32,13 @@
import java.io.IOException;
import java.io.InputStream;
-import org.apache.http.io.ByteArrayBuffer;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.io.HttpDataReceiver;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.HTTP;
+import org.apache.http.util.ByteArrayBuffer;
+import org.apache.http.util.CharArrayBuffer;
/**
* Abstract base class for data receivers using traditional IO.
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/io/AbstractHttpDataTransmitter.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/io/AbstractHttpDataTransmitter.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/io/AbstractHttpDataTransmitter.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/io/AbstractHttpDataTransmitter.java Sun Nov 12 08:17:43 2006
@@ -32,12 +32,12 @@
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.http.io.ByteArrayBuffer;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.io.HttpDataTransmitter;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.HTTP;
+import org.apache.http.util.ByteArrayBuffer;
+import org.apache.http.util.CharArrayBuffer;
/**
* Abstract base class for data transmitters using traditional IO.
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/ChunkedInputStream.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/ChunkedInputStream.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/ChunkedInputStream.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/ChunkedInputStream.java Sun Nov 12 08:17:43 2006
@@ -34,7 +34,9 @@
import org.apache.http.Header;
import org.apache.http.HttpException;
+import org.apache.http.MalformedChunkCodingException;
import org.apache.http.protocol.HTTP;
+import org.apache.http.util.CharArrayBuffer;
import org.apache.http.util.ExceptionUtils;
import org.apache.http.util.HeaderUtils;
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/HttpDataReceiver.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/HttpDataReceiver.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/HttpDataReceiver.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/HttpDataReceiver.java Sun Nov 12 08:17:43 2006
@@ -32,6 +32,7 @@
import java.io.IOException;
import org.apache.http.params.HttpParams;
+import org.apache.http.util.CharArrayBuffer;
/**
* Interface for receiving data.
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/HttpDataTransmitter.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/HttpDataTransmitter.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/HttpDataTransmitter.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/HttpDataTransmitter.java Sun Nov 12 08:17:43 2006
@@ -32,6 +32,7 @@
import java.io.IOException;
import org.apache.http.params.HttpParams;
+import org.apache.http.util.CharArrayBuffer;
/**
* Interface for sending data.
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHeader.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHeader.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHeader.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHeader.java Sun Nov 12 08:17:43 2006
@@ -31,7 +31,7 @@
import org.apache.http.Header;
import org.apache.http.HeaderElement;
-import org.apache.http.io.CharArrayBuffer;
+import org.apache.http.util.CharArrayBuffer;
/**
* Represents an HTTP header field.
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHeaderElement.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHeaderElement.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHeaderElement.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHeaderElement.java Sun Nov 12 08:17:43 2006
@@ -34,7 +34,7 @@
import org.apache.http.HeaderElement;
import org.apache.http.NameValuePair;
-import org.apache.http.io.CharArrayBuffer;
+import org.apache.http.util.CharArrayBuffer;
import org.apache.http.util.LangUtils;
/**
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHttpVersion.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHttpVersion.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHttpVersion.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHttpVersion.java Sun Nov 12 08:17:43 2006
@@ -31,8 +31,8 @@
import org.apache.http.HttpVersion;
import org.apache.http.ProtocolException;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.protocol.HTTP;
+import org.apache.http.util.CharArrayBuffer;
public class BasicHttpVersion extends HttpVersion {
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicNameValuePair.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicNameValuePair.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicNameValuePair.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicNameValuePair.java Sun Nov 12 08:17:43 2006
@@ -33,8 +33,8 @@
import java.util.List;
import org.apache.http.NameValuePair;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.protocol.HTTP;
+import org.apache.http.util.CharArrayBuffer;
import org.apache.http.util.LangUtils;
/**
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicRequestLine.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicRequestLine.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicRequestLine.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicRequestLine.java Sun Nov 12 08:17:43 2006
@@ -32,8 +32,8 @@
import org.apache.http.HttpVersion;
import org.apache.http.ProtocolException;
import org.apache.http.RequestLine;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.protocol.HTTP;
+import org.apache.http.util.CharArrayBuffer;
/**
* The first line of an {@link org.apache.http.HttpRequest HttpRequest}.
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicStatusLine.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicStatusLine.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicStatusLine.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicStatusLine.java Sun Nov 12 08:17:43 2006
@@ -33,8 +33,8 @@
import org.apache.http.HttpVersion;
import org.apache.http.ProtocolException;
import org.apache.http.StatusLine;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.protocol.HTTP;
+import org.apache.http.util.CharArrayBuffer;
/**
* Represents a Status-Line as returned from a HTTP server.
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BufferedHeader.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BufferedHeader.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BufferedHeader.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BufferedHeader.java Sun Nov 12 08:17:43 2006
@@ -31,7 +31,7 @@
import org.apache.http.Header;
import org.apache.http.HeaderElement;
-import org.apache.http.io.CharArrayBuffer;
+import org.apache.http.util.CharArrayBuffer;
/**
* This class represents a raw HTTP header whose content is parsed 'on demand' only when
Copied: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/ByteArrayBuffer.java (from r451782, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/ByteArrayBuffer.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/ByteArrayBuffer.java?view=diff&rev=473982&p1=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/ByteArrayBuffer.java&r1=451782&p2=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/ByteArrayBuffer.java&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/ByteArrayBuffer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/ByteArrayBuffer.java Sun Nov 12 08:17:43 2006
@@ -27,7 +27,7 @@
*
*/
-package org.apache.http.io;
+package org.apache.http.util;
/**
* A resizable byte array.
Propchange: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/ByteArrayBuffer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/ByteArrayBuffer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/ByteArrayBuffer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/CharArrayBuffer.java (from r451782, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/CharArrayBuffer.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/CharArrayBuffer.java?view=diff&rev=473982&p1=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/CharArrayBuffer.java&r1=451782&p2=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/CharArrayBuffer.java&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/io/CharArrayBuffer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/CharArrayBuffer.java Sun Nov 12 08:17:43 2006
@@ -27,7 +27,7 @@
*
*/
-package org.apache.http.io;
+package org.apache.http.util;
import org.apache.http.protocol.HTTP;
Propchange: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/CharArrayBuffer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/CharArrayBuffer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/CharArrayBuffer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/EntityUtils.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/EntityUtils.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/EntityUtils.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/EntityUtils.java Sun Nov 12 08:17:43 2006
@@ -37,8 +37,6 @@
import org.apache.http.HeaderElement;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
-import org.apache.http.io.ByteArrayBuffer;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.protocol.HTTP;
/**
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/HeaderUtils.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/HeaderUtils.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/HeaderUtils.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/HeaderUtils.java Sun Nov 12 08:17:43 2006
@@ -35,7 +35,6 @@
import org.apache.http.Header;
import org.apache.http.HttpException;
import org.apache.http.ProtocolException;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.io.HttpDataReceiver;
import org.apache.http.message.BufferedHeader;
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestHttpDataReceiverAndTransmitter.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestHttpDataReceiverAndTransmitter.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestHttpDataReceiverAndTransmitter.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/TestHttpDataReceiverAndTransmitter.java Sun Nov 12 08:17:43 2006
@@ -38,13 +38,13 @@
import junit.framework.TestSuite;
import org.apache.http.impl.DefaultHttpParams;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.mockup.HttpDataReceiverMockup;
import org.apache.http.mockup.HttpDataTransmitterMockup;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.HTTP;
+import org.apache.http.util.CharArrayBuffer;
public class TestHttpDataReceiverAndTransmitter extends TestCase {
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/io/TestAllIO.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/io/TestAllIO.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/io/TestAllIO.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/io/TestAllIO.java Sun Nov 12 08:17:43 2006
@@ -38,8 +38,6 @@
public static Test suite() {
TestSuite suite = new TestSuite();
- suite.addTest(TestByteArrayBuffer.suite());
- suite.addTest(TestCharArrayBuffer.suite());
suite.addTest(TestHttpDataInputStream.suite());
suite.addTest(TestHttpDataOutputStream.suite());
suite.addTest(TestChunkCoding.suite());
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/io/TestChunkCoding.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/io/TestChunkCoding.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/io/TestChunkCoding.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/io/TestChunkCoding.java Sun Nov 12 08:17:43 2006
@@ -34,6 +34,7 @@
import java.io.OutputStream;
import org.apache.http.Header;
+import org.apache.http.MalformedChunkCodingException;
import org.apache.http.mockup.HttpDataReceiverMockup;
import org.apache.http.mockup.HttpDataTransmitterMockup;
import org.apache.http.util.EncodingUtils;
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestHeader.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestHeader.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestHeader.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestHeader.java Sun Nov 12 08:17:43 2006
@@ -31,8 +31,8 @@
import org.apache.http.Header;
import org.apache.http.HeaderElement;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.message.BasicHeader;
+import org.apache.http.util.CharArrayBuffer;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestHeaderElement.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestHeaderElement.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestHeaderElement.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestHeaderElement.java Sun Nov 12 08:17:43 2006
@@ -32,9 +32,9 @@
import org.apache.http.HeaderElement;
import org.apache.http.NameValuePair;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.message.BasicHeaderElement;
import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.CharArrayBuffer;
import junit.framework.*;
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestHttpVersion.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestHttpVersion.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestHttpVersion.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestHttpVersion.java Sun Nov 12 08:17:43 2006
@@ -31,8 +31,8 @@
import org.apache.http.HttpVersion;
import org.apache.http.ProtocolException;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.message.BasicHttpVersion;
+import org.apache.http.util.CharArrayBuffer;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestNameValuePair.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestNameValuePair.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestNameValuePair.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestNameValuePair.java Sun Nov 12 08:17:43 2006
@@ -30,8 +30,8 @@
package org.apache.http.message;
import org.apache.http.NameValuePair;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.CharArrayBuffer;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestRequestLine.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestRequestLine.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestRequestLine.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestRequestLine.java Sun Nov 12 08:17:43 2006
@@ -31,8 +31,8 @@
import org.apache.http.HttpException;
import org.apache.http.HttpVersion;
import org.apache.http.RequestLine;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.message.BasicRequestLine;
+import org.apache.http.util.CharArrayBuffer;
import junit.framework.*;
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestStatusLine.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestStatusLine.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestStatusLine.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/message/TestStatusLine.java Sun Nov 12 08:17:43 2006
@@ -32,8 +32,8 @@
import org.apache.http.HttpStatus;
import org.apache.http.HttpVersion;
import org.apache.http.StatusLine;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.message.BasicStatusLine;
+import org.apache.http.util.CharArrayBuffer;
import junit.framework.*;
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestAllUtil.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestAllUtil.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestAllUtil.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestAllUtil.java Sun Nov 12 08:17:43 2006
@@ -44,6 +44,8 @@
suite.addTest(TestDateUtils.suite());
suite.addTest(TestEntityUtils.suite());
suite.addTest(TestHeaderUtils.suite());
+ suite.addTest(TestByteArrayBuffer.suite());
+ suite.addTest(TestCharArrayBuffer.suite());
return suite;
}
Copied: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestByteArrayBuffer.java (from r451782, jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/io/TestByteArrayBuffer.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestByteArrayBuffer.java?view=diff&rev=473982&p1=jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/io/TestByteArrayBuffer.java&r1=451782&p2=jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestByteArrayBuffer.java&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/io/TestByteArrayBuffer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestByteArrayBuffer.java Sun Nov 12 08:17:43 2006
@@ -27,9 +27,10 @@
*
*/
-package org.apache.http.io;
+package org.apache.http.util;
-import org.apache.http.io.ByteArrayBuffer;
+import org.apache.http.util.ByteArrayBuffer;
+import org.apache.http.util.CharArrayBuffer;
import junit.framework.Test;
import junit.framework.TestCase;
Propchange: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestByteArrayBuffer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestByteArrayBuffer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestByteArrayBuffer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestCharArrayBuffer.java (from r451782, jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/io/TestCharArrayBuffer.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestCharArrayBuffer.java?view=diff&rev=473982&p1=jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/io/TestCharArrayBuffer.java&r1=451782&p2=jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestCharArrayBuffer.java&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/io/TestCharArrayBuffer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestCharArrayBuffer.java Sun Nov 12 08:17:43 2006
@@ -27,9 +27,10 @@
*
*/
-package org.apache.http.io;
+package org.apache.http.util;
-import org.apache.http.io.CharArrayBuffer;
+import org.apache.http.util.ByteArrayBuffer;
+import org.apache.http.util.CharArrayBuffer;
import junit.framework.Test;
import junit.framework.TestCase;
Propchange: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestCharArrayBuffer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestCharArrayBuffer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/util/TestCharArrayBuffer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SessionInputBuffer.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SessionInputBuffer.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SessionInputBuffer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SessionInputBuffer.java Sun Nov 12 08:17:43 2006
@@ -37,10 +37,10 @@
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CoderResult;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.HTTP;
+import org.apache.http.util.CharArrayBuffer;
public class SessionInputBuffer extends ExpandableBuffer {
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SessionOutputBuffer.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SessionOutputBuffer.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SessionOutputBuffer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/SessionOutputBuffer.java Sun Nov 12 08:17:43 2006
@@ -37,10 +37,10 @@
import java.nio.charset.CharsetEncoder;
import java.nio.charset.CoderResult;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.HTTP;
+import org.apache.http.util.CharArrayBuffer;
public class SessionOutputBuffer extends ExpandableBuffer {
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/ChunkDecoder.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/ChunkDecoder.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/ChunkDecoder.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/ChunkDecoder.java Sun Nov 12 08:17:43 2006
@@ -36,11 +36,11 @@
import java.util.List;
import org.apache.http.Header;
-import org.apache.http.io.CharArrayBuffer;
-import org.apache.http.io.MalformedChunkCodingException;
+import org.apache.http.MalformedChunkCodingException;
import org.apache.http.message.BufferedHeader;
import org.apache.http.nio.impl.SessionInputBuffer;
import org.apache.http.protocol.HTTP;
+import org.apache.http.util.CharArrayBuffer;
public class ChunkDecoder extends AbstractContentDecoder {
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/ChunkEncoder.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/ChunkEncoder.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/ChunkEncoder.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/ChunkEncoder.java Sun Nov 12 08:17:43 2006
@@ -31,8 +31,8 @@
import java.nio.ByteBuffer;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.nio.impl.SessionOutputBuffer;
+import org.apache.http.util.CharArrayBuffer;
public class ChunkEncoder extends AbstractContentEncoder {
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/HttpMessageParser.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/HttpMessageParser.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/HttpMessageParser.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/HttpMessageParser.java Sun Nov 12 08:17:43 2006
@@ -37,9 +37,9 @@
import org.apache.http.HttpException;
import org.apache.http.HttpMessage;
import org.apache.http.ProtocolException;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.message.BufferedHeader;
import org.apache.http.nio.impl.SessionInputBuffer;
+import org.apache.http.util.CharArrayBuffer;
public abstract class HttpMessageParser {
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/HttpRequestParser.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/HttpRequestParser.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/HttpRequestParser.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/HttpRequestParser.java Sun Nov 12 08:17:43 2006
@@ -33,9 +33,9 @@
import org.apache.http.HttpMessage;
import org.apache.http.HttpRequestFactory;
import org.apache.http.RequestLine;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.message.BasicRequestLine;
import org.apache.http.nio.impl.SessionInputBuffer;
+import org.apache.http.util.CharArrayBuffer;
public class HttpRequestParser extends HttpMessageParser {
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/HttpResponseParser.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/HttpResponseParser.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/HttpResponseParser.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/codecs/HttpResponseParser.java Sun Nov 12 08:17:43 2006
@@ -33,9 +33,9 @@
import org.apache.http.HttpMessage;
import org.apache.http.HttpResponseFactory;
import org.apache.http.StatusLine;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.message.BasicStatusLine;
import org.apache.http.nio.impl.SessionInputBuffer;
+import org.apache.http.util.CharArrayBuffer;
public class HttpResponseParser extends HttpMessageParser {
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/handler/NHttpConnectionBase.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/handler/NHttpConnectionBase.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/handler/NHttpConnectionBase.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/handler/NHttpConnectionBase.java Sun Nov 12 08:17:43 2006
@@ -41,7 +41,6 @@
import org.apache.http.entity.ContentLengthStrategy;
import org.apache.http.impl.entity.LaxContentLengthStrategy;
import org.apache.http.impl.entity.StrictContentLengthStrategy;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.nio.EventMask;
import org.apache.http.nio.IOSession;
import org.apache.http.nio.handler.ContentDecoder;
@@ -60,6 +59,7 @@
import org.apache.http.protocol.HTTP;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.SyncHttpExecutionContext;
+import org.apache.http.util.CharArrayBuffer;
public class NHttpConnectionBase implements NHttpConnection {
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/TestSessionInOutBuffers.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/TestSessionInOutBuffers.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/TestSessionInOutBuffers.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/TestSessionInOutBuffers.java Sun Nov 12 08:17:43 2006
@@ -41,9 +41,9 @@
import junit.framework.TestSuite;
import org.apache.http.impl.DefaultHttpParams;
-import org.apache.http.io.CharArrayBuffer;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
+import org.apache.http.util.CharArrayBuffer;
/**
* Simple tests for {@link SessionInputBuffer} and {@link SessionOutputBuffer}.
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/codecs/TestChunkDecoder.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/codecs/TestChunkDecoder.java?view=diff&rev=473982&r1=473981&r2=473982
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/codecs/TestChunkDecoder.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/codecs/TestChunkDecoder.java Sun Nov 12 08:17:43 2006
@@ -37,7 +37,7 @@
import junit.framework.TestSuite;
import org.apache.http.Header;
-import org.apache.http.io.MalformedChunkCodingException;
+import org.apache.http.MalformedChunkCodingException;
import org.apache.http.nio.impl.SessionInputBuffer;
import org.apache.http.nio.mockup.ReadableByteChannelMockup;