directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r370973 - in /directory/sandbox/trustin/mina-spi/core/src: main/java/org/apache/mina/filter/ main/java/org/apache/mina/registry/ main/java/org/apache/mina/transport/vmpipe/support/ main/java/org/apache/mina/util/ test/java/org/apache/mina/c...
Date Sat, 21 Jan 2006 03:14:01 GMT
Author: trustin
Date: Fri Jan 20 19:13:46 2006
New Revision: 370973

URL: http://svn.apache.org/viewcvs?rev=370973&view=rev
Log:
* Removed registry package because MINA replaces it
* Fixed compilation errors

Added:
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSession.java
      - copied, changed from r370948, directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java
Removed:
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/registry/
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/util/AnonymousSocketAddress.java
Modified:
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipe.java
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeAcceptor.java
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeConnector.java
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java
    directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
    directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/common/FutureTest.java
    directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java
    directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java
    directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java
    directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
    directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java
    directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java
    directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java

Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java?rev=370973&r1=370972&r2=370973&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java
Fri Jan 20 19:13:46 2006
@@ -19,13 +19,12 @@
 package org.apache.mina.filter;
 
 import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.mina.common.IdleStatus;
+import org.apache.mina.common.IoAddress;
 import org.apache.mina.common.IoFilter;
 import org.apache.mina.common.IoFilterAdapter;
 import org.apache.mina.common.IoSession;
