Author: trustin Date: Mon Dec 13 21:00:08 2004 New Revision: 111782 URL: http://svn.apache.org/viewcvs?view=rev&rev=111782 Log: separated common part and io part Added: incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/ incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/Acceptor.java - copied, changed from r111339, incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Acceptor.java incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/Connector.java - copied, changed from r111339, incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Connector.java incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/ReadBuffer.java - copied, changed from r111339, incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/ReadBuffer.java incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/Session.java - copied, changed from r111339, incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Session.java incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/SessionHandler.java - copied, changed from r111339, incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/SessionHandler.java incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/WriteBuffer.java - copied, changed from r111339, incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/WriteBuffer.java incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/ - copied from r111339, incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/socket/ Modified: incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpAcceptor.java incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpConnector.java incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpIoProcessor.java incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpReadBuffer.java incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpSession.java incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpSessionConfig.java incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpWriteBuffer.java
Copied: incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/Acceptor.java (from r111339, incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Acceptor.java) Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/Acceptor.java?view=diff&rev=111782&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Acceptor.java&r1=111339&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/Acceptor.java&r2=111782 ============================================================================== --- incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Acceptor.java (original) +++ incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/Acceptor.java Mon Dec 13 21:00:08 2004 @@ -17,7 +17,7 @@ /* * @(#) $Id$ */ -package org.apache.mina.core; +package org.apache.mina.io; import java.io.IOException; Copied: incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/Connector.java (from r111339, incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Connector.java) Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/Connector.java?view=diff&rev=111782&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Connector.java&r1=111339&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/Connector.java&r2=111782 ============================================================================== --- incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Connector.java (original) +++ incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/Connector.java Mon Dec 13 21:00:08 2004 @@ -17,7 +17,7 @@ /* * @(#) $Id$ */ -package org.apache.mina.core; +package org.apache.mina.io; import java.io.IOException; Copied: incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/ReadBuffer.java (from r111339, incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/ReadBuffer.java) Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/ReadBuffer.java?view=diff&rev=111782&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/ReadBuffer.java&r1=111339&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/ReadBuffer.java&r2=111782 ============================================================================== --- incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/ReadBuffer.java (original) +++ incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/ReadBuffer.java Mon Dec 13 21:00:08 2004 @@ -17,7 +17,7 @@ /* * @(#) $Id$ */ -package org.apache.mina.core; +package org.apache.mina.io; import java.nio.ByteBuffer; import java.nio.ByteOrder; Copied: incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/Session.java (from r111339, incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Session.java) Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/Session.java?view=diff&rev=111782&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Session.java&r1=111339&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/Session.java&r2=111782 ============================================================================== --- incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/Session.java (original) +++ incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/Session.java Mon Dec 13 21:00:08 2004 @@ -17,9 +17,12 @@ /* * @(#) $Id$ */ -package org.apache.mina.core; +package org.apache.mina.io; import java.net.SocketAddress; + +import org.apache.mina.core.IdleStatus; +import org.apache.mina.core.SessionConfig; Copied: incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/SessionHandler.java (from r111339, incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/SessionHandler.java) Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/SessionHandler.java?view=diff&rev=111782&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/SessionHandler.java&r1=111339&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/SessionHandler.java&r2=111782 ============================================================================== --- incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/SessionHandler.java (original) +++ incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/SessionHandler.java Mon Dec 13 21:00:08 2004 @@ -17,7 +17,9 @@ /* * @(#) $Id$ */ -package org.apache.mina.core; +package org.apache.mina.io; + +import org.apache.mina.core.IdleStatus; Copied: incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/WriteBuffer.java (from r111339, incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/WriteBuffer.java) Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/WriteBuffer.java?view=diff&rev=111782&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/WriteBuffer.java&r1=111339&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/WriteBuffer.java&r2=111782 ============================================================================== --- incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/WriteBuffer.java (original) +++ incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/WriteBuffer.java Mon Dec 13 21:00:08 2004 @@ -17,7 +17,7 @@ /* * @(#) $Id$ */ -package org.apache.mina.core; +package org.apache.mina.io; import java.nio.ByteBuffer; import java.nio.ByteOrder; Modified: incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpAcceptor.java Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpAcceptor.java?view=diff&rev=111782&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/socket/TcpAcceptor.java&r1=111339&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpAcceptor.java&r2=111782 ============================================================================== --- incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/socket/TcpAcceptor.java (original) +++ incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpAcceptor.java Mon Dec 13 21:00:08 2004 @@ -17,18 +17,15 @@ /* * @(#) $Id$ */ -package org.apache.mina.core.socket ; +package org.apache.mina.io.socket; import java.io.IOException; - import java.net.InetSocketAddress; import java.net.SocketAddress; - import java.nio.channels.SelectionKey; import java.nio.channels.Selector; import java.nio.channels.ServerSocketChannel; import java.nio.channels.SocketChannel; - import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -36,8 +33,8 @@ import org.apache.commons.lang.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.mina.core.Acceptor; -import org.apache.mina.core.SessionHandler; +import org.apache.mina.io.Acceptor; +import org.apache.mina.io.SessionHandler; /** Modified: incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpConnector.java Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpConnector.java?view=diff&rev=111782&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/socket/TcpConnector.java&r1=111339&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpConnector.java&r2=111782 ============================================================================== --- incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/socket/TcpConnector.java (original) +++ incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpConnector.java Mon Dec 13 21:00:08 2004 @@ -17,26 +17,23 @@ /* * @(#) $Id$ */ -package org.apache.mina.core.socket; +package org.apache.mina.io.socket; import java.io.IOException; - import java.net.ConnectException; import java.net.InetSocketAddress; import java.net.SocketAddress; - import java.nio.channels.SelectionKey; import java.nio.channels.Selector; import java.nio.channels.SocketChannel; - import java.util.Iterator; import java.util.Set; import org.apache.commons.lang.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.mina.core.Connector; -import org.apache.mina.core.SessionHandler; +import org.apache.mina.io.Connector; +import org.apache.mina.io.SessionHandler; /** Modified: incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpIoProcessor.java Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpIoProcessor.java?view=diff&rev=111782&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/socket/TcpIoProcessor.java&r1=111339&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpIoProcessor.java&r2=111782 ============================================================================== --- incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/socket/TcpIoProcessor.java (original) +++ incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpIoProcessor.java Mon Dec 13 21:00:08 2004 @@ -17,7 +17,7 @@ /* * @(#) $Id$ */ -package org.apache.mina.core.socket; +package org.apache.mina.io.socket; import java.io.IOException; import java.nio.ByteBuffer; Modified: incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpReadBuffer.java Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpReadBuffer.java?view=diff&rev=111782&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/socket/TcpReadBuffer.java&r1=111339&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpReadBuffer.java&r2=111782 ============================================================================== --- incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/socket/TcpReadBuffer.java (original) +++ incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpReadBuffer.java Mon Dec 13 21:00:08 2004 @@ -17,12 +17,12 @@ /* * @(#) $Id$ */ -package org.apache.mina.core.socket; +package org.apache.mina.io.socket; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import org.apache.mina.core.ReadBuffer; +import org.apache.mina.io.ReadBuffer; /** Modified: incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpSession.java Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpSession.java?view=diff&rev=111782&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/socket/TcpSession.java&r1=111339&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpSession.java&r2=111782 ============================================================================== --- incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/socket/TcpSession.java (original) +++ incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpSession.java Mon Dec 13 21:00:08 2004 @@ -17,7 +17,7 @@ /* * @(#) $Id$ */ -package org.apache.mina.core.socket; +package org.apache.mina.io.socket; import java.net.SocketAddress; import java.nio.ByteBuffer; @@ -25,11 +25,11 @@ import java.nio.channels.SocketChannel; import org.apache.mina.core.IdleStatus; -import org.apache.mina.core.ReadBuffer; -import org.apache.mina.core.Session; import org.apache.mina.core.SessionConfig; -import org.apache.mina.core.SessionHandler; -import org.apache.mina.core.WriteBuffer; +import org.apache.mina.io.ReadBuffer; +import org.apache.mina.io.Session; +import org.apache.mina.io.SessionHandler; +import org.apache.mina.io.WriteBuffer; import org.apache.mina.util.ByteBufferPool; Modified: incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpSessionConfig.java Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpSessionConfig.java?view=diff&rev=111782&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/socket/TcpSessionConfig.java&r1=111339&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpSessionConfig.java&r2=111782 ============================================================================== --- incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/socket/TcpSessionConfig.java (original) +++ incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpSessionConfig.java Mon Dec 13 21:00:08 2004 @@ -17,7 +17,7 @@ /* * @(#) $Id$ */ -package org.apache.mina.core.socket; +package org.apache.mina.io.socket; import java.net.SocketException; Modified: incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpWriteBuffer.java Url: http://svn.apache.org/viewcvs/incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpWriteBuffer.java?view=diff&rev=111782&p1=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/socket/TcpWriteBuffer.java&r1=111339&p2=incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpWriteBuffer.java&r2=111782 ============================================================================== --- incubator/directory/seda/branches/trustin/src/java/org/apache/mina/core/socket/TcpWriteBuffer.java (original) +++ incubator/directory/seda/branches/trustin/src/java/org/apache/mina/io/socket/TcpWriteBuffer.java Mon Dec 13 21:00:08 2004 @@ -17,13 +17,13 @@ /* * @(#) $Id$ */ -package org.apache.mina.core.socket; +package org.apache.mina.io.socket; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import org.apache.mina.core.ReadBuffer; -import org.apache.mina.core.WriteBuffer; +import org.apache.mina.io.ReadBuffer; +import org.apache.mina.io.WriteBuffer; import org.apache.mina.util.Queue;
