Return-Path: Delivered-To: apmail-incubator-directory-cvs-archive@www.apache.org Received: (qmail 4336 invoked from network); 23 Dec 2004 11:20:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 23 Dec 2004 11:20:12 -0000 Received: (qmail 61932 invoked by uid 500); 23 Dec 2004 11:20:11 -0000 Delivered-To: apmail-incubator-directory-cvs-archive@incubator.apache.org Received: (qmail 61887 invoked by uid 500); 23 Dec 2004 11:20:11 -0000 Mailing-List: contact directory-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: directory-dev@incubator.apache.org Delivered-To: mailing list directory-cvs@incubator.apache.org Received: (qmail 61871 invoked by uid 99); 23 Dec 2004 11:20:11 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 23 Dec 2004 03:20:10 -0800 Received: (qmail 4261 invoked by uid 65534); 23 Dec 2004 11:20:09 -0000 Date: 23 Dec 2004 11:20:09 -0000 Message-ID: <20041223112009.4254.qmail@minotaur.apache.org> From: trustin@apache.org To: directory-cvs@incubator.apache.org Subject: svn commit: r123188 - in incubator/directory/network/trunk/mina/src: examples/org/apache/mina/examples/echoserver examples/org/apache/mina/examples/netcat examples/org/apache/mina/examples/reverser java/org/apache/mina/io/filter java/org/apache/mina/protocol/filter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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 (trustin@apache.org) * @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 (trustin@apache.org) * @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 ==============================================================================