You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ro...@apache.org on 2007/02/04 14:34:20 UTC
svn commit: r503405 - in /jakarta/httpcomponents/httpcore/trunk: ./
module-main/src/main/java/org/apache/http/util/concurrent/
module-nio/src/examples/org/apache/http/examples/nio/
module-nio/src/main/java/org/apache/http/impl/nio/reactor/ module-nio/s...
Author: rolandw
Date: Sun Feb 4 05:34:19 2007
New Revision: 503405
URL: http://svn.apache.org/viewvc?view=rev&rev=503405
Log:
moved nio.concurrent to util.concurrent
Added:
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/concurrent/
- copied from r503379, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/concurrent/
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/concurrent/package.html (with props)
Removed:
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/concurrent/
Modified:
jakarta/httpcomponents/httpcore/trunk/build.xml
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/concurrent/Executor.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/concurrent/ThreadFactory.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/AsyncHttpServer.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultListeningIOReactor.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
Modified: jakarta/httpcomponents/httpcore/trunk/build.xml
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/build.xml?view=diff&rev=503405&r1=503404&r2=503405
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/build.xml (original)
+++ jakarta/httpcomponents/httpcore/trunk/build.xml Sun Feb 4 05:34:19 2007
@@ -299,12 +299,8 @@
<package name="org.apache.http.message" />
<package name="org.apache.http.params" />
<package name="org.apache.http.protocol" />
- <package name="org.apache.http.util" />
- <package name="org.apache.http.nio" />
- <package name="org.apache.http.nio.concurrent" />
- <package name="org.apache.http.nio.params" />
- <package name="org.apache.http.nio.protocol" />
- <package name="org.apache.http.nio.reactor" />
+ <package name="org.apache.http.util*" />
+ <package name="org.apache.http.nio*" />
</group>
<group title="Implementation">
<package name="org.apache.http.impl*" />
@@ -351,12 +347,8 @@
<package name="org.apache.http.message" />
<package name="org.apache.http.params" />
<package name="org.apache.http.protocol" />
- <package name="org.apache.http.util" />
- <package name="org.apache.http.nio" />
- <package name="org.apache.http.nio.concurrent" />
- <package name="org.apache.http.nio.params" />
- <package name="org.apache.http.nio.protocol" />
- <package name="org.apache.http.nio.reactor" />
+ <package name="org.apache.http.util*" />
+ <package name="org.apache.http.nio*" />
</group>
<group title="Implementation">
<package name="org.apache.http.impl*" />
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/concurrent/Executor.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/concurrent/Executor.java?view=diff&rev=503405&r1=503379&r2=503405
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/concurrent/Executor.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/concurrent/Executor.java Sun Feb 4 05:34:19 2007
@@ -29,11 +29,12 @@
*
*/
-package org.apache.http.nio.concurrent;
+package org.apache.http.util.concurrent;
/**
- * Abstract command executor. This interface is needed in order to
- * avoid direct dependency on java.util.concurrent
+ * Abstract command executor.
+ * This interface is needed in order to avoid direct dependency
+ * on <code>java.util.concurrent</code> in Java 5.
*
* @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
*/
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/concurrent/ThreadFactory.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/concurrent/ThreadFactory.java?view=diff&rev=503405&r1=503379&r2=503405
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/concurrent/ThreadFactory.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/concurrent/ThreadFactory.java Sun Feb 4 05:34:19 2007
@@ -29,11 +29,12 @@
*
*/
-package org.apache.http.nio.concurrent;
+package org.apache.http.util.concurrent;
/**
- * Abstract thread factory. This interface is needed in order to
- * avoid direct dependency on java.util.concurrent
+ * Abstract thread factory.
+ * This interface is needed in order to avoid direct dependency
+ * on <code>java.util.concurrent</code> in Java 5.
*
* @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
*/
Added: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/concurrent/package.html
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/concurrent/package.html?view=auto&rev=503405
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/concurrent/package.html (added)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/concurrent/package.html Sun Feb 4 05:34:19 2007
@@ -0,0 +1,41 @@
+<html>
+<head>
+<!--
+/*
+ * $HeadURL$
+ * $Revision$
+ * $Date$
+ *
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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/>.
+ *
+ */
+-->
+</head>
+<body>
+Interfaces corresponding to <code>java.util.concurrent</code>.
+
+These interfaces are defined here to avoid a dependency on Java 5.
+</body>
+</html>
Propchange: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/concurrent/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/concurrent/package.html
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/util/concurrent/package.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/AsyncHttpServer.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/AsyncHttpServer.java?view=diff&rev=503405&r1=503404&r2=503405
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/AsyncHttpServer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/examples/org/apache/http/examples/nio/AsyncHttpServer.java Sun Feb 4 05:34:19 2007
@@ -22,7 +22,7 @@
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.DefaultHttpResponseFactory;
import org.apache.http.impl.params.DefaultHttpParams;
-import org.apache.http.nio.concurrent.Executor;
+import org.apache.http.util.concurrent.Executor;
import org.apache.http.impl.nio.DefaultServerIOEventDispatch;
import org.apache.http.impl.nio.reactor.DefaultListeningIOReactor;
import org.apache.http.nio.params.HttpNIOParams;
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java?view=diff&rev=503405&r1=503404&r2=503405
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java Sun Feb 4 05:34:19 2007
@@ -33,7 +33,7 @@
import java.io.InterruptedIOException;
-import org.apache.http.nio.concurrent.ThreadFactory;
+import org.apache.http.util.concurrent.ThreadFactory;
import org.apache.http.nio.reactor.IOEventDispatch;
import org.apache.http.nio.reactor.IOReactor;
import org.apache.http.nio.reactor.IOReactorException;
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java?view=diff&rev=503405&r1=503404&r2=503405
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java Sun Feb 4 05:34:19 2007
@@ -42,7 +42,7 @@
import java.util.Iterator;
import java.util.Set;
-import org.apache.http.nio.concurrent.ThreadFactory;
+import org.apache.http.util.concurrent.ThreadFactory;
import org.apache.http.nio.reactor.ConnectingIOReactor;
import org.apache.http.nio.reactor.IOEventDispatch;
import org.apache.http.nio.reactor.IOReactorException;
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultListeningIOReactor.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultListeningIOReactor.java?view=diff&rev=503405&r1=503404&r2=503405
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultListeningIOReactor.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultListeningIOReactor.java Sun Feb 4 05:34:19 2007
@@ -43,7 +43,7 @@
import java.util.Iterator;
import java.util.Set;
-import org.apache.http.nio.concurrent.ThreadFactory;
+import org.apache.http.util.concurrent.ThreadFactory;
import org.apache.http.nio.reactor.IOEventDispatch;
import org.apache.http.nio.reactor.IOReactorException;
import org.apache.http.nio.reactor.IOReactorExceptionHandler;
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java?view=diff&rev=503405&r1=503404&r2=503405
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java Sun Feb 4 05:34:19 2007
@@ -54,7 +54,7 @@
import org.apache.http.nio.NHttpConnection;
import org.apache.http.nio.NHttpServerConnection;
import org.apache.http.nio.NHttpServiceHandler;
-import org.apache.http.nio.concurrent.Executor;
+import org.apache.http.util.concurrent.Executor;
import org.apache.http.impl.nio.SharedInputBuffer;
import org.apache.http.impl.nio.SharedOutputBuffer;
import org.apache.http.impl.nio.entity.BufferedContent;