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 2005/10/24 19:37:08 UTC
svn commit: r328099 - in /jakarta/httpclient/trunk/http-core/src:
java/org/apache/http/ java/org/apache/http/impl/
java/org/apache/http/impl/io/ java/org/apache/http/io/
java/org/apache/http/util/ test/org/apache/http/io/
test/org/apache/http/util/
Author: olegk
Date: Mon Oct 24 10:36:14 2005
New Revision: 328099
URL: http://svn.apache.org/viewcvs?rev=328099&view=rev
Log:
ByteArrayBuffer and CharArrayBuffer moved from utils to io package
Added:
jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/ByteArrayBuffer.java (contents, props changed)
- copied, changed from r326997, jakarta/httpclient/trunk/http-core/src/java/org/apache/http/util/ByteArrayBuffer.java
jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/CharArrayBuffer.java (contents, props changed)
- copied, changed from r327828, jakarta/httpclient/trunk/http-core/src/java/org/apache/http/util/CharArrayBuffer.java
jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestByteArrayBuffer.java (contents, props changed)
- copied, changed from r326997, jakarta/httpclient/trunk/http-core/src/test/org/apache/http/util/TestByteArrayBuffer.java
jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestCharArrayBuffer.java (contents, props changed)
- copied, changed from r327828, jakarta/httpclient/trunk/http-core/src/test/org/apache/http/util/TestCharArrayBuffer.java
Removed:
jakarta/httpclient/trunk/http-core/src/java/org/apache/http/util/ByteArrayBuffer.java
jakarta/httpclient/trunk/http-core/src/java/org/apache/http/util/CharArrayBuffer.java
jakarta/httpclient/trunk/http-core/src/test/org/apache/http/util/TestByteArrayBuffer.java
jakarta/httpclient/trunk/http-core/src/test/org/apache/http/util/TestCharArrayBuffer.java
Modified:
jakarta/httpclient/trunk/http-core/src/java/org/apache/http/Header.java
jakarta/httpclient/trunk/http-core/src/java/org/apache/http/HeaderElement.java
jakarta/httpclient/trunk/http-core/src/java/org/apache/http/HttpHost.java
jakarta/httpclient/trunk/http-core/src/java/org/apache/http/HttpVersion.java
jakarta/httpclient/trunk/http-core/src/java/org/apache/http/NameValuePair.java
jakarta/httpclient/trunk/http-core/src/java/org/apache/http/RequestLine.java
jakarta/httpclient/trunk/http-core/src/java/org/apache/http/Scheme.java
jakarta/httpclient/trunk/http-core/src/java/org/apache/http/StatusLine.java
jakarta/httpclient/trunk/http-core/src/java/org/apache/http/impl/HeaderGroup.java
jakarta/httpclient/trunk/http-core/src/java/org/apache/http/impl/io/AbstractHttpDataReceiver.java
jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/HttpDataReceiver.java
jakarta/httpclient/trunk/http-core/src/java/org/apache/http/util/EntityUtils.java
jakarta/httpclient/trunk/http-core/src/java/org/apache/http/util/HeadersParser.java
jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestAllIO.java
jakarta/httpclient/trunk/http-core/src/test/org/apache/http/util/TestAllUtil.java
Modified: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/Header.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-core/src/java/org/apache/http/Header.java?rev=328099&r1=328098&r2=328099&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-core/src/java/org/apache/http/Header.java (original)
+++ jakarta/httpclient/trunk/http-core/src/java/org/apache/http/Header.java Mon Oct 24 10:36:14 2005
@@ -29,7 +29,7 @@
package org.apache.http;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.http.io.CharArrayBuffer;
import org.apache.http.util.LangUtils;
/**
Modified: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/HeaderElement.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-core/src/java/org/apache/http/HeaderElement.java?rev=328099&r1=328098&r2=328099&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-core/src/java/org/apache/http/HeaderElement.java (original)
+++ jakarta/httpclient/trunk/http-core/src/java/org/apache/http/HeaderElement.java Mon Oct 24 10:36:14 2005
@@ -32,7 +32,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.http.io.CharArrayBuffer;
import org.apache.http.util.LangUtils;
import org.apache.http.util.ParameterParser;
Modified: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/HttpHost.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-core/src/java/org/apache/http/HttpHost.java?rev=328099&r1=328098&r2=328099&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-core/src/java/org/apache/http/HttpHost.java (original)
+++ jakarta/httpclient/trunk/http-core/src/java/org/apache/http/HttpHost.java Mon Oct 24 10:36:14 2005
@@ -29,7 +29,7 @@
package org.apache.http;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.http.io.CharArrayBuffer;
import org.apache.http.util.LangUtils;
/**
Modified: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/HttpVersion.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-core/src/java/org/apache/http/HttpVersion.java?rev=328099&r1=328098&r2=328099&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-core/src/java/org/apache/http/HttpVersion.java (original)
+++ jakarta/httpclient/trunk/http-core/src/java/org/apache/http/HttpVersion.java Mon Oct 24 10:36:14 2005
@@ -29,7 +29,7 @@
package org.apache.http;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.http.io.CharArrayBuffer;
/**
* <p>HTTP version, as specified in RFC 2616.</p>
Modified: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/NameValuePair.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-core/src/java/org/apache/http/NameValuePair.java?rev=328099&r1=328098&r2=328099&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-core/src/java/org/apache/http/NameValuePair.java (original)
+++ jakarta/httpclient/trunk/http-core/src/java/org/apache/http/NameValuePair.java Mon Oct 24 10:36:14 2005
@@ -31,7 +31,7 @@
import java.io.Serializable;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.http.io.CharArrayBuffer;
import org.apache.http.util.LangUtils;
/**
Modified: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/RequestLine.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-core/src/java/org/apache/http/RequestLine.java?rev=328099&r1=328098&r2=328099&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-core/src/java/org/apache/http/RequestLine.java (original)
+++ jakarta/httpclient/trunk/http-core/src/java/org/apache/http/RequestLine.java Mon Oct 24 10:36:14 2005
@@ -32,7 +32,7 @@
import java.util.NoSuchElementException;
import java.util.StringTokenizer;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.http.io.CharArrayBuffer;
/**
* <p>
Modified: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/Scheme.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-core/src/java/org/apache/http/Scheme.java?rev=328099&r1=328098&r2=328099&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-core/src/java/org/apache/http/Scheme.java (original)
+++ jakarta/httpclient/trunk/http-core/src/java/org/apache/http/Scheme.java Mon Oct 24 10:36:14 2005
@@ -32,9 +32,9 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.http.io.CharArrayBuffer;
import org.apache.http.io.SecureSocketFactory;
import org.apache.http.io.SocketFactory;
-import org.apache.http.util.CharArrayBuffer;
import org.apache.http.util.LangUtils;
/**
Modified: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/StatusLine.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-core/src/java/org/apache/http/StatusLine.java?rev=328099&r1=328098&r2=328099&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-core/src/java/org/apache/http/StatusLine.java (original)
+++ jakarta/httpclient/trunk/http-core/src/java/org/apache/http/StatusLine.java Mon Oct 24 10:36:14 2005
@@ -29,7 +29,7 @@
package org.apache.http;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.http.io.CharArrayBuffer;
/**
* Represents a Status-Line as returned from a HTTP server.
Modified: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/impl/HeaderGroup.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-core/src/java/org/apache/http/impl/HeaderGroup.java?rev=328099&r1=328098&r2=328099&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-core/src/java/org/apache/http/impl/HeaderGroup.java (original)
+++ jakarta/httpclient/trunk/http-core/src/java/org/apache/http/impl/HeaderGroup.java Mon Oct 24 10:36:14 2005
@@ -34,7 +34,7 @@
import java.util.List;
import org.apache.http.Header;
-import org.apache.http.util.CharArrayBuffer;
+import org.apache.http.io.CharArrayBuffer;
/**
* A class for combining a set of headers. This class allows for multiple
Modified: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/impl/io/AbstractHttpDataReceiver.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-core/src/java/org/apache/http/impl/io/AbstractHttpDataReceiver.java?rev=328099&r1=328098&r2=328099&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-core/src/java/org/apache/http/impl/io/AbstractHttpDataReceiver.java (original)
+++ jakarta/httpclient/trunk/http-core/src/java/org/apache/http/impl/io/AbstractHttpDataReceiver.java Mon Oct 24 10:36:14 2005
@@ -32,11 +32,11 @@
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.HttpParams;
import org.apache.http.params.HttpProtocolParams;
-import org.apache.http.util.ByteArrayBuffer;
-import org.apache.http.util.CharArrayBuffer;
import org.apache.http.util.EncodingUtils;
/**
Copied: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/ByteArrayBuffer.java (from r326997, jakarta/httpclient/trunk/http-core/src/java/org/apache/http/util/ByteArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/ByteArrayBuffer.java?p2=jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/ByteArrayBuffer.java&p1=jakarta/httpclient/trunk/http-core/src/java/org/apache/http/util/ByteArrayBuffer.java&r1=326997&r2=328099&rev=328099&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-core/src/java/org/apache/http/util/ByteArrayBuffer.java (original)
+++ jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/ByteArrayBuffer.java Mon Oct 24 10:36:14 2005
@@ -27,7 +27,7 @@
*
*/
-package org.apache.http.util;
+package org.apache.http.io;
/**
* @author <a href="mailto:oleg@ural.ru">Oleg Kalnichevski</a>
Propchange: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/ByteArrayBuffer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/ByteArrayBuffer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/ByteArrayBuffer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/CharArrayBuffer.java (from r327828, jakarta/httpclient/trunk/http-core/src/java/org/apache/http/util/CharArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/CharArrayBuffer.java?p2=jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/CharArrayBuffer.java&p1=jakarta/httpclient/trunk/http-core/src/java/org/apache/http/util/CharArrayBuffer.java&r1=327828&r2=328099&rev=328099&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-core/src/java/org/apache/http/util/CharArrayBuffer.java (original)
+++ jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/CharArrayBuffer.java Mon Oct 24 10:36:14 2005
@@ -27,7 +27,7 @@
*
*/
-package org.apache.http.util;
+package org.apache.http.io;
/**
* @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
Propchange: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/CharArrayBuffer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/CharArrayBuffer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/CharArrayBuffer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/HttpDataReceiver.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/HttpDataReceiver.java?rev=328099&r1=328098&r2=328099&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/HttpDataReceiver.java (original)
+++ jakarta/httpclient/trunk/http-core/src/java/org/apache/http/io/HttpDataReceiver.java Mon Oct 24 10:36:14 2005
@@ -32,7 +32,6 @@
import java.io.IOException;
import org.apache.http.params.HttpParams;
-import org.apache.http.util.CharArrayBuffer;
/**
* <p>
Modified: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/util/EntityUtils.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-core/src/java/org/apache/http/util/EntityUtils.java?rev=328099&r1=328098&r2=328099&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-core/src/java/org/apache/http/util/EntityUtils.java (original)
+++ jakarta/httpclient/trunk/http-core/src/java/org/apache/http/util/EntityUtils.java Mon Oct 24 10:36:14 2005
@@ -37,6 +37,8 @@
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;
/**
* <p>
Modified: jakarta/httpclient/trunk/http-core/src/java/org/apache/http/util/HeadersParser.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-core/src/java/org/apache/http/util/HeadersParser.java?rev=328099&r1=328098&r2=328099&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-core/src/java/org/apache/http/util/HeadersParser.java (original)
+++ jakarta/httpclient/trunk/http-core/src/java/org/apache/http/util/HeadersParser.java Mon Oct 24 10:36:14 2005
@@ -34,6 +34,7 @@
import org.apache.http.Header;
import org.apache.http.HttpException;
+import org.apache.http.io.CharArrayBuffer;
import org.apache.http.io.HttpDataReceiver;
/**
Modified: jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestAllIO.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestAllIO.java?rev=328099&r1=328098&r2=328099&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestAllIO.java (original)
+++ jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestAllIO.java Mon Oct 24 10:36:14 2005
@@ -38,6 +38,8 @@
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());
Copied: jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestByteArrayBuffer.java (from r326997, jakarta/httpclient/trunk/http-core/src/test/org/apache/http/util/TestByteArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestByteArrayBuffer.java?p2=jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestByteArrayBuffer.java&p1=jakarta/httpclient/trunk/http-core/src/test/org/apache/http/util/TestByteArrayBuffer.java&r1=326997&r2=328099&rev=328099&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-core/src/test/org/apache/http/util/TestByteArrayBuffer.java (original)
+++ jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestByteArrayBuffer.java Mon Oct 24 10:36:14 2005
@@ -27,7 +27,9 @@
*
*/
-package org.apache.http.util;
+package org.apache.http.io;
+
+import org.apache.http.io.ByteArrayBuffer;
import junit.framework.Test;
import junit.framework.TestCase;
Propchange: jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestByteArrayBuffer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestByteArrayBuffer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestByteArrayBuffer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestCharArrayBuffer.java (from r327828, jakarta/httpclient/trunk/http-core/src/test/org/apache/http/util/TestCharArrayBuffer.java)
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestCharArrayBuffer.java?p2=jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestCharArrayBuffer.java&p1=jakarta/httpclient/trunk/http-core/src/test/org/apache/http/util/TestCharArrayBuffer.java&r1=327828&r2=328099&rev=328099&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-core/src/test/org/apache/http/util/TestCharArrayBuffer.java (original)
+++ jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestCharArrayBuffer.java Mon Oct 24 10:36:14 2005
@@ -27,7 +27,9 @@
*
*/
-package org.apache.http.util;
+package org.apache.http.io;
+
+import org.apache.http.io.CharArrayBuffer;
import junit.framework.Test;
import junit.framework.TestCase;
Propchange: jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestCharArrayBuffer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestCharArrayBuffer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpclient/trunk/http-core/src/test/org/apache/http/io/TestCharArrayBuffer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: jakarta/httpclient/trunk/http-core/src/test/org/apache/http/util/TestAllUtil.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-core/src/test/org/apache/http/util/TestAllUtil.java?rev=328099&r1=328098&r2=328099&view=diff
==============================================================================
--- jakarta/httpclient/trunk/http-core/src/test/org/apache/http/util/TestAllUtil.java (original)
+++ jakarta/httpclient/trunk/http-core/src/test/org/apache/http/util/TestAllUtil.java Mon Oct 24 10:36:14 2005
@@ -44,8 +44,6 @@
suite.addTest(TestParameterParser.suite());
suite.addTest(TestParameterFormatter.suite());
suite.addTest(TestHeadersParser.suite());
- suite.addTest(TestByteArrayBuffer.suite());
- suite.addTest(TestCharArrayBuffer.suite());
suite.addTest(TestDateUtils.suite());
suite.addTest(TestEntityUtils.suite());
return suite;