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 18:31:40 UTC
svn commit: r473999 - in
/jakarta/httpcomponents/httpcore/trunk/module-nio/src:
main/java/org/apache/http/nio/buffer/ main/java/org/apache/http/nio/content/
main/java/org/apache/http/nio/handler/
main/java/org/apache/http/nio/impl/handler/ main/java/or...
Author: olegk
Date: Sun Nov 12 09:31:38 2006
New Revision: 473999
URL: http://svn.apache.org/viewvc?view=rev&rev=473999
Log:
Moved some classes around
Added:
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/
- copied from r473993, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ContentInputBuffer.java
- copied, changed from r473997, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/ContentInputBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ContentInputStream.java
- copied, changed from r473997, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/ContentInputStream.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ContentOutputBuffer.java
- copied, changed from r473997, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/ContentOutputBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ContentOutputStream.java
- copied, changed from r473997, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/ContentOutputStream.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ExpandableBuffer.java
- copied, changed from r473997, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/ExpandableBuffer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/reactor/TestAllImplReactor.java (with props)
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/reactor/TestSessionInOutBuffers.java (contents, props changed)
- copied, changed from r473997, jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/TestSessionInOutBuffers.java
Removed:
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/handler/
jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/TestSessionInOutBuffers.java
Modified:
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/handler/AsyncHttpService.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/test/java/org/apache/http/nio/impl/TestAllImpl.java
Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ContentInputBuffer.java (from r473997, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/ContentInputBuffer.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ContentInputBuffer.java?view=diff&rev=473999&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/ContentInputBuffer.java&r1=473997&p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ContentInputBuffer.java&r2=473999
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/ContentInputBuffer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ContentInputBuffer.java Sun Nov 12 09:31:38 2006
@@ -26,7 +26,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.nio.content;
+package org.apache.http.nio.buffer;
import java.io.IOException;
Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ContentInputStream.java (from r473997, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/ContentInputStream.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ContentInputStream.java?view=diff&rev=473999&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/ContentInputStream.java&r1=473997&p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ContentInputStream.java&r2=473999
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/ContentInputStream.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ContentInputStream.java Sun Nov 12 09:31:38 2006
@@ -27,7 +27,7 @@
*
*/
-package org.apache.http.nio.content;
+package org.apache.http.nio.buffer;
import java.io.IOException;
import java.io.InputStream;
Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ContentOutputBuffer.java (from r473997, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/ContentOutputBuffer.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ContentOutputBuffer.java?view=diff&rev=473999&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/ContentOutputBuffer.java&r1=473997&p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ContentOutputBuffer.java&r2=473999
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/ContentOutputBuffer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ContentOutputBuffer.java Sun Nov 12 09:31:38 2006
@@ -26,7 +26,7 @@
* <http://www.apache.org/>.
*
*/
-package org.apache.http.nio.content;
+package org.apache.http.nio.buffer;
import java.io.IOException;
Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ContentOutputStream.java (from r473997, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/ContentOutputStream.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ContentOutputStream.java?view=diff&rev=473999&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/ContentOutputStream.java&r1=473997&p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ContentOutputStream.java&r2=473999
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/ContentOutputStream.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ContentOutputStream.java Sun Nov 12 09:31:38 2006
@@ -27,7 +27,7 @@
*
*/
-package org.apache.http.nio.content;
+package org.apache.http.nio.buffer;
import java.io.IOException;
import java.io.OutputStream;
Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ExpandableBuffer.java (from r473997, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/ExpandableBuffer.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ExpandableBuffer.java?view=diff&rev=473999&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/ExpandableBuffer.java&r1=473997&p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ExpandableBuffer.java&r2=473999
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/content/ExpandableBuffer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/buffer/ExpandableBuffer.java Sun Nov 12 09:31:38 2006
@@ -27,7 +27,7 @@
*
*/
-package org.apache.http.nio.content;
+package org.apache.http.nio.buffer;
import java.nio.ByteBuffer;
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/handler/AsyncHttpService.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/handler/AsyncHttpService.java?view=diff&rev=473999&r1=473998&r2=473999
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/handler/AsyncHttpService.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/handler/AsyncHttpService.java Sun Nov 12 09:31:38 2006
@@ -21,10 +21,10 @@
import org.apache.http.nio.ContentEncoder;
import org.apache.http.nio.ContentIOControl;
import org.apache.http.nio.NHttpServerConnection;
-import org.apache.http.nio.content.ContentInputBuffer;
-import org.apache.http.nio.content.ContentInputStream;
-import org.apache.http.nio.content.ContentOutputBuffer;
-import org.apache.http.nio.content.ContentOutputStream;
+import org.apache.http.nio.buffer.ContentInputBuffer;
+import org.apache.http.nio.buffer.ContentInputStream;
+import org.apache.http.nio.buffer.ContentOutputBuffer;
+import org.apache.http.nio.buffer.ContentOutputStream;
import org.apache.http.params.HttpParams;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpExecutionContext;
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/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=473999&r1=473998&r2=473999
==============================================================================
--- 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 Sun Nov 12 09:31:38 2006
@@ -37,7 +37,7 @@
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CoderResult;
-import org.apache.http.nio.content.ExpandableBuffer;
+import org.apache.http.nio.buffer.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=473999&r1=473998&r2=473999
==============================================================================
--- 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 Sun Nov 12 09:31:38 2006
@@ -37,7 +37,7 @@
import java.nio.charset.CharsetEncoder;
import java.nio.charset.CoderResult;
-import org.apache.http.nio.content.ExpandableBuffer;
+import org.apache.http.nio.buffer.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/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=473999&r1=473998&r2=473999
==============================================================================
--- 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 Sun Nov 12 09:31:38 2006
@@ -29,6 +29,7 @@
package org.apache.http.nio.impl;
import org.apache.http.nio.impl.codecs.TestAllImplCodecs;
+import org.apache.http.nio.impl.reactor.TestAllImplReactor;
import junit.framework.*;
@@ -40,7 +41,7 @@
public static Test suite() {
TestSuite suite = new TestSuite();
- suite.addTest(TestSessionInOutBuffers.suite());
+ suite.addTest(TestAllImplReactor.suite());
suite.addTest(TestAllImplCodecs.suite());
return suite;
}
Added: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/reactor/TestAllImplReactor.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/reactor/TestAllImplReactor.java?view=auto&rev=473999
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/reactor/TestAllImplReactor.java (added)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/reactor/TestAllImplReactor.java Sun Nov 12 09:31:38 2006
@@ -0,0 +1,50 @@
+/*
+ * $HeadURL$
+ * $Revision$
+ * $Date$
+ * ====================================================================
+ *
+ * Copyright 1999-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.http.nio.impl.reactor;
+
+import junit.framework.*;
+
+public class TestAllImplReactor extends TestCase {
+
+ public TestAllImplReactor(String testName) {
+ super(testName);
+ }
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite();
+ suite.addTest(TestSessionInOutBuffers.suite());
+ return suite;
+ }
+
+ public static void main(String args[]) {
+ String[] testCaseName = { TestAllImplReactor.class.getName() };
+ junit.textui.TestRunner.main(testCaseName);
+ }
+
+}
Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/reactor/TestAllImplReactor.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/reactor/TestAllImplReactor.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/reactor/TestSessionInOutBuffers.java (from r473997, 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/reactor/TestSessionInOutBuffers.java?view=diff&rev=473999&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/TestSessionInOutBuffers.java&r1=473997&p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/reactor/TestSessionInOutBuffers.java&r2=473999
==============================================================================
--- 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/reactor/TestSessionInOutBuffers.java Sun Nov 12 09:31:38 2006
@@ -26,7 +26,7 @@
*
*/
-package org.apache.http.nio.impl;
+package org.apache.http.nio.impl.reactor;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/reactor/TestSessionInOutBuffers.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/impl/reactor/TestSessionInOutBuffers.java
------------------------------------------------------------------------------
svn:mime-type = text/plain