Author: trustin Date: Thu Dec 23 03:20:06 2004 New Revision: 123188 URL: http://svn.apache.org/viewcvs?view=rev&rev=123188 Log: * Renamed ThreadPoolFilters to IoThreadPoolFilter and ProtocolThreadPoolFilter. Added: incubator/directory/network/trunk/mina/src/java/org/apache/mina/io/filter/IoThreadPoolFilter.java - copied, changed from r123187, incubator/directory/network/trunk/mina/src/java/org/apache/mina/io/filter/ThreadPoolFilter.java incubator/directory/network/trunk/mina/src/java/org/apache/mina/protocol/filter/ProtocolThreadPoolFilter.java - copied, changed from r123187, incubator/directory/network/trunk/mina/src/java/org/apache/mina/protocol/filter/ThreadPoolFilter.java Removed: incubator/directory/network/trunk/mina/src/java/org/apache/mina/io/filter/ThreadPoolFilter.java incubator/directory/network/trunk/mina/src/java/org/apache/mina/protocol/filter/ThreadPoolFilter.java Modified: incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/echoserver/Main.java incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/netcat/Main.java incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/reverser/Main.java
Modified: incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/echoserver/Main.java Url: http://svn.apache.org/viewcvs/incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/echoserver/Main.java?view=diff&rev=123188&p1=incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/echoserver/Main.java&r1=123187&p2=incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/echoserver/Main.java&r2=123188 ============================================================================== --- incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/echoserver/Main.java (original) +++ incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/echoserver/Main.java Thu Dec 23 03:20:06 2004 @@ -21,7 +21,7 @@ import java.net.InetSocketAddress; import org.apache.mina.io.Acceptor; -import org.apache.mina.io.filter.ThreadPoolFilter; +import org.apache.mina.io.filter.IoThreadPoolFilter; import org.apache.mina.io.socket.TcpAcceptor; /** @@ -37,7 +37,7 @@ public static void main( String[] args ) throws Exception { Acceptor acceptor = new TcpAcceptor(); - acceptor.addFilter( Integer.MAX_VALUE, new ThreadPoolFilter() ); + acceptor.addFilter( Integer.MAX_VALUE, new IoThreadPoolFilter() ); acceptor.bind( new InetSocketAddress( PORT ), new EchoProtocolHandler() ); System.out.println( "Listening on port " + PORT ); Modified: incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/netcat/Main.java Url: http://svn.apache.org/viewcvs/incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/netcat/Main.java?view=diff&rev=123188&p1=incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/netcat/Main.java&r1=123187&p2=incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/netcat/Main.java&r2=123188 ============================================================================== --- incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/netcat/Main.java (original) +++ incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/netcat/Main.java Thu Dec 23 03:20:06 2004 @@ -20,7 +20,7 @@ import java.net.InetSocketAddress; -import org.apache.mina.io.filter.ThreadPoolFilter; +import org.apache.mina.io.filter.IoThreadPoolFilter; import org.apache.mina.io.socket.TcpConnector; /** @@ -40,7 +40,7 @@ } TcpConnector connector = new TcpConnector(); - connector.addFilter( Integer.MAX_VALUE, new ThreadPoolFilter() ); + connector.addFilter( Integer.MAX_VALUE, new IoThreadPoolFilter() ); connector.connect( new InetSocketAddress( args[ 0 ], Integer .parseInt( args[ 1 ] ) ), 60, new NetCatProtocolHandler() ); } Modified: incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/reverser/Main.java Url: http://svn.apache.org/viewcvs/incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/reverser/Main.java?view=diff&rev=123188&p1=incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/reverser/Main.java&r1=123187&p2=incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/reverser/Main.java&r2=123188 ============================================================================== --- incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/reverser/Main.java (original) +++ incubator/directory/network/trunk/mina/src/examples/org/apache/mina/examples/reverser/Main.java Thu Dec 23 03:20:06 2004 @@ -21,8 +21,10 @@ import java.net.InetSocketAddress; import org.apache.mina.io.Acceptor; +import org.apache.mina.io.filter.IoThreadPoolFilter; import org.apache.mina.io.socket.TcpAcceptor; import org.apache.mina.protocol.IoAdapter; +import org.apache.mina.protocol.filter.ProtocolThreadPoolFilter; /** * TODO Document me. @@ -39,12 +41,9 @@ Acceptor acceptor = new TcpAcceptor(); IoAdapter ioAdapter = new IoAdapter(); - acceptor.addFilter( Integer.MAX_VALUE, - new org.apache.mina.io.filter.ThreadPoolFilter() ); + acceptor.addFilter( Integer.MAX_VALUE, new IoThreadPoolFilter() ); ioAdapter - .addFilter( - Integer.MAX_VALUE, - new org.apache.mina.protocol.filter.ThreadPoolFilter() ); + .addFilter( Integer.MAX_VALUE, new ProtocolThreadPoolFilter() ); acceptor.bind( new InetSocketAddress( PORT ), ioAdapter .adapt( new ReverseProtocolProvider() ) ); Copied: incubator/directory/network/trunk/mina/src/java/org/apache/mina/io/filter/IoThreadPoolFilter.java (from r123187, incubator/directory/network/trunk/mina/src/java/org/apache/mina/io/filter/ThreadPoolFilter.java) Url: http://svn.apache.org/viewcvs/incubator/directory/network/trunk/mina/src/java/org/apache/mina/io/filter/IoThreadPoolFilter.java?view=diff&rev=123188&p1=incubator/directory/network/trunk/mina/src/java/org/apache/mina/io/filter/ThreadPoolFilter.java&r1=123187&p2=incubator/directory/network/trunk/mina/src/java/org/apache/mina/io/filter/IoThreadPoolFilter.java&r2=123188 ============================================================================== --- incubator/directory/network/trunk/mina/src/java/org/apache/mina/io/filter/ThreadPoolFilter.java (original) +++ incubator/directory/network/trunk/mina/src/java/org/apache/mina/io/filter/IoThreadPoolFilter.java Thu Dec 23 03:20:06 2004 @@ -26,7 +26,7 @@ * @author Trustin Lee ([EMAIL PROTECTED]) * @version $Rev$, $Date$ */ -public class ThreadPoolFilter implements IoHandlerFilter +public class IoThreadPoolFilter implements IoHandlerFilter { public static final int DEFAULT_MAXIMUM_POOL_SIZE = Integer.MAX_VALUE; @@ -52,7 +52,7 @@ private int poolSize; - public ThreadPoolFilter() + public IoThreadPoolFilter() { } @@ -257,7 +257,7 @@ private Worker() { - super( ThreadPoolFilter.class.getName() + '-' + ( threadId++ ) ); + super( IoThreadPoolFilter.class.getName() + '-' + ( threadId++ ) ); increasePoolSize(); } @@ -467,7 +467,7 @@ { if( !shuttingDown ) { - synchronized( ThreadPoolFilter.this ) + synchronized( IoThreadPoolFilter.this ) { if( !shuttingDown && getPoolSize() < getMaximumPoolSize() ) Deleted: /incubator/directory/network/trunk/mina/src/java/org/apache/mina/io/filter/ThreadPoolFilter.java Url: http://svn.apache.org/viewcvs/incubator/directory/network/trunk/mina/src/java/org/apache/mina/io/filter/ThreadPoolFilter.java?view=auto&rev=123187 ============================================================================== Copied: incubator/directory/network/trunk/mina/src/java/org/apache/mina/protocol/filter/ProtocolThreadPoolFilter.java (from r123187, incubator/directory/network/trunk/mina/src/java/org/apache/mina/protocol/filter/ThreadPoolFilter.java) Url: http://svn.apache.org/viewcvs/incubator/directory/network/trunk/mina/src/java/org/apache/mina/protocol/filter/ProtocolThreadPoolFilter.java?view=diff&rev=123188&p1=incubator/directory/network/trunk/mina/src/java/org/apache/mina/protocol/filter/ThreadPoolFilter.java&r1=123187&p2=incubator/directory/network/trunk/mina/src/java/org/apache/mina/protocol/filter/ProtocolThreadPoolFilter.java&r2=123188 ============================================================================== --- incubator/directory/network/trunk/mina/src/java/org/apache/mina/protocol/filter/ThreadPoolFilter.java (original) +++ incubator/directory/network/trunk/mina/src/java/org/apache/mina/protocol/filter/ProtocolThreadPoolFilter.java Thu Dec 23 03:20:06 2004 @@ -25,7 +25,7 @@ * @author Trustin Lee ([EMAIL PROTECTED]) * @version $Rev$, $Date$ */ -public class ThreadPoolFilter implements ProtocolHandlerFilter +public class ProtocolThreadPoolFilter implements ProtocolHandlerFilter { public static final int DEFAULT_MAXIMUM_POOL_SIZE = Integer.MAX_VALUE; @@ -51,7 +51,7 @@ private int poolSize; - public ThreadPoolFilter() + public ProtocolThreadPoolFilter() { } @@ -252,7 +252,7 @@ private Worker() { - super( ThreadPoolFilter.class.getName() + '-' + ( threadId++ ) ); + super( ProtocolThreadPoolFilter.class.getName() + '-' + ( threadId++ ) ); increasePoolSize(); } @@ -449,7 +449,7 @@ { if( !shuttingDown ) { - synchronized( ThreadPoolFilter.this ) + synchronized( ProtocolThreadPoolFilter.this ) { if( !shuttingDown && getPoolSize() < getMaximumPoolSize() ) Deleted: /incubator/directory/network/trunk/mina/src/java/org/apache/mina/protocol/filter/ThreadPoolFilter.java Url: http://svn.apache.org/viewcvs/incubator/directory/network/trunk/mina/src/java/org/apache/mina/protocol/filter/ThreadPoolFilter.java?view=auto&rev=123187 ==============================================================================
