directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r165302 - in /directory/network/trunk/src: java/org/apache/mina/io/ java/org/apache/mina/io/datagram/ java/org/apache/mina/io/filter/ java/org/apache/mina/io/socket/ java/org/apache/mina/protocol/ java/org/apache/mina/protocol/filter/ java/org/apache/mina/protocol/io/ java/org/apache/mina/protocol/vmpipe/ java/org/apache/mina/registry/ test/org/apache/mina/io/ test/org/apache/mina/protocol/ test/org/apache/mina/protocol/codec/ test/org/apache/mina/util/
Date Fri, 29 Apr 2005 12:53:47 GMT
Author: trustin
Date: Fri Apr 29 05:53:46 2005
New Revision: 165302

URL: http://svn.apache.org/viewcvs?rev=165302&view=rev
Log:
* Renamed IoHandlerFilter* to IoFilter*
* Renamed ProtocolHandlerFilter* to ProtocolFilter*


Added:
    directory/network/trunk/src/java/org/apache/mina/io/AbstractIoFilterChain.java
      - copied, changed from r165301, directory/network/trunk/src/java/org/apache/mina/io/AbstractIoHandlerFilterChain.java
    directory/network/trunk/src/java/org/apache/mina/io/IoFilter.java
      - copied, changed from r165301, directory/network/trunk/src/java/org/apache/mina/io/IoHandlerFilter.java
    directory/network/trunk/src/java/org/apache/mina/io/IoFilterAdapter.java
      - copied, changed from r165301, directory/network/trunk/src/java/org/apache/mina/io/IoHandlerFilterAdapter.java
    directory/network/trunk/src/java/org/apache/mina/io/IoFilterChain.java
      - copied, changed from r165301, directory/network/trunk/src/java/org/apache/mina/io/IoHandlerFilterChain.java
    directory/network/trunk/src/java/org/apache/mina/protocol/AbstractProtocolFilterChain.java
      - copied, changed from r165301, directory/network/trunk/src/java/org/apache/mina/protocol/AbstractProtocolHandlerFilterChain.java
    directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolFilter.java
      - copied, changed from r165301, directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolHandlerFilter.java
    directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolFilterAdapter.java
      - copied, changed from r165301, directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolHandlerFilterAdapter.java
    directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolFilterChain.java
      - copied, changed from r165301, directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolHandlerFilterChain.java
    directory/network/trunk/src/test/org/apache/mina/io/IoFilterChainTest.java
      - copied, changed from r165301, directory/network/trunk/src/test/org/apache/mina/io/IoHandlerFilterChainTest.java
    directory/network/trunk/src/test/org/apache/mina/protocol/ProtocolFilterChainTest.java
      - copied, changed from r165301, directory/network/trunk/src/test/org/apache/mina/protocol/ProtocolHandlerFilterChainTest.java
    directory/network/trunk/src/test/org/apache/mina/util/IoFilterImpl.java
      - copied, changed from r165301, directory/network/trunk/src/test/org/apache/mina/util/IoHandlerFilterImpl.java
    directory/network/trunk/src/test/org/apache/mina/util/ProtocolFilterImpl.java
      - copied, changed from r165301, directory/network/trunk/src/test/org/apache/mina/util/ProtocolHandlerFilterImpl.java
Removed:
    directory/network/trunk/src/java/org/apache/mina/io/AbstractIoHandlerFilterChain.java
    directory/network/trunk/src/java/org/apache/mina/io/IoHandlerFilter.java
    directory/network/trunk/src/java/org/apache/mina/io/IoHandlerFilterAdapter.java
    directory/network/trunk/src/java/org/apache/mina/io/IoHandlerFilterChain.java
    directory/network/trunk/src/java/org/apache/mina/protocol/AbstractProtocolHandlerFilterChain.java
    directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolHandlerFilter.java
    directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolHandlerFilterAdapter.java
    directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolHandlerFilterChain.java
    directory/network/trunk/src/test/org/apache/mina/io/IoHandlerFilterChainTest.java
    directory/network/trunk/src/test/org/apache/mina/protocol/ProtocolHandlerFilterChainTest.java
    directory/network/trunk/src/test/org/apache/mina/util/IoHandlerFilterImpl.java
    directory/network/trunk/src/test/org/apache/mina/util/ProtocolHandlerFilterImpl.java
Modified:
    directory/network/trunk/src/java/org/apache/mina/io/IoSession.java
    directory/network/trunk/src/java/org/apache/mina/io/IoSessionFilterChain.java
    directory/network/trunk/src/java/org/apache/mina/io/IoSessionManager.java
    directory/network/trunk/src/java/org/apache/mina/io/IoSessionManagerFilterChain.java
    directory/network/trunk/src/java/org/apache/mina/io/datagram/DatagramAcceptor.java
    directory/network/trunk/src/java/org/apache/mina/io/datagram/DatagramConnector.java
    directory/network/trunk/src/java/org/apache/mina/io/datagram/DatagramSession.java
    directory/network/trunk/src/java/org/apache/mina/io/datagram/DatagramSessionManagerFilterChain.java
    directory/network/trunk/src/java/org/apache/mina/io/filter/BlacklistFilter.java
    directory/network/trunk/src/java/org/apache/mina/io/filter/IoThreadPoolFilter.java
    directory/network/trunk/src/java/org/apache/mina/io/filter/SSLFilter.java
    directory/network/trunk/src/java/org/apache/mina/io/filter/SSLHandler.java
    directory/network/trunk/src/java/org/apache/mina/io/socket/SocketAcceptor.java
    directory/network/trunk/src/java/org/apache/mina/io/socket/SocketConnector.java
    directory/network/trunk/src/java/org/apache/mina/io/socket/SocketSession.java
    directory/network/trunk/src/java/org/apache/mina/io/socket/SocketSessionManagerFilterChain.java
    directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolSession.java
    directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolSessionFilterChain.java
    directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolSessionManager.java
    directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolSessionManagerFilterChain.java
    directory/network/trunk/src/java/org/apache/mina/protocol/filter/ProtocolThreadPoolFilter.java
    directory/network/trunk/src/java/org/apache/mina/protocol/io/IoAdapter.java
    directory/network/trunk/src/java/org/apache/mina/protocol/io/IoProtocolAcceptor.java
    directory/network/trunk/src/java/org/apache/mina/protocol/io/IoProtocolConnector.java
    directory/network/trunk/src/java/org/apache/mina/protocol/io/IoProtocolSession.java
    directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipeAcceptor.java
    directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipeConnector.java
    directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipeFilter.java
    directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipeSession.java
    directory/network/trunk/src/java/org/apache/mina/registry/ServiceRegistry.java
    directory/network/trunk/src/java/org/apache/mina/registry/SimpleServiceRegistry.java
    directory/network/trunk/src/test/org/apache/mina/protocol/codec/CumulativeProtocolDecoderTest.java

