You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by tr...@apache.org on 2006/01/21 03:26:20 UTC
svn commit: r370959 - in /directory/sandbox/trustin/mina-spi/core/src:
main/java/org/apache/mina/common/support/discovery/jdk/
main/java/org/apache/mina/common/support/discovery/tools/
main/java/org/apache/mina/common/support/lang/time/ main/java/org/a...
Author: trustin
Date: Fri Jan 20 18:26:02 2006
New Revision: 370959
URL: http://svn.apache.org/viewcvs?rev=370959&view=rev
Log:
* Fixed some compilation errors
* Removed unused classes
Removed:
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSession.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSessionManager.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSession.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionManager.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSession.java
Modified:
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/jdk/JDKHooks.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/DefaultClassHolder.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/time/DurationFormatUtils.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/registry/ServiceRegistry.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/registry/SimpleServiceRegistry.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramServiceProvider.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketServiceProvider.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketAcceptorDelegate.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketConnectorDelegate.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeServiceProvider.java
directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/util/SessionUtil.java
directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/handler/demux/DemuxingIoHandlerTest.java
directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java
directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramTrafficControlTest.java
directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/socket/nio/SocketBindTest.java
directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/socket/nio/SocketTrafficControlTest.java
directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeBindTest.java
directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeTrafficControlTest.java
Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/jdk/JDKHooks.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/jdk/JDKHooks.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/jdk/JDKHooks.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/jdk/JDKHooks.java Fri Jan 20 18:26:02 2006
@@ -61,8 +61,8 @@
package org.apache.mina.common.support.discovery.jdk;
-import java.util.Enumeration;
import java.io.IOException;
+import java.util.Enumeration;
/**
Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/DefaultClassHolder.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/DefaultClassHolder.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/DefaultClassHolder.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/discovery/tools/DefaultClassHolder.java Fri Jan 20 18:26:02 2006
@@ -63,8 +63,8 @@
import org.apache.mina.common.support.discovery.ResourceClass;
import org.apache.mina.common.support.discovery.ResourceClassIterator;
-import org.apache.mina.common.support.discovery.resource.classes.DiscoverClasses;
import org.apache.mina.common.support.discovery.resource.ClassLoaders;
+import org.apache.mina.common.support.discovery.resource.classes.DiscoverClasses;
/**
Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/time/DurationFormatUtils.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/time/DurationFormatUtils.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/time/DurationFormatUtils.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/common/support/lang/time/DurationFormatUtils.java Fri Jan 20 18:26:02 2006
@@ -15,11 +15,11 @@
*/
package org.apache.mina.common.support.lang.time;
-import org.apache.mina.common.support.lang.StringUtils;
-
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
+
+import org.apache.mina.common.support.lang.StringUtils;
/**
* <p>Duration formatting utilities and constants. The following table describes the tokens
Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/registry/ServiceRegistry.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/registry/ServiceRegistry.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/registry/ServiceRegistry.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/registry/ServiceRegistry.java Fri Jan 20 18:26:02 2006
@@ -21,11 +21,11 @@
import java.io.IOException;
import java.util.Set;
-import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoFilterChainBuilder;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceProvider.IoAcceptor;
/**
* Interface for the internet service registry. The registry is used by MINA
Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/registry/SimpleServiceRegistry.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/registry/SimpleServiceRegistry.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/registry/SimpleServiceRegistry.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/registry/SimpleServiceRegistry.java Fri Jan 20 18:26:02 2006
@@ -10,11 +10,11 @@
import java.util.Iterator;
import java.util.Set;
-import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoFilterChainBuilder;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceProvider.IoAcceptor;
import org.apache.mina.filter.ThreadPoolFilter;
import org.apache.mina.transport.socket.nio.DatagramAcceptor;
import org.apache.mina.transport.socket.nio.SocketAcceptor;
Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramServiceProvider.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramServiceProvider.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramServiceProvider.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramServiceProvider.java Fri Jan 20 18:26:02 2006
@@ -18,8 +18,6 @@
*/
package org.apache.mina.transport.socket.nio;
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoServiceProvider;
public class DatagramServiceProvider implements IoServiceProvider
Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketServiceProvider.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketServiceProvider.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketServiceProvider.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/SocketServiceProvider.java Fri Jan 20 18:26:02 2006
@@ -18,8 +18,6 @@
*/
package org.apache.mina.transport.socket.nio;
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoServiceProvider;
public class SocketServiceProvider implements IoServiceProvider
Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java Fri Jan 20 18:26:02 2006
@@ -31,12 +31,12 @@
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.ExceptionMonitor;
-import org.apache.mina.common.IoAcceptor;
+import org.apache.mina.common.IoAddress;
import org.apache.mina.common.IoFilterChainBuilder;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoFilter.WriteRequest;
-import org.apache.mina.common.support.BaseIoAcceptor;
+import org.apache.mina.common.IoServiceProvider.IoAcceptor;
import org.apache.mina.util.ExceptionUtil;
import org.apache.mina.util.Queue;
@@ -46,7 +46,7 @@
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-public class DatagramAcceptorDelegate extends BaseIoAcceptor implements IoAcceptor, DatagramSessionManager
+public class DatagramAcceptorDelegate implements IoAcceptor, DatagramSessionManager
{
private static volatile int nextId = 0;
@@ -72,7 +72,7 @@
this.wrapper = wrapper;
}
- public void bind( SocketAddress address, IoHandler handler, IoFilterChainBuilder filterChainBuilder )
+ public void bind( IoAddress address, IoHandler handler, IoFilterChainBuilder filterChainBuilder )
throws IOException
{
if( address == null )
Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java Fri Jan 20 18:26:02 2006
@@ -30,11 +30,10 @@
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.ExceptionMonitor;
-import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoFilterChainBuilder;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoFilter.WriteRequest;
-import org.apache.mina.common.support.BaseIoConnector;
+import org.apache.mina.common.IoServiceProvider.IoConnector;
import org.apache.mina.util.Queue;
/**
Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketAcceptorDelegate.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketAcceptorDelegate.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketAcceptorDelegate.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketAcceptorDelegate.java Fri Jan 20 18:26:02 2006
@@ -36,12 +36,11 @@
import java.util.Set;
import org.apache.mina.common.ExceptionMonitor;
-import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoFilterChainBuilder;
import org.apache.mina.common.IoFuture;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.support.BaseIoAcceptor;
+import org.apache.mina.common.IoServiceProvider.IoAcceptor;
import org.apache.mina.transport.socket.nio.SocketSessionManager;
import org.apache.mina.util.Queue;
Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketConnectorDelegate.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketConnectorDelegate.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketConnectorDelegate.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketConnectorDelegate.java Fri Jan 20 18:26:02 2006
@@ -32,10 +32,9 @@
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.ExceptionMonitor;
-import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoFilterChainBuilder;
import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.support.BaseIoConnector;
+import org.apache.mina.common.IoServiceProvider.IoConnector;
import org.apache.mina.transport.socket.nio.SocketSessionManager;
import org.apache.mina.util.ExceptionUtil;
import org.apache.mina.util.Queue;
Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java Fri Jan 20 18:26:02 2006
@@ -16,7 +16,6 @@
import org.apache.mina.common.IoFuture;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.support.BaseIoAcceptor;
import org.apache.mina.transport.vmpipe.support.VmPipe;
/**
Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java Fri Jan 20 18:26:02 2006
@@ -9,7 +9,6 @@
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.IoFilterChainBuilder;
import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.support.BaseIoConnector;
import org.apache.mina.transport.vmpipe.support.VmPipe;
import org.apache.mina.transport.vmpipe.support.VmPipeSessionImpl;
import org.apache.mina.util.AnonymousSocketAddress;
Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeServiceProvider.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeServiceProvider.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeServiceProvider.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeServiceProvider.java Fri Jan 20 18:26:02 2006
@@ -18,8 +18,6 @@
*/
package org.apache.mina.transport.vmpipe;
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoServiceProvider;
public class VmPipeServiceProvider implements IoServiceProvider
Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/util/SessionUtil.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/util/SessionUtil.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/util/SessionUtil.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/util/SessionUtil.java Fri Jan 20 18:26:02 2006
@@ -21,8 +21,6 @@
import java.net.SocketException;
import org.apache.mina.common.IoSession;
-import org.apache.mina.transport.socket.nio.DatagramSession;
-import org.apache.mina.transport.socket.nio.SocketSession;
/**
* Exception utility.
@@ -34,6 +32,8 @@
{
public static void initialize( IoSession session ) throws SocketException
{
+ // FIXME Apply new configuration API
+ /*
if( session instanceof SocketSession )
{
SocketSession ss = ( SocketSession ) session;
@@ -45,6 +45,7 @@
DatagramSession ds = ( DatagramSession ) session;
ds.setReuseAddress( true );
}
+ */
}
private SessionUtil()
Modified: directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/handler/demux/DemuxingIoHandlerTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/handler/demux/DemuxingIoHandlerTest.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/handler/demux/DemuxingIoHandlerTest.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/handler/demux/DemuxingIoHandlerTest.java Fri Jan 20 18:26:02 2006
@@ -21,8 +21,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: directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java Fri Jan 20 18:26:02 2006
@@ -27,9 +27,9 @@
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
+import org.apache.mina.common.IoServiceProvider.IoAcceptor;
import org.apache.mina.transport.socket.nio.DatagramAcceptor;
import org.apache.mina.transport.socket.nio.SocketAcceptor;
import org.apache.mina.transport.socket.nio.SocketSession;
Modified: directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramTrafficControlTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramTrafficControlTest.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramTrafficControlTest.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramTrafficControlTest.java Fri Jan 20 18:26:02 2006
@@ -23,9 +23,9 @@
import java.net.SocketAddress;
import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceProvider.IoConnector;
import org.apache.mina.transport.AbstractTrafficControlTest;
/**
Modified: directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/socket/nio/SocketBindTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/socket/nio/SocketBindTest.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/socket/nio/SocketBindTest.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/socket/nio/SocketBindTest.java Fri Jan 20 18:26:02 2006
@@ -25,9 +25,9 @@
import junit.framework.Assert;
import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
+import org.apache.mina.common.IoServiceProvider.IoConnector;
import org.apache.mina.transport.AbstractBindTest;
/**
Modified: directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/socket/nio/SocketTrafficControlTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/socket/nio/SocketTrafficControlTest.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/socket/nio/SocketTrafficControlTest.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/socket/nio/SocketTrafficControlTest.java Fri Jan 20 18:26:02 2006
@@ -23,9 +23,9 @@
import java.net.SocketAddress;
import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceProvider.IoConnector;
import org.apache.mina.transport.AbstractTrafficControlTest;
/**
Modified: directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeBindTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeBindTest.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeBindTest.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeBindTest.java Fri Jan 20 18:26:02 2006
@@ -24,9 +24,9 @@
import junit.framework.Assert;
import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
+import org.apache.mina.common.IoServiceProvider.IoConnector;
import org.apache.mina.transport.AbstractBindTest;
/**
Modified: directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeTrafficControlTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeTrafficControlTest.java?rev=370959&r1=370958&r2=370959&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeTrafficControlTest.java (original)
+++ directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeTrafficControlTest.java Fri Jan 20 18:26:02 2006
@@ -21,9 +21,9 @@
import java.net.SocketAddress;
import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceProvider.IoConnector;
import org.apache.mina.transport.AbstractTrafficControlTest;
/**