@@ -200,14 +199,10 @@
 
     private boolean isBlocked( IoSession session )
     {
-        SocketAddress remoteAddress = session.getRemoteAddress();
-        if( remoteAddress instanceof InetSocketAddress )
+        IoAddress remoteAddress = session.getRemoteAddress();
+        if( blacklist.contains( remoteAddress ) )
         {
-            if( blacklist.contains( ( ( InetSocketAddress ) remoteAddress )
-                    .getAddress() ) )
-            {
-                return true;
-            }
+            return true;
         }
 
         return false;

Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipe.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipe.java?rev=370973&r1=370972&r2=370973&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipe.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipe.java
Fri Jan 20 19:13:46 2006
@@ -7,21 +7,21 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.mina.common.IoAddress;
 import org.apache.mina.common.IoFilterChainBuilder;
 import org.apache.mina.common.IoHandler;
-import org.apache.mina.transport.vmpipe.VmPipeAddress;
 
 public class VmPipe
 {
     private final VmPipeAcceptor acceptor;
-    private final VmPipeAddress address;
+    private final IoAddress address;
     private final IoHandler handler;
     private final IoFilterChainBuilder filterChainBuilder;
     private final Set managedClientSessions = Collections.synchronizedSet( new HashSet()
);
     private final Set managedServerSessions = Collections.synchronizedSet( new HashSet()
);
     
     public VmPipe( VmPipeAcceptor acceptor,
-                   VmPipeAddress address,
+                   IoAddress address,
                    IoHandler handler,
                    IoFilterChainBuilder filterChainBuilder )
     {
@@ -36,7 +36,7 @@
         return acceptor;
     }
 
-    public VmPipeAddress getAddress()
+    public IoAddress getAddress()
     {
         return address;
     }

Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeAcceptor.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeAcceptor.java?rev=370973&r1=370972&r2=370973&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeAcceptor.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeAcceptor.java
Fri Jan 20 19:13:46 2006
@@ -4,7 +4,6 @@
 package org.apache.mina.transport.vmpipe.support;
 
 import java.io.IOException;
-import java.net.SocketAddress;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -12,10 +11,11 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.mina.common.IoAddress;
 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.IoServiceProvider.IoAcceptor;
 
 /**
  * Binds the specified {@link IoHandler} to the specified
@@ -24,25 +24,12 @@
  * @author The Apache Directory Project (dev@directory.apache.org)
  * @version $Rev$, $Date$
  */
-public class VmPipeAcceptor extends BaseIoAcceptor
+public class VmPipeAcceptor implements IoAcceptor
 {
     static final Map boundHandlers = new HashMap();
 
-    public void bind( SocketAddress address, IoHandler handler, IoFilterChainBuilder filterChainBuilder
) throws IOException
+    public void bind( IoAddress address, IoHandler handler, IoFilterChainBuilder filterChainBuilder
) throws IOException
     {
-        if( address == null )
-            throw new NullPointerException( "address" );
-        if( handler == null )
-            throw new NullPointerException( "handler" );
-        if( !( address instanceof VmPipeAddress ) )
-            throw new IllegalArgumentException(
-                    "address must be VmPipeAddress." );
-
-        if( filterChainBuilder == null )
-        {
-            filterChainBuilder = IoFilterChainBuilder.NOOP;
-        }
-
         synchronized( boundHandlers )
         {
             if( boundHandlers.containsKey( address ) )
@@ -52,16 +39,13 @@
 
             boundHandlers.put( address, 
                                new VmPipe( this,
-                                          ( VmPipeAddress ) address,
-                                          handler, filterChainBuilder ) );
+                                           address,
+                                           handler, filterChainBuilder ) );
         }
     }
 
-    public Collection getManagedSessions( SocketAddress address )
+    public Collection getManagedSessions( IoAddress address )
     {
-        if( address == null )
-            throw new NullPointerException( "address" );
-        
         VmPipe pipe = null;
         synchronized( boundHandlers )
         {
@@ -76,11 +60,8 @@
         return Collections.unmodifiableCollection( Arrays.asList( managedSessions.toArray()
) );
     }
 
-    public void unbind( SocketAddress address )
+    public void unbind( IoAddress address )
     {
-        if( address == null )
-            throw new NullPointerException( "address" );
-
         VmPipe pipe = null;
         synchronized( boundHandlers )
         {
@@ -92,8 +73,8 @@
             pipe = ( VmPipe ) boundHandlers.remove( address );
         }
         
+        /* FIXME Enable this when configuration interface is ready
         Set managedSessions = pipe.getManagedServerSessions();
-        
         if( isDisconnectClientsOnUnbind() && managedSessions != null )
         {
             IoSession[] tempSessions = ( IoSession[] ) 
@@ -135,7 +116,12 @@
             {
                 // Ignored
             }
-            
-        }                
+        }
+        */                
+    }
+
+    public IoSession newSession( IoAddress remoteAddress, IoAddress localAddress )
+    {
+        throw new UnsupportedOperationException();
     }
 }

Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeConnector.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeConnector.java?rev=370973&r1=370972&r2=370973&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeConnector.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeConnector.java
Fri Jan 20 19:13:46 2006
@@ -4,12 +4,12 @@
 package org.apache.mina.transport.vmpipe.support;
 
 import java.io.IOException;
-import java.net.SocketAddress;
 
 import org.apache.mina.common.ConnectFuture;
+import org.apache.mina.common.IoAddress;
 import org.apache.mina.common.IoFilterChainBuilder;
 import org.apache.mina.common.IoHandler;
-import org.apache.mina.util.AnonymousSocketAddress;
+import org.apache.mina.common.IoServiceProvider.IoConnector;
 
 /**
  * Connects to {@link IoHandler}s which is bound on the specified
@@ -18,28 +18,10 @@
  * @author The Apache Directory Project (dev@directory.apache.org)
  * @version $Rev$, $Date$
  */
-public class VmPipeConnector extends BaseIoConnector
+public class VmPipeConnector implements IoConnector
 {
-    public ConnectFuture connect( SocketAddress address, IoHandler handler, IoFilterChainBuilder
filterChainBuilder ) 
+    public ConnectFuture connect( IoAddress address, IoAddress localAddress, IoHandler handler,
IoFilterChainBuilder filterChainBuilder )
     {
-        return connect( address, null, handler, filterChainBuilder );
-    }
-
-    public ConnectFuture connect( SocketAddress address, SocketAddress localAddress, IoHandler
handler, IoFilterChainBuilder filterChainBuilder )
-    {
-        if( address == null )
-            throw new NullPointerException( "address" );
-        if( handler == null )
-            throw new NullPointerException( "handler" );
-        if( ! ( address instanceof VmPipeAddress ) )
-            throw new IllegalArgumentException(
-                                                "address must be VmPipeAddress." );
-
-        if( filterChainBuilder == null )
-        {
-            filterChainBuilder = IoFilterChainBuilder.NOOP;
-        }
-
         VmPipe entry = ( VmPipe ) VmPipeAcceptor.boundHandlers.get( address );
         if( entry == null )
         {
@@ -50,11 +32,10 @@
         ConnectFuture future = new ConnectFuture();
         try
         {
-            VmPipeSessionImpl session =
-                new VmPipeSessionImpl(
-                        this,
+            VmPipeSession session =
+                new VmPipeSession(
                         new Object(), // lock
-                        AnonymousSocketAddress.INSTANCE,
+                        new IoAddress( "vm:pipe:anonymous" ),
                         handler,
                         filterChainBuilder,
                         entry );

Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java?rev=370973&r1=370972&r2=370973&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java
Fri Jan 20 19:13:46 2006
@@ -15,7 +15,7 @@
 
     public void messageReceived( IoSession session, Object message )
     {
-        VmPipeSessionImpl s = ( VmPipeSessionImpl ) session;
+        VmPipeSession s = ( VmPipeSession ) session;
         synchronized( s.lock )
         {
             if( !s.getTrafficMask().isReadable() )
@@ -42,7 +42,7 @@
 
     protected void doWrite( IoSession session, WriteRequest writeRequest )
     {
-        VmPipeSessionImpl s = ( VmPipeSessionImpl ) session;
+        VmPipeSession s = ( VmPipeSession ) session;
         synchronized( s.lock )
         {
             if( s.isConnected() )
@@ -91,7 +91,7 @@
 
     protected void doClose( IoSession session, CloseFuture closeFuture )
     {
-        VmPipeSessionImpl s = ( VmPipeSessionImpl ) session;
+        VmPipeSession s = ( VmPipeSession ) session;
         synchronized( s.lock )
         {
             if( !closeFuture.isClosed() )

Modified: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java?rev=370973&r1=370972&r2=370973&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java
Fri Jan 20 19:13:46 2006
@@ -34,7 +34,7 @@
         worker.start();
     }
 
-    public void addSession( VmPipeSessionImpl session )
+    public void addSession( VmPipeSession session )
     {
         synchronized( sessions )
         {
@@ -69,7 +69,7 @@
                     Iterator it = sessions.keySet().iterator();
                     while( it.hasNext() )
                     {
-                        VmPipeSessionImpl session = ( VmPipeSessionImpl ) it.next();
+                        VmPipeSession session = ( VmPipeSession ) it.next();
                         if( !session.isConnected() )
                         {
                             it.remove();
@@ -84,7 +84,7 @@
         }
     }
     
-    private void notifyIdleSession( VmPipeSessionImpl session, long currentTime )
+    private void notifyIdleSession( VmPipeSession session, long currentTime )
     {
         notifyIdleSession0(
                 session, currentTime,
@@ -103,7 +103,7 @@
                 Math.max( session.getLastWriteTime(), session.getLastIdleTime( IdleStatus.WRITER_IDLE
) ) );
     }
 
-    private void notifyIdleSession0( VmPipeSessionImpl session, long currentTime,
+    private void notifyIdleSession0( VmPipeSession session, long currentTime,
                                     long idleTime, IdleStatus status,
                                     long lastIoTime )
     {

Copied: directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSession.java
(from r370948, directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java)
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSession.java?p2=directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSession.java&p1=directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java&r1=370948&r2=370973&rev=370973&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSession.java
Fri Jan 20 19:13:46 2006
@@ -4,22 +4,20 @@
 package org.apache.mina.transport.vmpipe.support;
 
 import java.io.IOException;
-import java.net.SocketAddress;
 import java.util.Set;
 
 import org.apache.mina.common.CloseFuture;
 import org.apache.mina.common.ExceptionMonitor;
+import org.apache.mina.common.IoAddress;
 import org.apache.mina.common.IoFilterChain;
 import org.apache.mina.common.IoFilterChainBuilder;
 import org.apache.mina.common.IoHandler;
 import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionManager;
 import org.apache.mina.common.TransportType;
 import org.apache.mina.common.IoFilter.WriteRequest;
 import org.apache.mina.common.support.BaseIoSession;
 import org.apache.mina.filter.codec.ProtocolDecoder;
 import org.apache.mina.filter.codec.ProtocolEncoder;
-import org.apache.mina.transport.vmpipe.VmPipeSession;
 import org.apache.mina.util.ExceptionUtil;
 import org.apache.mina.util.Queue;
 
@@ -29,26 +27,24 @@
  * @author The Apache Directory Project (dev@directory.apache.org)
  * @version $Rev$, $Date$
  */
-public class VmPipeSessionImpl extends BaseIoSession implements VmPipeSession
+public class VmPipeSession extends BaseIoSession
 {
-    private final IoSessionManager manager;
-    private final SocketAddress localAddress;
-    private final SocketAddress remoteAddress;
+    private final IoAddress localAddress;
+    private final IoAddress remoteAddress;
     private final IoHandler handler;
     private final VmPipeFilterChain filterChain;
     private final Set managedSessions;
-    final VmPipeSessionImpl remoteSession;
+    final VmPipeSession remoteSession;
     final Object lock;
     final Queue pendingDataQueue;
 
     /**
      * Constructor for client-side session.
      */
-    public VmPipeSessionImpl( IoSessionManager manager, Object lock, SocketAddress localAddress,
+    public VmPipeSession( Object lock, IoAddress localAddress,
                    IoHandler handler, IoFilterChainBuilder filterChainBuilder,
                    VmPipe remoteEntry ) throws IOException
     {
-        this.manager = manager;
         this.lock = lock;
         this.localAddress = localAddress;
         this.remoteAddress = remoteEntry.getAddress();
@@ -58,12 +54,11 @@
 
         this.managedSessions = remoteEntry.getManagedClientSessions();
         
-        remoteSession = new VmPipeSessionImpl( manager, this, remoteEntry );
+        remoteSession = new VmPipeSession( this, remoteEntry );
         
         // initialize remote session
         try
         {
-            remoteEntry.getAcceptor().getFilterChainBuilder().buildFilterChain( remoteSession.getFilterChain()
);
             remoteEntry.getFilterChainBuilder().buildFilterChain( remoteSession.getFilterChain()
);
             ( ( VmPipeFilterChain ) remoteSession.getFilterChain() ).sessionCreated( remoteSession
);
         }
@@ -78,7 +73,6 @@
         // initialize client session
         try
         {
-            manager.getFilterChainBuilder().buildFilterChain( filterChain );
             filterChainBuilder.buildFilterChain( filterChain );
             handler.sessionCreated( this );
         }
@@ -100,9 +94,8 @@
     /**
      * Constructor for server-side session.
      */
-    private VmPipeSessionImpl( IoSessionManager manager, VmPipeSessionImpl remoteSession,
VmPipe entry )
+    private VmPipeSession( VmPipeSession remoteSession, VmPipe entry )
     {
-        this.manager = manager;
         this.lock = remoteSession.lock;
         this.localAddress = remoteSession.remoteAddress;
         this.remoteAddress = remoteSession.localAddress;
@@ -118,11 +111,6 @@
         return managedSessions;
     }
 
-    public IoSessionManager getManager()
-    {
-        return manager;
-    }
-
     public IoFilterChain getFilterChain()
     {
         return filterChain;
@@ -163,12 +151,12 @@
         return TransportType.VM_PIPE;
     }
 
-    public SocketAddress getRemoteAddress()
+    public IoAddress getRemoteAddress()
     {
         return remoteAddress;
     }
 
-    public SocketAddress getLocalAddress()
+    public IoAddress getLocalAddress()
     {
         return localAddress;
     }

Modified: directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/common/FutureTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/common/FutureTest.java?rev=370973&r1=370972&r2=370973&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/common/FutureTest.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/common/FutureTest.java
Fri Jan 20 19:13:46 2006
@@ -19,7 +19,6 @@
 package org.apache.mina.common;
 
 import java.io.IOException;
-import java.net.SocketAddress;
 
 import junit.framework.TestCase;
 
@@ -78,12 +77,12 @@
                 return null;
             }
 
-            public SocketAddress getRemoteAddress()
+            public IoAddress getRemoteAddress()
             {
                 return null;
             }
 
-            public SocketAddress getLocalAddress()
+            public IoAddress getLocalAddress()
             {
                 return null;
             }
@@ -100,11 +99,6 @@
             public boolean isClosing()
             {
                 return false;
-            }
-
-            public IoSessionManager getManager()
-            {
-                return null;
             }
         };
         

Modified: directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java?rev=370973&r1=370972&r2=370973&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java
Fri Jan 20 19:13:46 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.mina.common;
 
-import java.net.SocketAddress;
 import java.util.Iterator;
 
 import junit.framework.Assert;
@@ -259,11 +258,11 @@
             return TransportType.VM_PIPE;
         }
 
-        public SocketAddress getRemoteAddress() {
+        public IoAddress getRemoteAddress() {
             return null;
         }
 
-        public SocketAddress getLocalAddress() {
+        public IoAddress getLocalAddress() {
             return null;
         }
 
@@ -294,11 +293,6 @@
         {
             return false;
         }
-
-        public IoSessionManager getManager()
-        {
-            return null;
-        }
     }
 
     private class EventOrderTestFilter extends IoFilterAdapter
@@ -381,11 +375,6 @@
                 {
                 }
 
-                public IoSessionManager getManager()
-                {
-                    return null;
-                }
-
                 public IoHandler getHandler()
                 {
                     return null;
@@ -401,12 +390,12 @@
                     return null;
                 }
 
-                public SocketAddress getRemoteAddress()
+                public IoAddress getRemoteAddress()
                 {
                     return null;
                 }
 
-                public SocketAddress getLocalAddress()
+                public IoAddress getLocalAddress()
                 {
                     return null;
                 }

Modified: directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java?rev=370973&r1=370972&r2=370973&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java
Fri Jan 20 19:13:46 2006
@@ -38,8 +38,8 @@
 import org.apache.mina.registry.Service;
 import org.apache.mina.registry.ServiceRegistry;
 import org.apache.mina.registry.SimpleServiceRegistry;
-import org.apache.mina.transport.socket.nio.SocketAcceptor;
-import org.apache.mina.transport.socket.nio.SocketConnector;
+import org.apache.mina.transport.socket.nio.support.SocketAcceptor;
+import org.apache.mina.transport.socket.nio.support.SocketConnector;
 import org.apache.mina.util.AvailablePortFinder;
 import org.easymock.AbstractMatcher;
 import org.easymock.MockControl;

Modified: directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java?rev=370973&r1=370972&r2=370973&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java
Fri Jan 20 19:13:46 2006
@@ -1,16 +1,14 @@
 package org.apache.mina.filter;
 
-import java.net.SocketAddress;
-
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
 import org.apache.mina.common.CloseFuture;
 import org.apache.mina.common.IdleStatus;
+import org.apache.mina.common.IoAddress;
 import org.apache.mina.common.IoFilterChain;
 import org.apache.mina.common.IoHandler;
 import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionManager;
 import org.apache.mina.common.TransportType;
 import org.apache.mina.common.WriteFuture;
 import org.apache.mina.common.IoFilter.NextFilter;
@@ -162,12 +160,12 @@
             return null;
         }
 
-        public SocketAddress getRemoteAddress()
+        public IoAddress getRemoteAddress()
         {
             return null;
         }
 
-        public SocketAddress getLocalAddress()
+        public IoAddress getLocalAddress()
         {
             return null;
         }
@@ -185,11 +183,6 @@
         {
             return false;
         }
-
-        public IoSessionManager getManager()
-        {
-            return null;
-        }
     }
     
     private static class EventOrderChecker implements NextFilter
@@ -270,12 +263,12 @@
             return null;
         }
 
-        public SocketAddress getRemoteAddress()
+        public IoAddress getRemoteAddress()
         {
             return null;
         }
 
-        public SocketAddress getLocalAddress()
+        public IoAddress getLocalAddress()
         {
             return null;
         }
@@ -288,11 +281,6 @@
         public boolean isClosing()
         {
             return false;
-        }
-
-        public IoSessionManager getManager()
-        {
-            return null;
         }
     }
     

Modified: directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java?rev=370973&r1=370972&r2=370973&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
Fri Jan 20 19:13:46 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.mina.filter.codec;
 
-import java.net.SocketAddress;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,10 +26,10 @@
 
 import org.apache.mina.common.ByteBuffer;
 import org.apache.mina.common.CloseFuture;
+import org.apache.mina.common.IoAddress;
 import org.apache.mina.common.IoFilterChain;
 import org.apache.mina.common.IoHandler;
 import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionManager;
 import org.apache.mina.common.TransportType;
 import org.apache.mina.common.support.BaseIoSession;
 
@@ -201,11 +200,11 @@
             return TransportType.SOCKET;
         }
 
-        public SocketAddress getRemoteAddress() {
+        public IoAddress getRemoteAddress() {
             return null;
         }
 
-        public SocketAddress getLocalAddress() {
+        public IoAddress getLocalAddress() {
             return null;
         }
 
@@ -226,11 +225,6 @@
         public boolean isClosing()
         {
             return false;
-        }
-
-        public IoSessionManager getManager()
-        {
-            return null;
         }
     }
 }

Modified: directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java?rev=370973&r1=370972&r2=370973&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java
Fri Jan 20 19:13:46 2006
@@ -18,7 +18,6 @@
  */
 package org.apache.mina.filter.codec.textline;
 
-import java.net.SocketAddress;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
 
@@ -26,10 +25,10 @@
 import junit.framework.TestCase;
 
 import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoAddress;
 import org.apache.mina.common.IoFilterChain;
 import org.apache.mina.common.IoHandler;
 import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionManager;
 import org.apache.mina.common.TransportType;
 import org.apache.mina.common.support.BaseIoSession;
 import org.apache.mina.filter.codec.support.SimpleProtocolDecoderOutput;
@@ -184,11 +183,6 @@
         {
         }
 
-        public IoSessionManager getManager()
-        {
-            return null;
-        }
-
         public IoHandler getHandler()
         {
             return null;
@@ -204,12 +198,12 @@
             return null;
         }
 
-        public SocketAddress getRemoteAddress()
+        public IoAddress getRemoteAddress()
         {
             return null;
         }
 
-        public SocketAddress getLocalAddress()
+        public IoAddress getLocalAddress()
         {
             return null;
         }

Modified: directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java?rev=370973&r1=370972&r2=370973&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java
Fri Jan 20 19:13:46 2006
@@ -18,17 +18,16 @@
  */
 package org.apache.mina.filter.codec.textline;
 
-import java.net.SocketAddress;
 import java.nio.charset.Charset;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
 import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoAddress;
 import org.apache.mina.common.IoFilterChain;
 import org.apache.mina.common.IoHandler;
 import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionManager;
 import org.apache.mina.common.TransportType;
 import org.apache.mina.common.WriteFuture;
 import org.apache.mina.common.support.BaseIoSession;
@@ -78,11 +77,6 @@
         {
         }
 
-        public IoSessionManager getManager()
-        {
-            return null;
-        }
-
         public IoHandler getHandler()
         {
             return null;
@@ -98,12 +92,12 @@
             return null;
         }
 
-        public SocketAddress getRemoteAddress()
+        public IoAddress getRemoteAddress()
         {
             return null;
         }
 
-        public SocketAddress getLocalAddress()
+        public IoAddress getLocalAddress()
         {
             return null;
         }

Modified: directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java?rev=370973&r1=370972&r2=370973&view=diff
==============================================================================
--- directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java
(original)
+++ directory/sandbox/trustin/mina-spi/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java
Fri Jan 20 19:13:46 2006
@@ -18,15 +18,13 @@
  */
 package org.apache.mina.handler.chain;
 
-import java.net.SocketAddress;
-
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.apache.mina.common.IoAddress;
 import org.apache.mina.common.IoFilterChain;
 import org.apache.mina.common.IoHandler;
 import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionManager;
 import org.apache.mina.common.TransportType;
 import org.apache.mina.common.support.BaseIoSession;
 
@@ -58,11 +56,6 @@
                     {
                     }
 
-                    public IoSessionManager getManager()
-                    {
-                        return null;
-                    }
-
                     public IoHandler getHandler()
                     {
                         return null;
@@ -78,12 +71,12 @@
                         return null;
                     }
 
-                    public SocketAddress getRemoteAddress()
+                    public IoAddress getRemoteAddress()
                     {
                         return null;
                     }
 
-                    public SocketAddress getLocalAddress()
+                    public IoAddress getLocalAddress()
                     {
                         return null;
                     }



Mime
View raw message