Copied: directory/network/trunk/src/java/org/apache/mina/io/AbstractIoFilterChain.java (from r165301, directory/network/trunk/src/java/org/apache/mina/io/AbstractIoHandlerFilterChain.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/AbstractIoFilterChain.java?p2=directory/network/trunk/src/java/org/apache/mina/io/AbstractIoFilterChain.java&p1=directory/network/trunk/src/java/org/apache/mina/io/AbstractIoHandlerFilterChain.java&r1=165301&r2=165302&rev=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/AbstractIoHandlerFilterChain.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/AbstractIoFilterChain.java Fri Apr 29 05:53:46 2005
@@ -27,10 +27,10 @@
 
 import org.apache.mina.common.ByteBuffer;
 import org.apache.mina.common.IdleStatus;
-import org.apache.mina.io.IoHandlerFilter.NextFilter;
+import org.apache.mina.io.IoFilter.NextFilter;
 
 /**
- * An abstract implementation of {@link IoHandlerFilterChain} that provides
+ * An abstract implementation of {@link IoFilterChain} that provides
  * common operations for developers to support specific transport types.
  * <p>
  * All methods has been implemented.  The list of filters is maintained
@@ -42,13 +42,13 @@
  * 
  * The only method a developer should implement is {@link #doWrite(IoSession, ByteBuffer, Object)}.
  * This method is invoked when filter chain is evaluated for
- * {@link IoHandlerFilter#filterWrite(NextFilter, IoSession, ByteBuffer, Object)} and 
+ * {@link IoFilter#filterWrite(NextFilter, IoSession, ByteBuffer, Object)} and 
  * finally to be written to the underlying transport layer (e.g. socket)
  * 
  * @author The Apache Directory Project
  * @version $Rev$, $Date$
  */
-public abstract class AbstractIoHandlerFilterChain implements IoHandlerFilterChain
+public abstract class AbstractIoFilterChain implements IoFilterChain
 {
     private final Map name2entry = new HashMap();
 
@@ -58,7 +58,7 @@
     
     private final Entry tail;
 
-    protected AbstractIoHandlerFilterChain()
+    protected AbstractIoFilterChain()
     {
         head = new Entry( null, null, "head", createHeadFilter() );
         tail = new Entry( head, null, "tail", createTailFilter() );
@@ -68,9 +68,9 @@
     /**
      * Override this method to create custom head of this filter chain.
      */
-    protected IoHandlerFilter createHeadFilter()
+    protected IoFilter createHeadFilter()
     {
-        return new IoHandlerFilter()
+        return new IoFilter()
         {
             public void sessionOpened( NextFilter nextFilter, IoSession session )
             {
@@ -117,9 +117,9 @@
     /**
      * Override this method to create custom tail of this filter chain.
      */
-    protected IoHandlerFilter createTailFilter()
+    protected IoFilter createTailFilter()
     {
-        return new IoHandlerFilter()
+        return new IoFilter()
         {
             public void sessionOpened( NextFilter nextFilter, IoSession session )
             {
@@ -165,7 +165,7 @@
         };
     }
     
-    public IoHandlerFilter getChild( String name )
+    public IoFilter getChild( String name )
     {
         Entry e = ( Entry ) name2entry.get( name );
         if ( e == null )
@@ -179,7 +179,7 @@
      * Adds the specified interceptor with the specified name at the beginning of this chain.
      */
     public synchronized void addFirst( String name,
-                                       IoHandlerFilter filter )
+                                       IoFilter filter )
     {
         checkAddable( name );
         register( head, name, filter );
@@ -190,7 +190,7 @@
      * Adds the specified interceptor with the specified name at the end of this chain.
      */
     public synchronized void addLast( String name,
-                                      IoHandlerFilter filter )
+                                      IoFilter filter )
     {
         checkAddable( name );
         register( tail.prevEntry, name, filter );
@@ -203,7 +203,7 @@
      */
     public synchronized void addBefore( String baseName,
                                         String name,
-                                        IoHandlerFilter filter )
+                                        IoFilter filter )
     {
         Entry baseEntry = checkOldName( baseName );
         checkAddable( name );
@@ -217,7 +217,7 @@
      */
     public synchronized void addAfter( String baseName,
                                        String name,
-                                       IoHandlerFilter filter )
+                                       IoFilter filter )
     {
         Entry baseEntry = checkOldName( baseName );
         checkAddable( name );
@@ -237,7 +237,7 @@
         nextEntry.prevEntry = prevEntry;
 
         name2entry.remove( name );
-        IoHandlerFilter filter = entry.filter;
+        IoFilter filter = entry.filter;
         filter2entry.remove( filter );
     }
 
@@ -254,7 +254,7 @@
         }
     }
 
-    private void register( Entry prevEntry, String name, IoHandlerFilter filter )
+    private void register( Entry prevEntry, String name, IoFilter filter )
     {
         Entry newEntry = new Entry( prevEntry, prevEntry.nextEntry, name, filter );
         prevEntry.nextEntry.prevEntry = newEntry;
@@ -469,14 +469,14 @@
 
         private final String name;
         
-        private final IoHandlerFilter filter;
+        private final IoFilter filter;
 
         private final NextFilter nextFilter;
         
         private final NextFilter prevFilter;
 
         private Entry( Entry prevEntry, Entry nextEntry,
-                       String name, IoHandlerFilter filter )
+                       String name, IoFilter filter )
         {
             if( filter == null )
             {
@@ -584,7 +584,7 @@
             return name;
         }
         
-        public IoHandlerFilter getFilter()
+        public IoFilter getFilter()
         {
             return filter;
         }

Copied: directory/network/trunk/src/java/org/apache/mina/io/IoFilter.java (from r165301, directory/network/trunk/src/java/org/apache/mina/io/IoHandlerFilter.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/IoFilter.java?p2=directory/network/trunk/src/java/org/apache/mina/io/IoFilter.java&p1=directory/network/trunk/src/java/org/apache/mina/io/IoHandlerFilter.java&r1=165301&r2=165302&rev=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/IoHandlerFilter.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/IoFilter.java Fri Apr 29 05:53:46 2005
@@ -42,9 +42,9 @@
  * @author Trustin Lee (trustin@apache.org)
  * @version $Rev$, $Date$
  * 
- * @see IoHandlerFilterAdapter
+ * @see IoFilterAdapter
  */
-public interface IoHandlerFilter
+public interface IoFilter
 {
     /**
      * Filters {@link IoHandler#sessionOpened(IoSession)} event.

Copied: directory/network/trunk/src/java/org/apache/mina/io/IoFilterAdapter.java (from r165301, directory/network/trunk/src/java/org/apache/mina/io/IoHandlerFilterAdapter.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/IoFilterAdapter.java?p2=directory/network/trunk/src/java/org/apache/mina/io/IoFilterAdapter.java&p1=directory/network/trunk/src/java/org/apache/mina/io/IoHandlerFilterAdapter.java&r1=165301&r2=165302&rev=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/IoHandlerFilterAdapter.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/IoFilterAdapter.java Fri Apr 29 05:53:46 2005
@@ -22,7 +22,7 @@
 import org.apache.mina.common.IdleStatus;
 
 /**
- * An abstract adapter class for {@link IoHandlerFilter}.  You can extend this
+ * An abstract adapter class for {@link IoFilter}.  You can extend this
  * class and selectively override required event filter methods only.  All
  * methods forwards events to the next filter by default.
  * <p>
@@ -33,7 +33,7 @@
  * @author Trustin Lee (trustin@apache.org)
  * @version $Rev$, $Date$
  */
-public class IoHandlerFilterAdapter implements IoHandlerFilter
+public class IoFilterAdapter implements IoFilter
 {
     public void sessionOpened( NextFilter nextFilter, IoSession session )
     {

Copied: directory/network/trunk/src/java/org/apache/mina/io/IoFilterChain.java (from r165301, directory/network/trunk/src/java/org/apache/mina/io/IoHandlerFilterChain.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/IoFilterChain.java?p2=directory/network/trunk/src/java/org/apache/mina/io/IoFilterChain.java&p1=directory/network/trunk/src/java/org/apache/mina/io/IoHandlerFilterChain.java&r1=165301&r2=165302&rev=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/IoHandlerFilterChain.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/IoFilterChain.java Fri Apr 29 05:53:46 2005
@@ -3,14 +3,14 @@
 import java.util.List;
 
 
-public interface IoHandlerFilterChain {
-    IoHandlerFilter getChild( String name );
+public interface IoFilterChain {
+    IoFilter getChild( String name );
     List getChildren();
     List getChildrenReversed();
-    void addFirst( String name, IoHandlerFilter filter );
-    void addLast( String name, IoHandlerFilter filter );
-    void addBefore( String baseName, String name, IoHandlerFilter filter );
-    void addAfter( String baseName, String name, IoHandlerFilter filter );
+    void addFirst( String name, IoFilter filter );
+    void addLast( String name, IoFilter filter );
+    void addBefore( String baseName, String name, IoFilter filter );
+    void addAfter( String baseName, String name, IoFilter filter );
     void remove( String name );
     void clear();
 }

Modified: directory/network/trunk/src/java/org/apache/mina/io/IoSession.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/IoSession.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/IoSession.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/IoSession.java Fri Apr 29 05:53:46 2005
@@ -40,7 +40,7 @@
     /**
      * Returns the filter chain that only affects this session.
      */
-    IoHandlerFilterChain getFilterChain();
+    IoFilterChain getFilterChain();
 
     /**
      * Writes the content of the specified <code>buf</code>.

Modified: directory/network/trunk/src/java/org/apache/mina/io/IoSessionFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/IoSessionFilterChain.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/IoSessionFilterChain.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/IoSessionFilterChain.java Fri Apr 29 05:53:46 2005
@@ -21,7 +21,7 @@
 import org.apache.mina.common.ByteBuffer;
 
 /**
- * An {@link IoHandlerFilterChain} that forwards <tt>filterWrite</tt>
+ * An {@link IoFilterChain} that forwards <tt>filterWrite</tt>
  * requests to the specified {@link IoSessionManagerFilterChain}.
  * <p>
  * This filter chain is used by implementations of {@link IoSession}s.
@@ -30,7 +30,7 @@
  * @author Trustin Lee (trustin@apache.org)
  * @version $Rev$, $Date$
  */
-public class IoSessionFilterChain extends AbstractIoHandlerFilterChain {
+public class IoSessionFilterChain extends AbstractIoFilterChain {
 
     private final IoSessionManagerFilterChain managerChain;
 

Modified: directory/network/trunk/src/java/org/apache/mina/io/IoSessionManager.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/IoSessionManager.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/IoSessionManager.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/IoSessionManager.java Fri Apr 29 05:53:46 2005
@@ -23,7 +23,7 @@
 /**
  * A {@link SessionManager} for I/O layer.
  * <p>
- * {@link IoHandlerFilter}s can be added and removed at any time to filter
+ * {@link IoFilter}s can be added and removed at any time to filter
  * events just like Servlet filters and they are effective immediately.
  * 
  * @author The Apache Directory Project (dev@directory.apache.org)
@@ -35,5 +35,5 @@
      * Returns the filter chain that filters all events which is related
      * with sessions this manager manages.
      */
-    IoHandlerFilterChain getFilterChain();
+    IoFilterChain getFilterChain();
 }

Modified: directory/network/trunk/src/java/org/apache/mina/io/IoSessionManagerFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/IoSessionManagerFilterChain.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/IoSessionManagerFilterChain.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/IoSessionManagerFilterChain.java Fri Apr 29 05:53:46 2005
@@ -22,7 +22,7 @@
 import org.apache.mina.common.IdleStatus;
 
 /**
- * An {@link IoHandlerFilterChain} that forwards all events
+ * An {@link IoFilterChain} that forwards all events
  * except <tt>filterWrite</tt> to the {@link IoSessionFilterChain}
  * of the recipient session.
  * <p>
@@ -32,7 +32,7 @@
  * @author Trustin Lee (trustin@apache.org)
  * @version $Rev$, $Date$
  */
-public abstract class IoSessionManagerFilterChain extends AbstractIoHandlerFilterChain {
+public abstract class IoSessionManagerFilterChain extends AbstractIoFilterChain {
 
     private final IoSessionManager manager;
 
@@ -46,9 +46,9 @@
         return manager;
     }
     
-    protected IoHandlerFilter createTailFilter()
+    protected IoFilter createTailFilter()
     {
-        return new IoHandlerFilter()
+        return new IoFilter()
         {
             public void sessionOpened( NextFilter nextFilter, IoSession session )
             {

Modified: directory/network/trunk/src/java/org/apache/mina/io/datagram/DatagramAcceptor.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/datagram/DatagramAcceptor.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/datagram/DatagramAcceptor.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/datagram/DatagramAcceptor.java Fri Apr 29 05:53:46 2005
@@ -33,7 +33,7 @@
 import org.apache.mina.common.SessionInitializer;
 import org.apache.mina.io.IoAcceptor;
 import org.apache.mina.io.IoHandler;
-import org.apache.mina.io.IoHandlerFilterChain;
+import org.apache.mina.io.IoFilterChain;
 import org.apache.mina.io.IoSessionManagerFilterChain;
 import org.apache.mina.util.ExceptionUtil;
 import org.apache.mina.util.Queue;
@@ -517,7 +517,7 @@
         }
     }
     
-    public IoHandlerFilterChain getFilterChain()
+    public IoFilterChain getFilterChain()
     {
         return filters;
     }

Modified: directory/network/trunk/src/java/org/apache/mina/io/datagram/DatagramConnector.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/datagram/DatagramConnector.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/datagram/DatagramConnector.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/datagram/DatagramConnector.java Fri Apr 29 05:53:46 2005
@@ -31,7 +31,7 @@
 import org.apache.mina.common.SessionInitializer;
 import org.apache.mina.io.IoConnector;
 import org.apache.mina.io.IoHandler;
-import org.apache.mina.io.IoHandlerFilterChain;
+import org.apache.mina.io.IoFilterChain;
 import org.apache.mina.io.IoSession;
 import org.apache.mina.io.IoSessionManagerFilterChain;
 import org.apache.mina.util.ExceptionUtil;
@@ -513,7 +513,7 @@
         }
     }
 
-    public IoHandlerFilterChain getFilterChain()
+    public IoFilterChain getFilterChain()
     {
         return filters;
     }

Modified: directory/network/trunk/src/java/org/apache/mina/io/datagram/DatagramSession.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/datagram/DatagramSession.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/datagram/DatagramSession.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/datagram/DatagramSession.java Fri Apr 29 05:53:46 2005
@@ -27,7 +27,7 @@
 import org.apache.mina.common.SessionConfig;
 import org.apache.mina.common.TransportType;
 import org.apache.mina.io.IoHandler;
-import org.apache.mina.io.IoHandlerFilterChain;
+import org.apache.mina.io.IoFilterChain;
 import org.apache.mina.io.IoSession;
 import org.apache.mina.io.IoSessionFilterChain;
 import org.apache.mina.io.IoSessionManager;
@@ -86,7 +86,7 @@
         return managerFilterChain;
     }
     
-    public IoHandlerFilterChain getFilterChain()
+    public IoFilterChain getFilterChain()
     {
         return filterChain;
     }

Modified: directory/network/trunk/src/java/org/apache/mina/io/datagram/DatagramSessionManagerFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/datagram/DatagramSessionManagerFilterChain.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/datagram/DatagramSessionManagerFilterChain.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/datagram/DatagramSessionManagerFilterChain.java Fri Apr 29 05:53:46 2005
@@ -1,13 +1,13 @@
 package org.apache.mina.io.datagram;
 
 import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.io.IoHandlerFilterChain;
+import org.apache.mina.io.IoFilterChain;
 import org.apache.mina.io.IoSession;
 import org.apache.mina.io.IoSessionManagerFilterChain;
 import org.apache.mina.util.Queue;
 
 /**
- * An {@link IoHandlerFilterChain} for datagram transport (UDP/IP).
+ * An {@link IoFilterChain} for datagram transport (UDP/IP).
  * 
  * @author The Apache Directory Project
  */

Modified: directory/network/trunk/src/java/org/apache/mina/io/filter/BlacklistFilter.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/filter/BlacklistFilter.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/filter/BlacklistFilter.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/filter/BlacklistFilter.java Fri Apr 29 05:53:46 2005
@@ -25,18 +25,18 @@
 import java.util.Set;
 
 import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.io.IoHandlerFilter;
-import org.apache.mina.io.IoHandlerFilterAdapter;
+import org.apache.mina.io.IoFilter;
+import org.apache.mina.io.IoFilterAdapter;
 import org.apache.mina.io.IoSession;
 
 /**
- * A {@link IoHandlerFilter} which blocks connections from blacklisted remote
+ * A {@link IoFilter} which blocks connections from blacklisted remote
  * address.
  * 
  * @author Trustin Lee (trustin@apache.org)
  * @version $Rev$, $Date$
  */
-public class BlacklistFilter extends IoHandlerFilterAdapter
+public class BlacklistFilter extends IoFilterAdapter
 {
     private final Set blacklist = new HashSet();
 

Modified: directory/network/trunk/src/java/org/apache/mina/io/filter/IoThreadPoolFilter.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/filter/IoThreadPoolFilter.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/filter/IoThreadPoolFilter.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/filter/IoThreadPoolFilter.java Fri Apr 29 05:53:46 2005
@@ -22,7 +22,7 @@
 import org.apache.mina.common.IdleStatus;
 import org.apache.mina.common.Session;
 import org.apache.mina.io.IoHandler;
-import org.apache.mina.io.IoHandlerFilter;
+import org.apache.mina.io.IoFilter;
 import org.apache.mina.io.IoSession;
 import org.apache.mina.util.BaseThreadPool;
 import org.apache.mina.util.EventType;
@@ -38,7 +38,7 @@
  * @see ThreadPool
  * @see BaseThreadPool
  */
-public class IoThreadPoolFilter extends BaseThreadPool implements ThreadPool, IoHandlerFilter
+public class IoThreadPoolFilter extends BaseThreadPool implements ThreadPool, IoFilter
 {
     /**
      * Creates a new instanceof this filter with default thread pool settings.

Modified: directory/network/trunk/src/java/org/apache/mina/io/filter/SSLFilter.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/filter/SSLFilter.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/filter/SSLFilter.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/filter/SSLFilter.java Fri Apr 29 05:53:46 2005
@@ -32,7 +32,7 @@
 import org.apache.mina.common.ByteBuffer;
 import org.apache.mina.common.DefaultExceptionMonitor;
 import org.apache.mina.io.IoHandler;
-import org.apache.mina.io.IoHandlerFilterAdapter;
+import org.apache.mina.io.IoFilterAdapter;
 import org.apache.mina.io.IoSession;
 
 /**
@@ -44,7 +44,7 @@
  * @author The Apache Directory Project (dev@directory.apache.org)
  * @version $Rev$, $Date$
  */
-public class SSLFilter extends IoHandlerFilterAdapter
+public class SSLFilter extends IoFilterAdapter
 {
     /**
      * A marker which is passed with {@link IoHandler#dataWritten(IoSession, Object)}
@@ -219,7 +219,7 @@
         }
     }
 
-    // IoHandlerFilter impl.
+    // IoFilter impl.
 
     public void sessionOpened( NextFilter nextFilter, IoSession session )
     {

Modified: directory/network/trunk/src/java/org/apache/mina/io/filter/SSLHandler.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/filter/SSLHandler.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/filter/SSLHandler.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/filter/SSLHandler.java Fri Apr 29 05:53:46 2005
@@ -27,7 +27,7 @@
 import javax.net.ssl.SSLSession;
 
 import org.apache.mina.io.IoSession;
-import org.apache.mina.io.IoHandlerFilter.NextFilter;
+import org.apache.mina.io.IoFilter.NextFilter;
 import org.apache.mina.util.Queue;
 
 /**

Modified: directory/network/trunk/src/java/org/apache/mina/io/socket/SocketAcceptor.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/socket/SocketAcceptor.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/socket/SocketAcceptor.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/socket/SocketAcceptor.java Fri Apr 29 05:53:46 2005
@@ -34,7 +34,7 @@
 import org.apache.mina.common.SessionInitializer;
 import org.apache.mina.io.IoAcceptor;
 import org.apache.mina.io.IoHandler;
-import org.apache.mina.io.IoHandlerFilterChain;
+import org.apache.mina.io.IoFilterChain;
 import org.apache.mina.io.IoSessionManagerFilterChain;
 import org.apache.mina.util.Queue;
 
@@ -448,7 +448,7 @@
         }
     }
 
-    public IoHandlerFilterChain getFilterChain()
+    public IoFilterChain getFilterChain()
     {
         return filters;
     }

Modified: directory/network/trunk/src/java/org/apache/mina/io/socket/SocketConnector.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/socket/SocketConnector.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/socket/SocketConnector.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/socket/SocketConnector.java Fri Apr 29 05:53:46 2005
@@ -32,7 +32,7 @@
 import org.apache.mina.common.SessionInitializer;
 import org.apache.mina.io.IoConnector;
 import org.apache.mina.io.IoHandler;
-import org.apache.mina.io.IoHandlerFilterChain;
+import org.apache.mina.io.IoFilterChain;
 import org.apache.mina.io.IoSession;
 import org.apache.mina.io.IoSessionManagerFilterChain;
 import org.apache.mina.util.Queue;
@@ -396,7 +396,7 @@
         }
     }
 
-    public IoHandlerFilterChain getFilterChain()
+    public IoFilterChain getFilterChain()
     {
         return filters;
     }

Modified: directory/network/trunk/src/java/org/apache/mina/io/socket/SocketSession.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/socket/SocketSession.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/socket/SocketSession.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/socket/SocketSession.java Fri Apr 29 05:53:46 2005
@@ -27,7 +27,7 @@
 import org.apache.mina.common.SessionConfig;
 import org.apache.mina.common.TransportType;
 import org.apache.mina.io.IoHandler;
-import org.apache.mina.io.IoHandlerFilterChain;
+import org.apache.mina.io.IoFilterChain;
 import org.apache.mina.io.IoSession;
 import org.apache.mina.io.IoSessionFilterChain;
 import org.apache.mina.io.IoSessionManagerFilterChain;
@@ -85,7 +85,7 @@
         return managerFilterChain;
     }
     
-    public IoHandlerFilterChain getFilterChain()
+    public IoFilterChain getFilterChain()
     {
         return filterChain;
     }

Modified: directory/network/trunk/src/java/org/apache/mina/io/socket/SocketSessionManagerFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/io/socket/SocketSessionManagerFilterChain.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/io/socket/SocketSessionManagerFilterChain.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/io/socket/SocketSessionManagerFilterChain.java Fri Apr 29 05:53:46 2005
@@ -1,14 +1,14 @@
 package org.apache.mina.io.socket;
 
 import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.io.IoHandlerFilterChain;
+import org.apache.mina.io.IoFilterChain;
 import org.apache.mina.io.IoSession;
 import org.apache.mina.io.IoSessionManager;
 import org.apache.mina.io.IoSessionManagerFilterChain;
 import org.apache.mina.util.Queue;
 
 /**
- * An {@link IoHandlerFilterChain} for socket transport (TCP/IP).
+ * An {@link IoFilterChain} for socket transport (TCP/IP).
  * 
  * @author The Apache Directory Project
  */

Copied: directory/network/trunk/src/java/org/apache/mina/protocol/AbstractProtocolFilterChain.java (from r165301, directory/network/trunk/src/java/org/apache/mina/protocol/AbstractProtocolHandlerFilterChain.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/protocol/AbstractProtocolFilterChain.java?p2=directory/network/trunk/src/java/org/apache/mina/protocol/AbstractProtocolFilterChain.java&p1=directory/network/trunk/src/java/org/apache/mina/protocol/AbstractProtocolHandlerFilterChain.java&r1=165301&r2=165302&rev=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/protocol/AbstractProtocolHandlerFilterChain.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/protocol/AbstractProtocolFilterChain.java Fri Apr 29 05:53:46 2005
@@ -26,10 +26,10 @@
 import java.util.Map;
 
 import org.apache.mina.common.IdleStatus;
-import org.apache.mina.protocol.ProtocolHandlerFilter.NextFilter;
+import org.apache.mina.protocol.ProtocolFilter.NextFilter;
 
 /**
- * An abstract implementation of {@link ProtocolHandlerFilterChain} that provides
+ * An abstract implementation of {@link ProtocolFilterChain} that provides
  * common operations for developers to extend protocol layer.
  * <p>
  * All methods has been implemented.  The list of filters is maintained
@@ -41,13 +41,13 @@
  * 
  * The only method a developer should implement is {@link #doWrite(ProtocolSession, Object)}.
  * This method is invoked when filter chain is evaluated for
- * {@link ProtocolHandlerFilter#filterWrite(NextFilter, ProtocolSession, Object)} and 
+ * {@link ProtocolFilter#filterWrite(NextFilter, ProtocolSession, Object)} and 
  * finally to be written out.
  * 
  * @author The Apache Directory Project
  * @version $Rev$, $Date$
  */
-public abstract class AbstractProtocolHandlerFilterChain implements ProtocolHandlerFilterChain
+public abstract class AbstractProtocolFilterChain implements ProtocolFilterChain
 {
     private final Map name2entry = new HashMap();
 
@@ -57,7 +57,7 @@
 
     private final Entry tail;
 
-    protected AbstractProtocolHandlerFilterChain()
+    protected AbstractProtocolFilterChain()
     {
         head = new Entry( null, null, "head", createHeadFilter() );
         tail = new Entry( head, null, "tail", createTailFilter() );
@@ -67,9 +67,9 @@
     /**
      * Override this method to create custom head of this filter chain.
      */
-    protected ProtocolHandlerFilter createHeadFilter()
+    protected ProtocolFilter createHeadFilter()
     {
-        return new ProtocolHandlerFilter()
+        return new ProtocolFilter()
         {
             public void sessionOpened( NextFilter nextFilter, ProtocolSession session )
             {
@@ -116,9 +116,9 @@
     /**
      * Override this method to create custom head of this filter chain.
      */
-    protected ProtocolHandlerFilter createTailFilter()
+    protected ProtocolFilter createTailFilter()
     {
-        return new ProtocolHandlerFilter()
+        return new ProtocolFilter()
         {
             public void sessionOpened( NextFilter nextFilter, ProtocolSession session )
             {
@@ -163,7 +163,7 @@
         };
     }
     
-    public ProtocolHandlerFilter getChild( String name )
+    public ProtocolFilter getChild( String name )
     {
         Entry e = ( Entry ) name2entry.get( name );
         if ( e == null )
@@ -177,7 +177,7 @@
      * Adds the specified interceptor with the specified name at the beginning of this chain.
      */
     public synchronized void addFirst( String name,
-                                       ProtocolHandlerFilter filter )
+                                       ProtocolFilter filter )
     {
         checkAddable( name );
         register( head, name, filter );
@@ -188,7 +188,7 @@
      * Adds the specified interceptor with the specified name at the end of this chain.
      */
     public synchronized void addLast( String name,
-                                      ProtocolHandlerFilter filter )
+                                      ProtocolFilter filter )
     {
         checkAddable( name );
         register( tail.prevEntry, name, filter );
@@ -201,7 +201,7 @@
      */
     public synchronized void addBefore( String baseName,
                                         String name,
-                                        ProtocolHandlerFilter filter )
+                                        ProtocolFilter filter )
     {
         Entry baseEntry = checkOldName( baseName );
         checkAddable( name );
@@ -215,7 +215,7 @@
      */
     public synchronized void addAfter( String baseName,
                                        String name,
-                                       ProtocolHandlerFilter filter )
+                                       ProtocolFilter filter )
     {
         Entry baseEntry = checkOldName( baseName );
         checkAddable( name );
@@ -235,7 +235,7 @@
         nextEntry.prevEntry = prevEntry;
 
         name2entry.remove( name );
-        ProtocolHandlerFilter filter = entry.filter;
+        ProtocolFilter filter = entry.filter;
         filter2entry.remove( filter );
     }
 
@@ -252,7 +252,7 @@
         }
     }
 
-    private void register( Entry prevEntry, String name, ProtocolHandlerFilter filter )
+    private void register( Entry prevEntry, String name, ProtocolFilter filter )
     {
         Entry newEntry = new Entry( prevEntry, prevEntry.nextEntry, name, filter );
         prevEntry.nextEntry.prevEntry = newEntry;
@@ -468,14 +468,14 @@
 
         private final String name;
         
-        private final ProtocolHandlerFilter filter;
+        private final ProtocolFilter filter;
 
         private final NextFilter nextFilter;
         
         private final NextFilter prevFilter;
 
         private Entry( Entry prevEntry, Entry nextEntry,
-                       String name, ProtocolHandlerFilter filter )
+                       String name, ProtocolFilter filter )
         {
             if( filter == null )
             {
@@ -583,7 +583,7 @@
             return name;
         }
         
-        public ProtocolHandlerFilter getFilter()
+        public ProtocolFilter getFilter()
         {
             return filter;
         }

Copied: directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolFilter.java (from r165301, directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolHandlerFilter.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolFilter.java?p2=directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolFilter.java&p1=directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolHandlerFilter.java&r1=165301&r2=165302&rev=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolHandlerFilter.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolFilter.java Fri Apr 29 05:53:46 2005
@@ -39,9 +39,9 @@
  * @author Trustin Lee (trustin@apache.org)
  * @version $Rev$, $Date$
  * 
- * @see ProtocolHandlerFilterAdapter
+ * @see ProtocolFilterAdapter
  */
-public interface ProtocolHandlerFilter
+public interface ProtocolFilter
 {
     /**
      * Filters {@link ProtocolHandler#sessionOpened(ProtocolSession)} event.

Copied: directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolFilterAdapter.java (from r165301, directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolHandlerFilterAdapter.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolFilterAdapter.java?p2=directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolFilterAdapter.java&p1=directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolHandlerFilterAdapter.java&r1=165301&r2=165302&rev=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolHandlerFilterAdapter.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolFilterAdapter.java Fri Apr 29 05:53:46 2005
@@ -21,14 +21,14 @@
 import org.apache.mina.common.IdleStatus;
 
 /**
- * An abstract adapter class for {@link ProtocolHandlerFilter}.  You can extend
+ * An abstract adapter class for {@link ProtocolFilter}.  You can extend
  * this class and selectively override required event filter methods only.  All
  * methods forwards events to the next filter by default.
  * 
  * @author Trustin Lee (trustin@apache.org)
  * @version $Rev$, $Date$
  */
-public class ProtocolHandlerFilterAdapter implements ProtocolHandlerFilter
+public class ProtocolFilterAdapter implements ProtocolFilter
 {
     public void sessionOpened( NextFilter nextFilter,
                               ProtocolSession session )

Copied: directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolFilterChain.java (from r165301, directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolHandlerFilterChain.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolFilterChain.java?p2=directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolFilterChain.java&p1=directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolHandlerFilterChain.java&r1=165301&r2=165302&rev=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolHandlerFilterChain.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolFilterChain.java Fri Apr 29 05:53:46 2005
@@ -3,14 +3,14 @@
 import java.util.List;
 
 
-public interface ProtocolHandlerFilterChain {
-    ProtocolHandlerFilter getChild( String name );
+public interface ProtocolFilterChain {
+    ProtocolFilter getChild( String name );
     List getChildren();
     List getChildrenReversed();
-    void addFirst( String name, ProtocolHandlerFilter filter );
-    void addLast( String name, ProtocolHandlerFilter filter );
-    void addBefore( String baseName, String name, ProtocolHandlerFilter filter );
-    void addAfter( String baseName, String name, ProtocolHandlerFilter filter );
+    void addFirst( String name, ProtocolFilter filter );
+    void addLast( String name, ProtocolFilter filter );
+    void addBefore( String baseName, String name, ProtocolFilter filter );
+    void addAfter( String baseName, String name, ProtocolFilter filter );
     void remove( String name );
     void clear();
 }

Modified: directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolSession.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolSession.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolSession.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolSession.java Fri Apr 29 05:53:46 2005
@@ -39,7 +39,7 @@
     /**
      * Returns the filter chain that only affects this session.
      */
-    ProtocolHandlerFilterChain getFilterChain();
+    ProtocolFilterChain getFilterChain();
 
 
     /**

Modified: directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolSessionFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolSessionFilterChain.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolSessionFilterChain.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolSessionFilterChain.java Fri Apr 29 05:53:46 2005
@@ -18,12 +18,12 @@
  */
 package org.apache.mina.protocol;
 
-import org.apache.mina.io.IoHandlerFilterChain;
+import org.apache.mina.io.IoFilterChain;
 import org.apache.mina.io.IoSession;
 import org.apache.mina.io.IoSessionManagerFilterChain;
 
 /**
- * An {@link IoHandlerFilterChain} that forwards <tt>filterWrite</tt>
+ * An {@link IoFilterChain} that forwards <tt>filterWrite</tt>
  * requests to the specified {@link IoSessionManagerFilterChain}.
  * <p>
  * This filter chain is used by implementations of {@link IoSession}s.
@@ -32,7 +32,7 @@
  * @author Trustin Lee (trustin@apache.org)
  * @version $Rev$, $Date$
  */
-public class ProtocolSessionFilterChain extends AbstractProtocolHandlerFilterChain {
+public class ProtocolSessionFilterChain extends AbstractProtocolFilterChain {
 
     private final ProtocolSessionManagerFilterChain managerChain;
 

Modified: directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolSessionManager.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolSessionManager.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolSessionManager.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolSessionManager.java Fri Apr 29 05:53:46 2005
@@ -23,7 +23,7 @@
 /**
  * A {@link SessionManager} for Protocol layer.
  * <p>
- * {@link ProtocolHandlerFilter}s can be added and removed at any time to filter
+ * {@link ProtocolFilter}s can be added and removed at any time to filter
  * events just like Servlet filters and they are effective immediately.
  *
  * @author The Apache Directory Project (dev@directory.apache.org)
@@ -35,5 +35,5 @@
      * Returns the filter chain that filters all events which is related
      * with sessions this manager manages.
      */
-    ProtocolHandlerFilterChain getFilterChain();
+    ProtocolFilterChain getFilterChain();
 }

Modified: directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolSessionManagerFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolSessionManagerFilterChain.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolSessionManagerFilterChain.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/protocol/ProtocolSessionManagerFilterChain.java Fri Apr 29 05:53:46 2005
@@ -21,7 +21,7 @@
 import org.apache.mina.common.IdleStatus;
 
 /**
- * An {@link ProtocolHandlerFilterChain} that forwards all events
+ * An {@link ProtocolFilterChain} that forwards all events
  * except <tt>filterWrite</tt> to the {@link ProtocolSessionFilterChain}
  * of the recipient session.
  * <p>
@@ -31,7 +31,7 @@
  * @author Trustin Lee (trustin@apache.org)
  * @version $Rev$, $Date$
  */
-public abstract class ProtocolSessionManagerFilterChain extends AbstractProtocolHandlerFilterChain {
+public abstract class ProtocolSessionManagerFilterChain extends AbstractProtocolFilterChain {
 
     private final ProtocolSessionManager manager;
 
@@ -45,9 +45,9 @@
         return manager;
     }
     
-    protected ProtocolHandlerFilter createTailFilter()
+    protected ProtocolFilter createTailFilter()
     {
-        return new ProtocolHandlerFilter()
+        return new ProtocolFilter()
         {
             public void sessionOpened( NextFilter nextFilter, ProtocolSession session )
             {

Modified: directory/network/trunk/src/java/org/apache/mina/protocol/filter/ProtocolThreadPoolFilter.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/protocol/filter/ProtocolThreadPoolFilter.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/protocol/filter/ProtocolThreadPoolFilter.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/protocol/filter/ProtocolThreadPoolFilter.java Fri Apr 29 05:53:46 2005
@@ -21,7 +21,7 @@
 import org.apache.mina.common.IdleStatus;
 import org.apache.mina.common.Session;
 import org.apache.mina.protocol.ProtocolHandler;
-import org.apache.mina.protocol.ProtocolHandlerFilter;
+import org.apache.mina.protocol.ProtocolFilter;
 import org.apache.mina.protocol.ProtocolSession;
 import org.apache.mina.util.BaseThreadPool;
 import org.apache.mina.util.EventType;
@@ -37,7 +37,7 @@
  * @see ThreadPool
  * @see BaseThreadPool
  */
-public class ProtocolThreadPoolFilter extends BaseThreadPool implements ThreadPool, ProtocolHandlerFilter
+public class ProtocolThreadPoolFilter extends BaseThreadPool implements ThreadPool, ProtocolFilter
 {
 
     /**

Modified: directory/network/trunk/src/java/org/apache/mina/protocol/io/IoAdapter.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/protocol/io/IoAdapter.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/protocol/io/IoAdapter.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/protocol/io/IoAdapter.java Fri Apr 29 05:53:46 2005
@@ -27,7 +27,7 @@
 import org.apache.mina.protocol.ProtocolDecoder;
 import org.apache.mina.protocol.ProtocolEncoder;
 import org.apache.mina.protocol.ProtocolHandler;
-import org.apache.mina.protocol.ProtocolHandlerFilterChain;
+import org.apache.mina.protocol.ProtocolFilterChain;
 import org.apache.mina.protocol.ProtocolProvider;
 import org.apache.mina.protocol.ProtocolSession;
 import org.apache.mina.protocol.ProtocolViolationException;
@@ -56,7 +56,7 @@
         this.managerFilterChain = filters;
     }
     
-    public ProtocolHandlerFilterChain getFilterChain()
+    public ProtocolFilterChain getFilterChain()
     {
         return managerFilterChain;
     }

Modified: directory/network/trunk/src/java/org/apache/mina/protocol/io/IoProtocolAcceptor.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/protocol/io/IoProtocolAcceptor.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/protocol/io/IoProtocolAcceptor.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/protocol/io/IoProtocolAcceptor.java Fri Apr 29 05:53:46 2005
@@ -11,7 +11,7 @@
 import org.apache.mina.io.IoAcceptor;
 import org.apache.mina.io.IoSession;
 import org.apache.mina.protocol.ProtocolAcceptor;
-import org.apache.mina.protocol.ProtocolHandlerFilterChain;
+import org.apache.mina.protocol.ProtocolFilterChain;
 import org.apache.mina.protocol.ProtocolProvider;
 import org.apache.mina.protocol.ProtocolSession;
 
@@ -68,7 +68,7 @@
         acceptor.unbind( address );
     }
     
-    public ProtocolHandlerFilterChain getFilterChain()
+    public ProtocolFilterChain getFilterChain()
     {
         return adapter.getFilterChain();
     }

Modified: directory/network/trunk/src/java/org/apache/mina/protocol/io/IoProtocolConnector.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/protocol/io/IoProtocolConnector.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/protocol/io/IoProtocolConnector.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/protocol/io/IoProtocolConnector.java Fri Apr 29 05:53:46 2005
@@ -11,7 +11,7 @@
 import org.apache.mina.io.IoConnector;
 import org.apache.mina.io.IoSession;
 import org.apache.mina.protocol.ProtocolConnector;
-import org.apache.mina.protocol.ProtocolHandlerFilterChain;
+import org.apache.mina.protocol.ProtocolFilterChain;
 import org.apache.mina.protocol.ProtocolProvider;
 import org.apache.mina.protocol.ProtocolSession;
 
@@ -115,7 +115,7 @@
         return adapter.toProtocolSession( session );
     }
 
-    public ProtocolHandlerFilterChain getFilterChain()
+    public ProtocolFilterChain getFilterChain()
     {
         return adapter.getFilterChain();
     }

Modified: directory/network/trunk/src/java/org/apache/mina/protocol/io/IoProtocolSession.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/protocol/io/IoProtocolSession.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/protocol/io/IoProtocolSession.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/protocol/io/IoProtocolSession.java Fri Apr 29 05:53:46 2005
@@ -13,7 +13,7 @@
 import org.apache.mina.protocol.ProtocolDecoder;
 import org.apache.mina.protocol.ProtocolEncoder;
 import org.apache.mina.protocol.ProtocolHandler;
-import org.apache.mina.protocol.ProtocolHandlerFilterChain;
+import org.apache.mina.protocol.ProtocolFilterChain;
 import org.apache.mina.protocol.ProtocolSession;
 import org.apache.mina.protocol.ProtocolSessionFilterChain;
 import org.apache.mina.protocol.ProtocolSessionManagerFilterChain;
@@ -66,7 +66,7 @@
         return session;   
     }
     
-    public ProtocolHandlerFilterChain getFilterChain()
+    public ProtocolFilterChain getFilterChain()
     {
         return filterChain;
     }

Modified: directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipeAcceptor.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipeAcceptor.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipeAcceptor.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipeAcceptor.java Fri Apr 29 05:53:46 2005
@@ -12,7 +12,7 @@
 import org.apache.mina.common.SessionInitializer;
 import org.apache.mina.protocol.ProtocolAcceptor;
 import org.apache.mina.protocol.ProtocolHandler;
-import org.apache.mina.protocol.ProtocolHandlerFilterChain;
+import org.apache.mina.protocol.ProtocolFilterChain;
 import org.apache.mina.protocol.ProtocolProvider;
 
 /**
@@ -84,7 +84,7 @@
         }
     }
     
-    public ProtocolHandlerFilterChain getFilterChain()
+    public ProtocolFilterChain getFilterChain()
     {
         return filterChain;
     }

Modified: directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipeConnector.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipeConnector.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipeConnector.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipeConnector.java Fri Apr 29 05:53:46 2005
@@ -9,7 +9,7 @@
 import org.apache.mina.common.BaseSessionManager;
 import org.apache.mina.common.SessionInitializer;
 import org.apache.mina.protocol.ProtocolConnector;
-import org.apache.mina.protocol.ProtocolHandlerFilterChain;
+import org.apache.mina.protocol.ProtocolFilterChain;
 import org.apache.mina.protocol.ProtocolProvider;
 import org.apache.mina.protocol.ProtocolSession;
 import org.apache.mina.protocol.vmpipe.VmPipeAcceptor.Entry;
@@ -34,7 +34,7 @@
         filterChain.addFirst( "VMPipe", new VmPipeFilter() );
     }
     
-    public ProtocolHandlerFilterChain getFilterChain()
+    public ProtocolFilterChain getFilterChain()
     {
         return filterChain;
     }

Modified: directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipeFilter.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipeFilter.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipeFilter.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipeFilter.java Fri Apr 29 05:53:46 2005
@@ -5,7 +5,7 @@
 
 import org.apache.mina.common.IdleStatus;
 import org.apache.mina.protocol.ProtocolHandler;
-import org.apache.mina.protocol.ProtocolHandlerFilterAdapter;
+import org.apache.mina.protocol.ProtocolFilterAdapter;
 import org.apache.mina.protocol.ProtocolSession;
 
 /**
@@ -14,7 +14,7 @@
  * @author Trustin Lee (trustin@apache.org)
  * @version $Rev$, $Date$
  */
-class VmPipeFilter extends ProtocolHandlerFilterAdapter
+class VmPipeFilter extends ProtocolFilterAdapter
 {
     public void messageReceived( NextFilter nextFilter,
                                  ProtocolSession session, Object message )

Modified: directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipeSession.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipeSession.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipeSession.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/protocol/vmpipe/VmPipeSession.java Fri Apr 29 05:53:46 2005
@@ -13,7 +13,7 @@
 import org.apache.mina.protocol.ProtocolDecoder;
 import org.apache.mina.protocol.ProtocolEncoder;
 import org.apache.mina.protocol.ProtocolHandler;
-import org.apache.mina.protocol.ProtocolHandlerFilterChain;
+import org.apache.mina.protocol.ProtocolFilterChain;
 import org.apache.mina.protocol.ProtocolSession;
 import org.apache.mina.protocol.ProtocolSessionFilterChain;
 import org.apache.mina.protocol.vmpipe.VmPipeAcceptor.Entry;
@@ -101,7 +101,7 @@
         return managerFilterChain;
     }
     
-    public ProtocolHandlerFilterChain getFilterChain()
+    public ProtocolFilterChain getFilterChain()
     {
         return filterChain;
     }

Modified: directory/network/trunk/src/java/org/apache/mina/registry/ServiceRegistry.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/registry/ServiceRegistry.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/registry/ServiceRegistry.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/registry/ServiceRegistry.java Fri Apr 29 05:53:46 2005
@@ -23,8 +23,8 @@
 
 import org.apache.mina.common.TransportType;
 import org.apache.mina.io.IoHandler;
-import org.apache.mina.io.IoHandlerFilterChain;
-import org.apache.mina.protocol.ProtocolHandlerFilterChain;
+import org.apache.mina.io.IoFilterChain;
+import org.apache.mina.protocol.ProtocolFilterChain;
 import org.apache.mina.protocol.ProtocolProvider;
 
 /**
@@ -55,9 +55,9 @@
      */
     void unbind( Service service );
 
-    IoHandlerFilterChain getIoFilterChain( TransportType transportType );
+    IoFilterChain getIoFilterChain( TransportType transportType );
     
-    ProtocolHandlerFilterChain getProtocolFilterChain( TransportType transportType );
+    ProtocolFilterChain getProtocolFilterChain( TransportType transportType );
 
     /**
      * Returns {@link Set} of all services bound in this registry.

Modified: directory/network/trunk/src/java/org/apache/mina/registry/SimpleServiceRegistry.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/registry/SimpleServiceRegistry.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/registry/SimpleServiceRegistry.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/registry/SimpleServiceRegistry.java Fri Apr 29 05:53:46 2005
@@ -13,12 +13,12 @@
 import org.apache.mina.common.TransportType;
 import org.apache.mina.io.IoAcceptor;
 import org.apache.mina.io.IoHandler;
-import org.apache.mina.io.IoHandlerFilterChain;
+import org.apache.mina.io.IoFilterChain;
 import org.apache.mina.io.datagram.DatagramAcceptor;
 import org.apache.mina.io.filter.IoThreadPoolFilter;
 import org.apache.mina.io.socket.SocketAcceptor;
 import org.apache.mina.protocol.ProtocolAcceptor;
-import org.apache.mina.protocol.ProtocolHandlerFilterChain;
+import org.apache.mina.protocol.ProtocolFilterChain;
 import org.apache.mina.protocol.ProtocolProvider;
 import org.apache.mina.protocol.filter.ProtocolThreadPoolFilter;
 import org.apache.mina.protocol.io.IoProtocolAcceptor;
@@ -109,11 +109,11 @@
         stopThreadPools();
     }
 
-    public IoHandlerFilterChain getIoFilterChain(TransportType transportType) {
+    public IoFilterChain getIoFilterChain(TransportType transportType) {
         return findIoAcceptor( transportType ).getFilterChain();
     }
 
-    public ProtocolHandlerFilterChain getProtocolFilterChain(TransportType transportType) {
+    public ProtocolFilterChain getProtocolFilterChain(TransportType transportType) {
         return findProtocolAcceptor( transportType ).getFilterChain();
     }
 

Copied: directory/network/trunk/src/test/org/apache/mina/io/IoFilterChainTest.java (from r165301, directory/network/trunk/src/test/org/apache/mina/io/IoHandlerFilterChainTest.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/test/org/apache/mina/io/IoFilterChainTest.java?p2=directory/network/trunk/src/test/org/apache/mina/io/IoFilterChainTest.java&p1=directory/network/trunk/src/test/org/apache/mina/io/IoHandlerFilterChainTest.java&r1=165301&r2=165302&rev=165302&view=diff
==============================================================================
--- directory/network/trunk/src/test/org/apache/mina/io/IoHandlerFilterChainTest.java (original)
+++ directory/network/trunk/src/test/org/apache/mina/io/IoFilterChainTest.java Fri Apr 29 05:53:46 2005
@@ -30,20 +30,20 @@
 import org.apache.mina.common.TransportType;
 
 /**
- * Tests {@link AbstractIoHandlerFilterChain}.
+ * Tests {@link AbstractIoFilterChain}.
  * 
  * @author Trustin Lee (trustin@apache.org)
  * @version $Rev$, $Date$ 
  */
-public class IoHandlerFilterChainTest extends TestCase
+public class IoFilterChainTest extends TestCase
 {
-    private IoHandlerFilterChainImpl chain;
+    private IoFilterChainImpl chain;
     private IoSession session;
     private String result;
 
     public void setUp()
     {
-        chain = new IoHandlerFilterChainImpl();
+        chain = new IoFilterChainImpl();
         session = new TestSession();
         result = "";
     }
@@ -173,13 +173,13 @@
             return null;
         }
 
-        public IoHandlerFilterChain getFilterChain()
+        public IoFilterChain getFilterChain()
         {
             return null;
         }
     }
 
-    private class TestFilter implements IoHandlerFilter
+    private class TestFilter implements IoFilter
     {
         private final char id;
 
@@ -224,9 +224,9 @@
         }
     }
 
-    private static class IoHandlerFilterChainImpl extends AbstractIoHandlerFilterChain
+    private static class IoFilterChainImpl extends AbstractIoFilterChain
     {
-        protected IoHandlerFilterChainImpl()
+        protected IoFilterChainImpl()
         {
         }
 

Copied: directory/network/trunk/src/test/org/apache/mina/protocol/ProtocolFilterChainTest.java (from r165301, directory/network/trunk/src/test/org/apache/mina/protocol/ProtocolHandlerFilterChainTest.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/test/org/apache/mina/protocol/ProtocolFilterChainTest.java?p2=directory/network/trunk/src/test/org/apache/mina/protocol/ProtocolFilterChainTest.java&p1=directory/network/trunk/src/test/org/apache/mina/protocol/ProtocolHandlerFilterChainTest.java&r1=165301&r2=165302&rev=165302&view=diff
==============================================================================
--- directory/network/trunk/src/test/org/apache/mina/protocol/ProtocolHandlerFilterChainTest.java (original)
+++ directory/network/trunk/src/test/org/apache/mina/protocol/ProtocolFilterChainTest.java Fri Apr 29 05:53:46 2005
@@ -29,20 +29,20 @@
 import org.apache.mina.common.TransportType;
 
 /**
- * Tests {@link AbstractProtocolHandlerFilterChain}.
+ * Tests {@link AbstractProtocolFilterChain}.
  * 
  * @author Trustin Lee (trustin@apache.org)
  * @version $Rev$, $Date$ 
  */
-public class ProtocolHandlerFilterChainTest extends TestCase
+public class ProtocolFilterChainTest extends TestCase
 {
-    private ProtocolHandlerFilterChainImpl chain;
+    private ProtocolFilterChainImpl chain;
     private ProtocolSession session;
     private String result;
 
     public void setUp()
     {
-        chain = new ProtocolHandlerFilterChainImpl();
+        chain = new ProtocolFilterChainImpl();
         session = new TestSession();
         result = "";
     }
@@ -172,13 +172,13 @@
             return null;
         }
 
-        public ProtocolHandlerFilterChain getFilterChain()
+        public ProtocolFilterChain getFilterChain()
         {
             return null;
         }
     }
 
-    private class TestFilter implements ProtocolHandlerFilter
+    private class TestFilter implements ProtocolFilter
     {
         private final char id;
 
@@ -223,9 +223,9 @@
         }
     }
 
-    private static class ProtocolHandlerFilterChainImpl extends AbstractProtocolHandlerFilterChain
+    private static class ProtocolFilterChainImpl extends AbstractProtocolFilterChain
     {
-        protected ProtocolHandlerFilterChainImpl()
+        protected ProtocolFilterChainImpl()
         {
         }
 

Modified: directory/network/trunk/src/test/org/apache/mina/protocol/codec/CumulativeProtocolDecoderTest.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/test/org/apache/mina/protocol/codec/CumulativeProtocolDecoderTest.java?rev=165302&r1=165301&r2=165302&view=diff
==============================================================================
--- directory/network/trunk/src/test/org/apache/mina/protocol/codec/CumulativeProtocolDecoderTest.java (original)
+++ directory/network/trunk/src/test/org/apache/mina/protocol/codec/CumulativeProtocolDecoderTest.java Fri Apr 29 05:53:46 2005
@@ -33,7 +33,7 @@
 import org.apache.mina.protocol.ProtocolDecoderOutput;
 import org.apache.mina.protocol.ProtocolEncoder;
 import org.apache.mina.protocol.ProtocolHandler;
-import org.apache.mina.protocol.ProtocolHandlerFilterChain;
+import org.apache.mina.protocol.ProtocolFilterChain;
 import org.apache.mina.protocol.ProtocolSession;
 import org.apache.mina.protocol.ProtocolViolationException;
 
@@ -213,7 +213,7 @@
             return null;
         }
 
-        public ProtocolHandlerFilterChain getFilterChain()
+        public ProtocolFilterChain getFilterChain()
         {
             return null;
         }

Copied: directory/network/trunk/src/test/org/apache/mina/util/IoFilterImpl.java (from r165301, directory/network/trunk/src/test/org/apache/mina/util/IoHandlerFilterImpl.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/test/org/apache/mina/util/IoFilterImpl.java?p2=directory/network/trunk/src/test/org/apache/mina/util/IoFilterImpl.java&p1=directory/network/trunk/src/test/org/apache/mina/util/IoHandlerFilterImpl.java&r1=165301&r2=165302&rev=165302&view=diff
==============================================================================
--- directory/network/trunk/src/test/org/apache/mina/util/IoHandlerFilterImpl.java (original)
+++ directory/network/trunk/src/test/org/apache/mina/util/IoFilterImpl.java Fri Apr 29 05:53:46 2005
@@ -18,22 +18,22 @@
  */
 package org.apache.mina.util;
 
-import org.apache.mina.io.IoHandlerFilter;
-import org.apache.mina.io.IoHandlerFilterAdapter;
-import org.apache.mina.io.IoHandlerFilterChain;
+import org.apache.mina.io.IoFilter;
+import org.apache.mina.io.IoFilterAdapter;
+import org.apache.mina.io.IoFilterChain;
 
 /**
- * Bogus implementation of {@link IoHandlerFilter} to test
- * {@link IoHandlerFilterChain}.
+ * Bogus implementation of {@link IoFilter} to test
+ * {@link IoFilterChain}.
  * 
  * @author Trustin Lee (trustin@apache.org)
  * @version $Rev$, $Date$
  */
-public class IoHandlerFilterImpl extends IoHandlerFilterAdapter
+public class IoFilterImpl extends IoFilterAdapter
 {
     private final char c;
 
-    public IoHandlerFilterImpl( char c )
+    public IoFilterImpl( char c )
     {
         this.c = c;
     }
@@ -47,9 +47,9 @@
     {
         if( o == null )
             return false;
-        if( ! ( o instanceof IoHandlerFilterImpl ) )
+        if( ! ( o instanceof IoFilterImpl ) )
             return false;
-        return this.c == ( ( IoHandlerFilterImpl ) o ).c;
+        return this.c == ( ( IoFilterImpl ) o ).c;
     }
 
     public String toString()

Copied: directory/network/trunk/src/test/org/apache/mina/util/ProtocolFilterImpl.java (from r165301, directory/network/trunk/src/test/org/apache/mina/util/ProtocolHandlerFilterImpl.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/test/org/apache/mina/util/ProtocolFilterImpl.java?p2=directory/network/trunk/src/test/org/apache/mina/util/ProtocolFilterImpl.java&p1=directory/network/trunk/src/test/org/apache/mina/util/ProtocolHandlerFilterImpl.java&r1=165301&r2=165302&rev=165302&view=diff
==============================================================================
--- directory/network/trunk/src/test/org/apache/mina/util/ProtocolHandlerFilterImpl.java (original)
+++ directory/network/trunk/src/test/org/apache/mina/util/ProtocolFilterImpl.java Fri Apr 29 05:53:46 2005
@@ -18,22 +18,22 @@
  */
 package org.apache.mina.util;
 
-import org.apache.mina.protocol.ProtocolHandlerFilter;
-import org.apache.mina.protocol.ProtocolHandlerFilterAdapter;
-import org.apache.mina.protocol.ProtocolHandlerFilterChain;
+import org.apache.mina.protocol.ProtocolFilter;
+import org.apache.mina.protocol.ProtocolFilterAdapter;
+import org.apache.mina.protocol.ProtocolFilterChain;
 
 /**
- * Bogus implementation of {@link ProtocolHandlerFilter} to test
- * {@link ProtocolHandlerFilterChain}.
+ * Bogus implementation of {@link ProtocolFilter} to test
+ * {@link ProtocolFilterChain}.
  * 
  * @author Trustin Lee (trustin@apache.org)
  * @version $Rev$, $Date$
  */
-public class ProtocolHandlerFilterImpl extends ProtocolHandlerFilterAdapter
+public class ProtocolFilterImpl extends ProtocolFilterAdapter
 {
     private final char c;
 
-    public ProtocolHandlerFilterImpl( char c )
+    public ProtocolFilterImpl( char c )
     {
         this.c = c;
     }
@@ -47,9 +47,9 @@
     {
         if( o == null )
             return false;
-        if( ! ( o instanceof ProtocolHandlerFilterImpl ) )
+        if( ! ( o instanceof ProtocolFilterImpl ) )
             return false;
-        return this.c == ( ( ProtocolHandlerFilterImpl ) o ).c;
+        return this.c == ( ( ProtocolFilterImpl ) o ).c;
     }
 
     public String toString()



Mime
View raw message