You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2006/11/20 04:32:28 UTC
svn commit: r477020 - in /mina/trunk: core/
core/src/main/java/org/apache/mina/common/
core/src/main/java/org/apache/mina/common/support/
core/src/main/java/org/apache/mina/filter/executor/
core/src/main/java/org/apache/mina/management/ core/src/main/j...
Author: trustin
Date: Sun Nov 19 19:32:26 2006
New Revision: 477020
URL: http://svn.apache.org/viewvc?view=rev&rev=477020
Log:
Removed java5 module and backport-util-concurrent dependency
Modified:
mina/trunk/core/pom.xml
mina/trunk/core/src/main/java/org/apache/mina/common/ExecutorThreadModel.java
mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java
mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java
mina/trunk/core/src/main/java/org/apache/mina/management/IoSessionStat.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
mina/trunk/core/src/main/java/org/apache/mina/util/ExpiringMap.java
mina/trunk/core/src/main/java/org/apache/mina/util/NewThreadExecutor.java
mina/trunk/core/src/test/java/org/apache/mina/common/ByteBufferTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java
mina/trunk/core/src/test/java/org/apache/mina/handler/demux/DemuxingIoHandlerTest.java
mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ExecutorThreadModelFactoryBean.java
mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ThreadPoolExecutorFactoryBean.java
mina/trunk/integration-spring/src/test/java/org/apache/mina/integration/spring/ExecutorThreadModelFactoryBeanTest.java
Modified: mina/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/mina/trunk/core/pom.xml?view=diff&rev=477020&r1=477019&r2=477020
==============================================================================
--- mina/trunk/core/pom.xml (original)
+++ mina/trunk/core/pom.xml Sun Nov 19 19:32:26 2006
@@ -20,13 +20,6 @@
</dependency>
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>2.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
<version>1.2_Java1.3</version>
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/ExecutorThreadModel.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/ExecutorThreadModel.java?view=diff&rev=477020&r1=477019&r2=477020
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/ExecutorThreadModel.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/ExecutorThreadModel.java Sun Nov 19 19:32:26 2006
@@ -21,13 +21,12 @@
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.mina.filter.executor.ExecutorFilter;
-
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
-import edu.emory.mathcs.backport.java.util.concurrent.ThreadFactory;
-import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
/**
* A {@link ThreadModel} which represents a thread model with an {@link Executor}
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java?view=diff&rev=477020&r1=477019&r2=477020
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java Sun Nov 19 19:32:26 2006
@@ -19,6 +19,7 @@
*/
package org.apache.mina.common.support;
+import java.net.SocketAddress;
import java.util.Set;
import org.apache.mina.common.DefaultIoFilterChainBuilder;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java?view=diff&rev=477020&r1=477019&r2=477020
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java Sun Nov 19 19:32:26 2006
@@ -21,6 +21,10 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoFilterAdapter;
@@ -30,11 +34,6 @@
import org.apache.mina.util.ByteBufferUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
-import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue;
-import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
/**
* A filter that forward events to {@link Executor} in
Modified: mina/trunk/core/src/main/java/org/apache/mina/management/IoSessionStat.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/management/IoSessionStat.java?view=diff&rev=477020&r1=477019&r2=477020
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/management/IoSessionStat.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/management/IoSessionStat.java Sun Nov 19 19:32:26 2006
@@ -19,6 +19,8 @@
*/
package org.apache.mina.management;
+import org.apache.mina.common.IoSession;
+
/**
* The collected stats for a session. It's used by {@link StatCollector} to attach
* throughput stats to an {@link IoSession}. You can accces a session stat using
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java?view=diff&rev=477020&r1=477019&r2=477020
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java Sun Nov 19 19:32:26 2006
@@ -19,13 +19,13 @@
*/
package org.apache.mina.transport.socket.nio;
+import java.util.concurrent.Executor;
+
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoSessionRecycler;
import org.apache.mina.common.support.DelegatedIoAcceptor;
import org.apache.mina.transport.socket.nio.support.DatagramAcceptorDelegate;
import org.apache.mina.util.NewThreadExecutor;
-
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
/**
* {@link IoAcceptor} for datagram transport (UDP/IP).
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java?view=diff&rev=477020&r1=477019&r2=477020
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java Sun Nov 19 19:32:26 2006
@@ -19,13 +19,13 @@
*/
package org.apache.mina.transport.socket.nio;
+import java.util.concurrent.Executor;
+
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoSessionRecycler;
import org.apache.mina.common.support.DelegatedIoConnector;
import org.apache.mina.transport.socket.nio.support.DatagramConnectorDelegate;
import org.apache.mina.util.NewThreadExecutor;
-
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
/**
* {@link IoConnector} for datagram transport (UDP/IP).
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java?view=diff&rev=477020&r1=477019&r2=477020
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java Sun Nov 19 19:32:26 2006
@@ -29,6 +29,7 @@
import java.nio.channels.SocketChannel;
import java.util.Iterator;
import java.util.Set;
+import java.util.concurrent.Executor;
import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.IoAcceptor;
@@ -40,8 +41,6 @@
import org.apache.mina.util.NamePreservingRunnable;
import org.apache.mina.util.NewThreadExecutor;
import org.apache.mina.util.Queue;
-
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
/**
* {@link IoAcceptor} for socket transport (TCP/IP).
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java?view=diff&rev=477020&r1=477019&r2=477020
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java Sun Nov 19 19:32:26 2006
@@ -28,6 +28,7 @@
import java.nio.channels.SocketChannel;
import java.util.Iterator;
import java.util.Set;
+import java.util.concurrent.Executor;
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.ExceptionMonitor;
@@ -40,8 +41,6 @@
import org.apache.mina.util.NamePreservingRunnable;
import org.apache.mina.util.NewThreadExecutor;
import org.apache.mina.util.Queue;
-
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
/**
* {@link IoConnector} for socket transport (TCP/IP).
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java?view=diff&rev=477020&r1=477019&r2=477020
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java Sun Nov 19 19:32:26 2006
@@ -25,6 +25,7 @@
import java.nio.channels.SocketChannel;
import java.util.Iterator;
import java.util.Set;
+import java.util.concurrent.Executor;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.ExceptionMonitor;
@@ -36,8 +37,6 @@
import org.apache.mina.common.support.IoServiceListenerSupport;
import org.apache.mina.util.NamePreservingRunnable;
import org.apache.mina.util.Queue;
-
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
/**
* Performs all I/O operations for sockets which is connected or bound. This class is used by MINA internally.
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java?view=diff&rev=477020&r1=477019&r2=477020
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java Sun Nov 19 19:32:26 2006
@@ -27,6 +27,7 @@
import java.nio.channels.Selector;
import java.util.Iterator;
import java.util.Set;
+import java.util.concurrent.Executor;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.ExceptionMonitor;
@@ -41,8 +42,6 @@
import org.apache.mina.transport.socket.nio.DatagramSessionConfig;
import org.apache.mina.util.NamePreservingRunnable;
import org.apache.mina.util.Queue;
-
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
/**
* {@link IoAcceptor} for datagram transport (UDP/IP).
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java?view=diff&rev=477020&r1=477019&r2=477020
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java Sun Nov 19 19:32:26 2006
@@ -27,6 +27,7 @@
import java.nio.channels.Selector;
import java.util.Iterator;
import java.util.Set;
+import java.util.concurrent.Executor;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.ConnectFuture;
@@ -43,8 +44,6 @@
import org.apache.mina.transport.socket.nio.DatagramSessionConfig;
import org.apache.mina.util.NamePreservingRunnable;
import org.apache.mina.util.Queue;
-
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
/**
* {@link IoConnector} for datagram transport (UDP/IP).
Modified: mina/trunk/core/src/main/java/org/apache/mina/util/ExpiringMap.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/util/ExpiringMap.java?view=diff&rev=477020&r1=477019&r2=477020
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/util/ExpiringMap.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/util/ExpiringMap.java Sun Nov 19 19:32:26 2006
@@ -23,11 +23,10 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-
-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
-import edu.emory.mathcs.backport.java.util.concurrent.locks.ReadWriteLock;
-import edu.emory.mathcs.backport.java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
* A map with expiration.
Modified: mina/trunk/core/src/main/java/org/apache/mina/util/NewThreadExecutor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/util/NewThreadExecutor.java?view=diff&rev=477020&r1=477019&r2=477020
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/util/NewThreadExecutor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/util/NewThreadExecutor.java Sun Nov 19 19:32:26 2006
@@ -18,7 +18,7 @@
*/
package org.apache.mina.util;
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
+import java.util.concurrent.Executor;
/**
* An Executor that just launches in a new thread.
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/ByteBufferTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/ByteBufferTest.java?view=diff&rev=477020&r1=477019&r2=477020
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/ByteBufferTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/ByteBufferTest.java Sun Nov 19 19:32:26 2006
@@ -19,9 +19,6 @@
*/
package org.apache.mina.common;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
import java.nio.BufferOverflowException;
import java.nio.ByteOrder;
import java.nio.ReadOnlyBufferException;
@@ -32,6 +29,9 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
/**
* Tests {@link ByteBuffer}.
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java?view=diff&rev=477020&r1=477019&r2=477020
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java Sun Nov 19 19:32:26 2006
@@ -20,6 +20,8 @@
package org.apache.mina.filter.executor;
import java.net.SocketAddress;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -35,9 +37,6 @@
import org.apache.mina.common.IoFilter.NextFilter;
import org.apache.mina.common.IoFilter.WriteRequest;
import org.apache.mina.common.support.BaseIoSession;
-
-import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
public class ExecutorFilterRegressionTest extends TestCase
{
Modified: mina/trunk/core/src/test/java/org/apache/mina/handler/demux/DemuxingIoHandlerTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/handler/demux/DemuxingIoHandlerTest.java?view=diff&rev=477020&r1=477019&r2=477020
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/handler/demux/DemuxingIoHandlerTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/handler/demux/DemuxingIoHandlerTest.java Sun Nov 19 19:32:26 2006
@@ -22,8 +22,6 @@
import junit.framework.TestCase;
import org.apache.mina.common.IoSession;
-import org.apache.mina.handler.demux.DemuxingIoHandler;
-import org.apache.mina.handler.demux.MessageHandler;
import org.easymock.MockControl;
/**
Modified: mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ExecutorThreadModelFactoryBean.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ExecutorThreadModelFactoryBean.java?view=diff&rev=477020&r1=477019&r2=477020
==============================================================================
--- mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ExecutorThreadModelFactoryBean.java (original)
+++ mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ExecutorThreadModelFactoryBean.java Sun Nov 19 19:32:26 2006
@@ -19,12 +19,12 @@
*/
package org.apache.mina.integration.spring;
+import java.util.concurrent.Executor;
+
import org.apache.mina.common.ExecutorThreadModel;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.util.Assert;
-
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
/**
* Spring {@link FactoryBean} which makes it possible to set up a MINA
Modified: mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ThreadPoolExecutorFactoryBean.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ThreadPoolExecutorFactoryBean.java?view=diff&rev=477020&r1=477019&r2=477020
==============================================================================
--- mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ThreadPoolExecutorFactoryBean.java (original)
+++ mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ThreadPoolExecutorFactoryBean.java Sun Nov 19 19:32:26 2006
@@ -19,17 +19,17 @@
*/
package org.apache.mina.integration.spring;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-import edu.emory.mathcs.backport.java.util.concurrent.BlockingQueue;
-import edu.emory.mathcs.backport.java.util.concurrent.Executors;
-import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue;
-import edu.emory.mathcs.backport.java.util.concurrent.RejectedExecutionHandler;
-import edu.emory.mathcs.backport.java.util.concurrent.SynchronousQueue;
-import edu.emory.mathcs.backport.java.util.concurrent.ThreadFactory;
-import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
/**
* Spring {@link FactoryBean} which enables the configuration of
Modified: mina/trunk/integration-spring/src/test/java/org/apache/mina/integration/spring/ExecutorThreadModelFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-spring/src/test/java/org/apache/mina/integration/spring/ExecutorThreadModelFactoryBeanTest.java?view=diff&rev=477020&r1=477019&r2=477020
==============================================================================
--- mina/trunk/integration-spring/src/test/java/org/apache/mina/integration/spring/ExecutorThreadModelFactoryBeanTest.java (original)
+++ mina/trunk/integration-spring/src/test/java/org/apache/mina/integration/spring/ExecutorThreadModelFactoryBeanTest.java Sun Nov 19 19:32:26 2006
@@ -19,14 +19,14 @@
*/
package org.apache.mina.integration.spring;
+import java.util.concurrent.Executor;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
import junit.framework.TestCase;
import org.apache.mina.common.ExecutorThreadModel;
-
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
-import edu.emory.mathcs.backport.java.util.concurrent.SynchronousQueue;
-import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
/**
* Tests {@link ExecutorThreadModelFactoryBean}.