You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by tr...@apache.org on 2005/10/19 10:08:16 UTC
svn commit: r326451 - in /directory/network/trunk/src:
java/org/apache/mina/common/ java/org/apache/mina/common/support/
java/org/apache/mina/filter/ java/org/apache/mina/filter/codec/
java/org/apache/mina/filter/codec/support/ java/org/apache/mina/fil...
Author: trustin
Date: Wed Oct 19 01:07:09 2005
New Revision: 326451
URL: http://svn.apache.org/viewcvs?rev=326451&view=rev
Log:
Moved internal classes to <original package name>.support package.
Added:
directory/network/trunk/src/java/org/apache/mina/common/support/
directory/network/trunk/src/java/org/apache/mina/common/support/AbstractIoFilterChain.java
- copied, changed from r326410, directory/network/trunk/src/java/org/apache/mina/common/AbstractIoFilterChain.java
directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoAcceptor.java
- copied, changed from r326428, directory/network/trunk/src/java/org/apache/mina/common/BaseIoAcceptor.java
directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoAcceptorConfig.java
- copied, changed from r326410, directory/network/trunk/src/java/org/apache/mina/common/BaseIoAcceptorConfig.java
directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoConnectorConfig.java
- copied, changed from r326410, directory/network/trunk/src/java/org/apache/mina/common/BaseIoConnectorConfig.java
directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoSession.java
- copied, changed from r326410, directory/network/trunk/src/java/org/apache/mina/common/BaseIoSession.java
directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoSessionConfig.java
- copied, changed from r326410, directory/network/trunk/src/java/org/apache/mina/common/BaseIoSessionConfig.java
directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoSessionManager.java
- copied, changed from r326410, directory/network/trunk/src/java/org/apache/mina/common/BaseIoSessionManager.java
directory/network/trunk/src/java/org/apache/mina/common/support/ByteBufferHexDumper.java
- copied, changed from r326410, directory/network/trunk/src/java/org/apache/mina/common/ByteBufferHexDumper.java
directory/network/trunk/src/java/org/apache/mina/common/support/DefaultExceptionMonitor.java
- copied, changed from r326410, directory/network/trunk/src/java/org/apache/mina/common/DefaultExceptionMonitor.java
directory/network/trunk/src/java/org/apache/mina/common/support/IoSessionFilterChain.java
- copied, changed from r326410, directory/network/trunk/src/java/org/apache/mina/common/IoSessionFilterChain.java
directory/network/trunk/src/java/org/apache/mina/common/support/IoSessionManagerFilterChain.java
- copied, changed from r326410, directory/network/trunk/src/java/org/apache/mina/common/IoSessionManagerFilterChain.java
directory/network/trunk/src/java/org/apache/mina/filter/codec/support/
directory/network/trunk/src/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java
- copied, changed from r326410, directory/network/trunk/src/java/org/apache/mina/filter/codec/SimpleProtocolDecoderOutput.java
directory/network/trunk/src/java/org/apache/mina/filter/codec/support/SimpleProtocolEncoderOutput.java
- copied, changed from r326410, directory/network/trunk/src/java/org/apache/mina/filter/codec/SimpleProtocolEncoderOutput.java
directory/network/trunk/src/java/org/apache/mina/filter/support/
directory/network/trunk/src/java/org/apache/mina/filter/support/SSLByteBufferPool.java
- copied, changed from r326410, directory/network/trunk/src/java/org/apache/mina/filter/SSLByteBufferPool.java
directory/network/trunk/src/java/org/apache/mina/filter/support/SSLHandler.java
- copied, changed from r326410, directory/network/trunk/src/java/org/apache/mina/filter/SSLHandler.java
Removed:
directory/network/trunk/src/java/org/apache/mina/common/AbstractIoFilterChain.java
directory/network/trunk/src/java/org/apache/mina/common/BaseIoAcceptor.java
directory/network/trunk/src/java/org/apache/mina/common/BaseIoAcceptorConfig.java
directory/network/trunk/src/java/org/apache/mina/common/BaseIoConnectorConfig.java
directory/network/trunk/src/java/org/apache/mina/common/BaseIoSession.java
directory/network/trunk/src/java/org/apache/mina/common/BaseIoSessionConfig.java
directory/network/trunk/src/java/org/apache/mina/common/BaseIoSessionManager.java
directory/network/trunk/src/java/org/apache/mina/common/ByteBufferHexDumper.java
directory/network/trunk/src/java/org/apache/mina/common/DefaultExceptionMonitor.java
directory/network/trunk/src/java/org/apache/mina/common/IoSessionFilterChain.java
directory/network/trunk/src/java/org/apache/mina/common/IoSessionManagerFilterChain.java
directory/network/trunk/src/java/org/apache/mina/filter/SSLByteBufferPool.java
directory/network/trunk/src/java/org/apache/mina/filter/SSLHandler.java
directory/network/trunk/src/java/org/apache/mina/filter/codec/SimpleProtocolDecoderOutput.java
directory/network/trunk/src/java/org/apache/mina/filter/codec/SimpleProtocolEncoderOutput.java
Modified:
directory/network/trunk/src/java/org/apache/mina/common/ByteBuffer.java
directory/network/trunk/src/java/org/apache/mina/common/ExceptionMonitor.java
directory/network/trunk/src/java/org/apache/mina/common/IoSessionManager.java
directory/network/trunk/src/java/org/apache/mina/filter/SSLFilter.java
directory/network/trunk/src/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramSession.java
directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramSessionConfig.java
directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramSessionManager.java
directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramSessionManagerFilterChain.java
directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketConnector.java
directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketSession.java
directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketSessionConfig.java
directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketSessionManagerFilterChain.java
directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeSession.java
directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeSessionConfig.java
directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeSessionManagerFilterChain.java
directory/network/trunk/src/test/org/apache/mina/common/FutureTest.java
directory/network/trunk/src/test/org/apache/mina/common/IoFilterChainTest.java
directory/network/trunk/src/test/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java
directory/network/trunk/src/test/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
Modified: directory/network/trunk/src/java/org/apache/mina/common/ByteBuffer.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/common/ByteBuffer.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/common/ByteBuffer.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/common/ByteBuffer.java Wed Oct 19 01:07:09 2005
@@ -34,6 +34,7 @@
import org.apache.mina.common.IoFilter.NextFilter;
import org.apache.mina.common.IoFilter.WriteRequest;
+import org.apache.mina.common.support.ByteBufferHexDumper;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
import org.apache.mina.util.Stack;
Modified: directory/network/trunk/src/java/org/apache/mina/common/ExceptionMonitor.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/common/ExceptionMonitor.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/common/ExceptionMonitor.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/common/ExceptionMonitor.java Wed Oct 19 01:07:09 2005
@@ -18,6 +18,8 @@
*/
package org.apache.mina.common;
+import org.apache.mina.common.support.DefaultExceptionMonitor;
+
/**
* Monitors uncaught exceptions. {@link #exceptionCaught(Object, Throwable)} is
* invoked when there are any uncaught exceptions.
Modified: directory/network/trunk/src/java/org/apache/mina/common/IoSessionManager.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/common/IoSessionManager.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/common/IoSessionManager.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/common/IoSessionManager.java Wed Oct 19 01:07:09 2005
@@ -18,6 +18,8 @@
*/
package org.apache.mina.common;
+import org.apache.mina.common.support.DefaultExceptionMonitor;
+
/**
* Base interface for all acceptors and connectors that manage
* sessions.
Copied: directory/network/trunk/src/java/org/apache/mina/common/support/AbstractIoFilterChain.java (from r326410, directory/network/trunk/src/java/org/apache/mina/common/AbstractIoFilterChain.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/common/support/AbstractIoFilterChain.java?p2=directory/network/trunk/src/java/org/apache/mina/common/support/AbstractIoFilterChain.java&p1=directory/network/trunk/src/java/org/apache/mina/common/AbstractIoFilterChain.java&r1=326410&r2=326451&rev=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/common/AbstractIoFilterChain.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/common/support/AbstractIoFilterChain.java Wed Oct 19 01:07:09 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*
*/
-package org.apache.mina.common;
+package org.apache.mina.common.support;
import java.util.ArrayList;
import java.util.HashMap;
@@ -25,6 +25,10 @@
import java.util.List;
import java.util.Map;
+import org.apache.mina.common.IdleStatus;
+import org.apache.mina.common.IoFilter;
+import org.apache.mina.common.IoFilterChain;
+import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoFilter.NextFilter;
import org.apache.mina.common.IoFilter.WriteRequest;
import org.apache.mina.util.ByteBufferUtil;
Copied: directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoAcceptor.java (from r326428, directory/network/trunk/src/java/org/apache/mina/common/BaseIoAcceptor.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoAcceptor.java?p2=directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoAcceptor.java&p1=directory/network/trunk/src/java/org/apache/mina/common/BaseIoAcceptor.java&r1=326428&r2=326451&rev=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/common/BaseIoAcceptor.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoAcceptor.java Wed Oct 19 01:07:09 2005
@@ -16,9 +16,12 @@
* limitations under the License.
*
*/
-package org.apache.mina.common;
+package org.apache.mina.common.support;
import java.net.SocketAddress;
+
+import org.apache.mina.common.IoAcceptor;
+import org.apache.mina.common.IoSession;
/**
* Base implementation of {@link IoAcceptor}s.
Copied: directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoAcceptorConfig.java (from r326410, directory/network/trunk/src/java/org/apache/mina/common/BaseIoAcceptorConfig.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoAcceptorConfig.java?p2=directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoAcceptorConfig.java&p1=directory/network/trunk/src/java/org/apache/mina/common/BaseIoAcceptorConfig.java&r1=326410&r2=326451&rev=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/common/BaseIoAcceptorConfig.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoAcceptorConfig.java Wed Oct 19 01:07:09 2005
@@ -16,7 +16,9 @@
* limitations under the License.
*
*/
-package org.apache.mina.common;
+package org.apache.mina.common.support;
+
+import org.apache.mina.common.IoAcceptorConfig;
/**
* Base implementation of {@link IoAcceptorConfig}s.
Copied: directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoConnectorConfig.java (from r326410, directory/network/trunk/src/java/org/apache/mina/common/BaseIoConnectorConfig.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoConnectorConfig.java?p2=directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoConnectorConfig.java&p1=directory/network/trunk/src/java/org/apache/mina/common/BaseIoConnectorConfig.java&r1=326410&r2=326451&rev=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/common/BaseIoConnectorConfig.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoConnectorConfig.java Wed Oct 19 01:07:09 2005
@@ -16,7 +16,9 @@
* limitations under the License.
*
*/
-package org.apache.mina.common;
+package org.apache.mina.common.support;
+
+import org.apache.mina.common.IoConnectorConfig;
/**
* Base implementation of {@link IoConnectorConfig}s.
Copied: directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoSession.java (from r326410, directory/network/trunk/src/java/org/apache/mina/common/BaseIoSession.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoSession.java?p2=directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoSession.java&p1=directory/network/trunk/src/java/org/apache/mina/common/BaseIoSession.java&r1=326410&r2=326451&rev=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/common/BaseIoSession.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoSession.java Wed Oct 19 01:07:09 2005
@@ -16,11 +16,14 @@
* limitations under the License.
*
*/
-package org.apache.mina.common;
+package org.apache.mina.common.support;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+
+import org.apache.mina.common.IdleStatus;
+import org.apache.mina.common.IoSession;
/**
* Base implementation of {@link IoSession}.
Copied: directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoSessionConfig.java (from r326410, directory/network/trunk/src/java/org/apache/mina/common/BaseIoSessionConfig.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoSessionConfig.java?p2=directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoSessionConfig.java&p1=directory/network/trunk/src/java/org/apache/mina/common/BaseIoSessionConfig.java&r1=326410&r2=326451&rev=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/common/BaseIoSessionConfig.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoSessionConfig.java Wed Oct 19 01:07:09 2005
@@ -16,7 +16,10 @@
* limitations under the License.
*
*/
-package org.apache.mina.common;
+package org.apache.mina.common.support;
+
+import org.apache.mina.common.IdleStatus;
+import org.apache.mina.common.IoSessionConfig;
/**
* Base implementation of {@link IoSessionConfig}s.
Copied: directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoSessionManager.java (from r326410, directory/network/trunk/src/java/org/apache/mina/common/BaseIoSessionManager.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoSessionManager.java?p2=directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoSessionManager.java&p1=directory/network/trunk/src/java/org/apache/mina/common/BaseIoSessionManager.java&r1=326410&r2=326451&rev=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/common/BaseIoSessionManager.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/common/support/BaseIoSessionManager.java Wed Oct 19 01:07:09 2005
@@ -16,7 +16,10 @@
* limitations under the License.
*
*/
-package org.apache.mina.common;
+package org.apache.mina.common.support;
+
+import org.apache.mina.common.ExceptionMonitor;
+import org.apache.mina.common.IoSessionManager;
/**
* Base implementation of {@link IoSessionManager}s.
Copied: directory/network/trunk/src/java/org/apache/mina/common/support/ByteBufferHexDumper.java (from r326410, directory/network/trunk/src/java/org/apache/mina/common/ByteBufferHexDumper.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/common/support/ByteBufferHexDumper.java?p2=directory/network/trunk/src/java/org/apache/mina/common/support/ByteBufferHexDumper.java&p1=directory/network/trunk/src/java/org/apache/mina/common/ByteBufferHexDumper.java&r1=326410&r2=326451&rev=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/common/ByteBufferHexDumper.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/common/support/ByteBufferHexDumper.java Wed Oct 19 01:07:09 2005
@@ -16,7 +16,9 @@
* limitations under the License.
*
*/
-package org.apache.mina.common;
+package org.apache.mina.common.support;
+
+import org.apache.mina.common.ByteBuffer;
/**
@@ -25,7 +27,7 @@
* @author Trustin Lee (trustin@apache.org)
* @version $Rev$, $Date$
*/
-class ByteBufferHexDumper
+public class ByteBufferHexDumper
{
private static final byte[] highDigits;
@@ -51,7 +53,7 @@
lowDigits = low;
}
- static String getHexdump( ByteBuffer in )
+ public static String getHexdump( ByteBuffer in )
{
int size = in.remaining();
Copied: directory/network/trunk/src/java/org/apache/mina/common/support/DefaultExceptionMonitor.java (from r326410, directory/network/trunk/src/java/org/apache/mina/common/DefaultExceptionMonitor.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/common/support/DefaultExceptionMonitor.java?p2=directory/network/trunk/src/java/org/apache/mina/common/support/DefaultExceptionMonitor.java&p1=directory/network/trunk/src/java/org/apache/mina/common/DefaultExceptionMonitor.java&r1=326410&r2=326451&rev=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/common/DefaultExceptionMonitor.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/common/support/DefaultExceptionMonitor.java Wed Oct 19 01:07:09 2005
@@ -16,10 +16,13 @@
* limitations under the License.
*
*/
-package org.apache.mina.common;
+package org.apache.mina.common.support;
import java.util.logging.Level;
import java.util.logging.Logger;
+
+import org.apache.mina.common.ExceptionMonitor;
+import org.apache.mina.common.IoSessionManager;
/**
* A default {@link ExceptionMonitor} implementation that logs uncaught
Copied: directory/network/trunk/src/java/org/apache/mina/common/support/IoSessionFilterChain.java (from r326410, directory/network/trunk/src/java/org/apache/mina/common/IoSessionFilterChain.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/common/support/IoSessionFilterChain.java?p2=directory/network/trunk/src/java/org/apache/mina/common/support/IoSessionFilterChain.java&p1=directory/network/trunk/src/java/org/apache/mina/common/IoSessionFilterChain.java&r1=326410&r2=326451&rev=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/common/IoSessionFilterChain.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/common/support/IoSessionFilterChain.java Wed Oct 19 01:07:09 2005
@@ -16,8 +16,10 @@
* limitations under the License.
*
*/
-package org.apache.mina.common;
+package org.apache.mina.common.support;
+import org.apache.mina.common.IoFilterChain;
+import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoFilter.WriteRequest;
/**
Copied: directory/network/trunk/src/java/org/apache/mina/common/support/IoSessionManagerFilterChain.java (from r326410, directory/network/trunk/src/java/org/apache/mina/common/IoSessionManagerFilterChain.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/common/support/IoSessionManagerFilterChain.java?p2=directory/network/trunk/src/java/org/apache/mina/common/support/IoSessionManagerFilterChain.java&p1=directory/network/trunk/src/java/org/apache/mina/common/IoSessionManagerFilterChain.java&r1=326410&r2=326451&rev=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/common/IoSessionManagerFilterChain.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/common/support/IoSessionManagerFilterChain.java Wed Oct 19 01:07:09 2005
@@ -16,7 +16,13 @@
* limitations under the License.
*
*/
-package org.apache.mina.common;
+package org.apache.mina.common.support;
+
+import org.apache.mina.common.IdleStatus;
+import org.apache.mina.common.IoFilter;
+import org.apache.mina.common.IoFilterChain;
+import org.apache.mina.common.IoSession;
+import org.apache.mina.common.IoSessionManager;
/**
Modified: directory/network/trunk/src/java/org/apache/mina/filter/SSLFilter.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/filter/SSLFilter.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/filter/SSLFilter.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/filter/SSLFilter.java Wed Oct 19 01:07:09 2005
@@ -31,6 +31,7 @@
import org.apache.mina.common.ByteBufferProxy;
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoSession;
+import org.apache.mina.filter.support.SSLHandler;
/**
* An SSL filter that encrypts and decrypts the data exchanged in the session.
@@ -248,7 +249,7 @@
sslHandler.shutdown();
// there might be data to write out here?
- writeNetBuffer( nextFilter, session, sslHandler );
+ sslHandler.writeNetBuffer( nextFilter, session );
}
finally
{
@@ -374,7 +375,7 @@
handler.encrypt( buf.buf() );
buf.position( pos );
ByteBuffer encryptedBuffer = new EncryptedBuffer(
- copy( handler.getOutNetBuffer() ), buf );
+ SSLHandler.copy( handler.getOutNetBuffer() ), buf );
if( log.isLoggable( Level.FINEST ) )
{
@@ -416,7 +417,7 @@
}
// Write encrypted data to be written (if any)
- writeNetBuffer( nextFilter, session, handler );
+ handler.writeNetBuffer( nextFilter, session );
// handle app. data read (if any)
handleAppDataRead( nextFilter, session, handler );
@@ -432,99 +433,13 @@
if( sslHandler.getAppBuffer().hasRemaining() )
{
// forward read app data
- ByteBuffer readBuffer = copy( sslHandler.getAppBuffer() );
+ ByteBuffer readBuffer = SSLHandler.copy( sslHandler.getAppBuffer() );
if( log.isLoggable( Level.FINEST ) )
{
log.log( Level.FINEST, session + " app data read: " + readBuffer + " (" + readBuffer.getHexDump() + ')' );
}
nextFilter.messageReceived( session, readBuffer );
}
- }
-
- void writeNetBuffer( NextFilter nextFilter, IoSession session, SSLHandler sslHandler )
- throws SSLException
- {
- // Check if any net data needed to be writen
- if( !sslHandler.getOutNetBuffer().hasRemaining() )
- {
- // no; bail out
- return;
- }
-
- // write net data
-
- // set flag that we are writing encrypted data
- // (used in filterWrite() above)
- synchronized( sslHandler )
- {
- sslHandler.setWritingEncryptedData( true );
- }
-
- try
- {
- if( log.isLoggable( Level.FINEST ) )
- {
- log.log( Level.FINEST, session + " write outNetBuffer: " +
- sslHandler.getOutNetBuffer() );
- }
- ByteBuffer writeBuffer = copy( sslHandler.getOutNetBuffer() );
- if( log.isLoggable( Level.FINEST ) )
- {
- log.log( Level.FINEST, session + " session write: " + writeBuffer );
- }
- //debug("outNetBuffer (after copy): {0}", sslHandler.getOutNetBuffer());
-
- filterWrite( nextFilter, session, new WriteRequest( writeBuffer, null ) );
-
- // loop while more writes required to complete handshake
- while( sslHandler.needToCompleteInitialHandshake() )
- {
- try
- {
- sslHandler.continueHandshake( nextFilter );
- }
- catch( SSLException ssle )
- {
- SSLException newSSLE = new SSLHandshakeException(
- "Initial SSL handshake failed." );
- newSSLE.initCause( ssle );
- throw newSSLE;
- }
- if( sslHandler.getOutNetBuffer().hasRemaining() )
- {
- if( log.isLoggable( Level.FINEST ) )
- {
- log.log( Level.FINEST, session + " write outNetBuffer2: " +
- sslHandler.getOutNetBuffer() );
- }
- ByteBuffer writeBuffer2 = copy( sslHandler
- .getOutNetBuffer() );
- session.write( writeBuffer2 );
- }
- }
- }
- finally
- {
- synchronized( sslHandler )
- {
- sslHandler.setWritingEncryptedData( false );
- }
- }
- }
-
- /**
- * Creates a new Mina byte buffer that is a deep copy of the remaining bytes
- * in the given buffer (between index buf.position() and buf.limit())
- *
- * @param src the buffer to copy
- * @return the new buffer, ready to read from
- */
- private static ByteBuffer copy( java.nio.ByteBuffer src )
- {
- ByteBuffer copy = ByteBuffer.allocate( src.remaining() );
- copy.put( src );
- copy.flip();
- return copy;
}
// Utilities to mainpulate SSLHandler based on IoSession
Modified: directory/network/trunk/src/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java Wed Oct 19 01:07:09 2005
@@ -7,6 +7,8 @@
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.WriteFuture;
+import org.apache.mina.filter.codec.support.SimpleProtocolDecoderOutput;
+import org.apache.mina.filter.codec.support.SimpleProtocolEncoderOutput;
import org.apache.mina.util.Queue;
public class ProtocolCodecFilter extends IoFilterAdapter
Copied: directory/network/trunk/src/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java (from r326410, directory/network/trunk/src/java/org/apache/mina/filter/codec/SimpleProtocolDecoderOutput.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java?p2=directory/network/trunk/src/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java&p1=directory/network/trunk/src/java/org/apache/mina/filter/codec/SimpleProtocolDecoderOutput.java&r1=326410&r2=326451&rev=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/filter/codec/SimpleProtocolDecoderOutput.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java Wed Oct 19 01:07:09 2005
@@ -1,8 +1,9 @@
/**
*
*/
-package org.apache.mina.filter.codec;
+package org.apache.mina.filter.codec.support;
+import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.util.Queue;
/**
Copied: directory/network/trunk/src/java/org/apache/mina/filter/codec/support/SimpleProtocolEncoderOutput.java (from r326410, directory/network/trunk/src/java/org/apache/mina/filter/codec/SimpleProtocolEncoderOutput.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/filter/codec/support/SimpleProtocolEncoderOutput.java?p2=directory/network/trunk/src/java/org/apache/mina/filter/codec/support/SimpleProtocolEncoderOutput.java&p1=directory/network/trunk/src/java/org/apache/mina/filter/codec/SimpleProtocolEncoderOutput.java&r1=326410&r2=326451&rev=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/filter/codec/SimpleProtocolEncoderOutput.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/filter/codec/support/SimpleProtocolEncoderOutput.java Wed Oct 19 01:07:09 2005
@@ -1,10 +1,11 @@
/**
*
*/
-package org.apache.mina.filter.codec;
+package org.apache.mina.filter.codec.support;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.WriteFuture;
+import org.apache.mina.filter.codec.ProtocolEncoderOutput;
import org.apache.mina.util.Queue;
/**
Copied: directory/network/trunk/src/java/org/apache/mina/filter/support/SSLByteBufferPool.java (from r326410, directory/network/trunk/src/java/org/apache/mina/filter/SSLByteBufferPool.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/filter/support/SSLByteBufferPool.java?p2=directory/network/trunk/src/java/org/apache/mina/filter/support/SSLByteBufferPool.java&p1=directory/network/trunk/src/java/org/apache/mina/filter/SSLByteBufferPool.java&r1=326410&r2=326451&rev=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/filter/SSLByteBufferPool.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/filter/support/SSLByteBufferPool.java Wed Oct 19 01:07:09 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*
*/
-package org.apache.mina.filter;
+package org.apache.mina.filter.support;
import java.nio.ByteBuffer;
Copied: directory/network/trunk/src/java/org/apache/mina/filter/support/SSLHandler.java (from r326410, directory/network/trunk/src/java/org/apache/mina/filter/SSLHandler.java)
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/filter/support/SSLHandler.java?p2=directory/network/trunk/src/java/org/apache/mina/filter/support/SSLHandler.java&p1=directory/network/trunk/src/java/org/apache/mina/filter/SSLHandler.java&r1=326410&r2=326451&rev=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/filter/SSLHandler.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/filter/support/SSLHandler.java Wed Oct 19 01:07:09 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*
*/
-package org.apache.mina.filter;
+package org.apache.mina.filter.support;
import java.nio.ByteBuffer;
import java.util.logging.Level;
@@ -26,11 +26,13 @@
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLEngineResult;
import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.SSLSession;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoFilter.NextFilter;
import org.apache.mina.common.IoFilter.WriteRequest;
+import org.apache.mina.filter.SSLFilter;
import org.apache.mina.util.Queue;
/**
@@ -44,7 +46,7 @@
* @author Jan Andersson (janne@minq.se)
* @version $Rev$, $Date$
*/
-class SSLHandler
+public class SSLHandler
{
private static final Logger log = Logger.getLogger( SSLFilter.class.getName() );
@@ -102,7 +104,7 @@
* @param sslc
* @throws SSLException
*/
- SSLHandler( SSLFilter parent, SSLContext sslc, IoSession session ) throws SSLException
+ public SSLHandler( SSLFilter parent, SSLContext sslc, IoSession session ) throws SSLException
{
this.parent = parent;
this.session = session;
@@ -401,7 +403,7 @@
/**
* Perform any handshaking processing.
*/
- synchronized void doHandshake( NextFilter nextFilter ) throws SSLException
+ public synchronized void doHandshake( NextFilter nextFilter ) throws SSLException
{
if( log.isLoggable( Level.FINEST ) )
@@ -473,7 +475,7 @@
outNetBuffer.flip();
initialHandshakeStatus = result.getHandshakeStatus();
- parent.writeNetBuffer( nextFilter, session, this );
+ writeNetBuffer( nextFilter, session );
// return to allow data on out buffer being sent
// TODO: We might want to send more data immidiatley?
}
@@ -485,6 +487,74 @@
}
}
+ public void writeNetBuffer( NextFilter nextFilter, IoSession session ) throws SSLException
+ {
+ // Check if any net data needed to be writen
+ if( !getOutNetBuffer().hasRemaining() )
+ {
+ // no; bail out
+ return;
+ }
+
+ // write net data
+
+ // set flag that we are writing encrypted data
+ // (used in filterWrite() above)
+ synchronized( this )
+ {
+ setWritingEncryptedData( true );
+ }
+
+ try
+ {
+ if( log.isLoggable( Level.FINEST ) )
+ {
+ log.log( Level.FINEST, session + " write outNetBuffer: " + getOutNetBuffer() );
+ }
+ org.apache.mina.common.ByteBuffer writeBuffer = copy( getOutNetBuffer() );
+ if( log.isLoggable( Level.FINEST ) )
+ {
+ log.log( Level.FINEST, session + " session write: " + writeBuffer );
+ }
+ //debug("outNetBuffer (after copy): {0}", sslHandler.getOutNetBuffer());
+
+ parent.filterWrite( nextFilter, session, new WriteRequest( writeBuffer, null ) );
+
+ // loop while more writes required to complete handshake
+ while( needToCompleteInitialHandshake() )
+ {
+ try
+ {
+ continueHandshake( nextFilter );
+ }
+ catch( SSLException ssle )
+ {
+ SSLException newSSLE = new SSLHandshakeException(
+ "Initial SSL handshake failed." );
+ newSSLE.initCause( ssle );
+ throw newSSLE;
+ }
+ if( getOutNetBuffer().hasRemaining() )
+ {
+ if( log.isLoggable( Level.FINEST ) )
+ {
+ log.log( Level.FINEST, session + " write outNetBuffer2: " + getOutNetBuffer() );
+ }
+ org.apache.mina.common.ByteBuffer writeBuffer2 = copy( getOutNetBuffer() );
+ session.write( writeBuffer2 );
+ }
+ }
+ }
+ finally
+ {
+ synchronized( this )
+ {
+ setWritingEncryptedData( false );
+ }
+ }
+ }
+
+
SSLEngineResult.Status unwrap() throws SSLException
{
if( log.isLoggable( Level.FINEST ) )
@@ -675,5 +745,20 @@
this.nextFilter = nextFilter;
this.writeRequest = writeRequest;
}
+ }
+
+ /**
+ * Creates a new Mina byte buffer that is a deep copy of the remaining bytes
+ * in the given buffer (between index buf.position() and buf.limit())
+ *
+ * @param src the buffer to copy
+ * @return the new buffer, ready to read from
+ */
+ public static org.apache.mina.common.ByteBuffer copy( java.nio.ByteBuffer src )
+ {
+ org.apache.mina.common.ByteBuffer copy = org.apache.mina.common.ByteBuffer.allocate( src.remaining() );
+ copy.put( src );
+ copy.flip();
+ return copy;
}
}
Modified: directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java Wed Oct 19 01:07:09 2005
@@ -29,15 +29,15 @@
import java.util.Map;
import java.util.Set;
-import org.apache.mina.common.BaseIoAcceptorConfig;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionManagerConfig;
-import org.apache.mina.common.IoSessionManagerFilterChain;
import org.apache.mina.common.IoFilter.WriteRequest;
+import org.apache.mina.common.support.BaseIoAcceptorConfig;
+import org.apache.mina.common.support.IoSessionManagerFilterChain;
import org.apache.mina.util.ExceptionUtil;
import org.apache.mina.util.Queue;
Modified: directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramConnector.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramConnector.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramConnector.java Wed Oct 19 01:07:09 2005
@@ -27,15 +27,15 @@
import java.util.Iterator;
import java.util.Set;
-import org.apache.mina.common.BaseIoConnectorConfig;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSessionManagerConfig;
-import org.apache.mina.common.IoSessionManagerFilterChain;
import org.apache.mina.common.IoFilter.WriteRequest;
+import org.apache.mina.common.support.BaseIoConnectorConfig;
+import org.apache.mina.common.support.IoSessionManagerFilterChain;
import org.apache.mina.util.Queue;
/**
Modified: directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramSession.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramSession.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramSession.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramSession.java Wed Oct 19 01:07:09 2005
@@ -22,18 +22,18 @@
import java.nio.channels.DatagramChannel;
import java.nio.channels.SelectionKey;
-import org.apache.mina.common.BaseIoSession;
import org.apache.mina.common.CloseFuture;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.IoSessionFilterChain;
import org.apache.mina.common.IoSessionManager;
-import org.apache.mina.common.IoSessionManagerFilterChain;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.IoFilter.WriteRequest;
+import org.apache.mina.common.support.BaseIoSession;
+import org.apache.mina.common.support.IoSessionFilterChain;
+import org.apache.mina.common.support.IoSessionManagerFilterChain;
import org.apache.mina.util.Queue;
/**
Modified: directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramSessionConfig.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramSessionConfig.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramSessionConfig.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramSessionConfig.java Wed Oct 19 01:07:09 2005
@@ -21,9 +21,9 @@
import java.net.SocketException;
import java.nio.channels.DatagramChannel;
-import org.apache.mina.common.BaseIoSessionConfig;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
+import org.apache.mina.common.support.BaseIoSessionConfig;
/**
* A {@link IoSessionConfig} for datagram transport (UDP/IP).
Modified: directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramSessionManager.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramSessionManager.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramSessionManager.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramSessionManager.java Wed Oct 19 01:07:09 2005
@@ -18,7 +18,7 @@
*/
package org.apache.mina.transport.socket.nio;
-import org.apache.mina.common.BaseIoSessionManager;
+import org.apache.mina.common.support.BaseIoSessionManager;
/**
* A base class for {@link DatagramAcceptor} and {@link DatagramConnector}.
Modified: directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramSessionManagerFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramSessionManagerFilterChain.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramSessionManagerFilterChain.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/DatagramSessionManagerFilterChain.java Wed Oct 19 01:07:09 2005
@@ -2,8 +2,8 @@
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionManagerFilterChain;
import org.apache.mina.common.IoFilter.WriteRequest;
+import org.apache.mina.common.support.IoSessionManagerFilterChain;
import org.apache.mina.util.Queue;
/**
Modified: directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java Wed Oct 19 01:07:09 2005
@@ -30,13 +30,12 @@
import java.util.Map;
import java.util.Set;
-import org.apache.mina.common.BaseIoAcceptor;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionManagerConfig;
-import org.apache.mina.common.IoSessionManagerFilterChain;
+import org.apache.mina.common.support.BaseIoAcceptor;
+import org.apache.mina.common.support.IoSessionManagerFilterChain;
import org.apache.mina.util.Queue;
/**
Modified: directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketConnector.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketConnector.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketConnector.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketConnector.java Wed Oct 19 01:07:09 2005
@@ -28,15 +28,15 @@
import java.util.Iterator;
import java.util.Set;
-import org.apache.mina.common.BaseIoConnectorConfig;
-import org.apache.mina.common.BaseIoSessionManager;
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoConnectorConfig;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSessionManagerConfig;
-import org.apache.mina.common.IoSessionManagerFilterChain;
+import org.apache.mina.common.support.BaseIoConnectorConfig;
+import org.apache.mina.common.support.BaseIoSessionManager;
+import org.apache.mina.common.support.IoSessionManagerFilterChain;
import org.apache.mina.util.ExceptionUtil;
import org.apache.mina.util.Queue;
Modified: directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketSession.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketSession.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketSession.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketSession.java Wed Oct 19 01:07:09 2005
@@ -22,17 +22,17 @@
import java.nio.channels.SelectionKey;
import java.nio.channels.SocketChannel;
-import org.apache.mina.common.BaseIoSession;
import org.apache.mina.common.CloseFuture;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.IoSessionFilterChain;
-import org.apache.mina.common.IoSessionManagerFilterChain;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.IoFilter.WriteRequest;
+import org.apache.mina.common.support.BaseIoSession;
+import org.apache.mina.common.support.IoSessionFilterChain;
+import org.apache.mina.common.support.IoSessionManagerFilterChain;
import org.apache.mina.util.Queue;
/**
Modified: directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketSessionConfig.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketSessionConfig.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketSessionConfig.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketSessionConfig.java Wed Oct 19 01:07:09 2005
@@ -20,9 +20,9 @@
import java.net.SocketException;
-import org.apache.mina.common.BaseIoSessionConfig;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
+import org.apache.mina.common.support.BaseIoSessionConfig;
/**
* A {@link IoSessionConfig} for socket transport (TCP/IP).
Modified: directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketSessionManagerFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketSessionManagerFilterChain.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketSessionManagerFilterChain.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/transport/socket/nio/SocketSessionManagerFilterChain.java Wed Oct 19 01:07:09 2005
@@ -4,8 +4,8 @@
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionManager;
-import org.apache.mina.common.IoSessionManagerFilterChain;
import org.apache.mina.common.IoFilter.WriteRequest;
+import org.apache.mina.common.support.IoSessionManagerFilterChain;
import org.apache.mina.util.Queue;
/**
Modified: directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java Wed Oct 19 01:07:09 2005
@@ -8,12 +8,11 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.mina.common.BaseIoAcceptor;
-import org.apache.mina.common.BaseIoAcceptorConfig;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionManagerConfig;
+import org.apache.mina.common.support.BaseIoAcceptor;
+import org.apache.mina.common.support.BaseIoAcceptorConfig;
/**
* Binds the specified {@link IoHandler} to the specified
Modified: directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java Wed Oct 19 01:07:09 2005
@@ -6,13 +6,13 @@
import java.io.IOException;
import java.net.SocketAddress;
-import org.apache.mina.common.BaseIoConnectorConfig;
-import org.apache.mina.common.BaseIoSessionManager;
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSessionManagerConfig;
+import org.apache.mina.common.support.BaseIoConnectorConfig;
+import org.apache.mina.common.support.BaseIoSessionManager;
import org.apache.mina.transport.vmpipe.VmPipeAcceptor.Entry;
import org.apache.mina.util.AnonymousSocketAddress;
Modified: directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeSession.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeSession.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeSession.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeSession.java Wed Oct 19 01:07:09 2005
@@ -6,16 +6,16 @@
import java.io.IOException;
import java.net.SocketAddress;
-import org.apache.mina.common.BaseIoSession;
import org.apache.mina.common.CloseFuture;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.IoSessionFilterChain;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.IoFilter.WriteRequest;
+import org.apache.mina.common.support.BaseIoSession;
+import org.apache.mina.common.support.IoSessionFilterChain;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolEncoder;
import org.apache.mina.transport.vmpipe.VmPipeAcceptor.Entry;
Modified: directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeSessionConfig.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeSessionConfig.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeSessionConfig.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeSessionConfig.java Wed Oct 19 01:07:09 2005
@@ -3,8 +3,8 @@
*/
package org.apache.mina.transport.vmpipe;
-import org.apache.mina.common.BaseIoSessionConfig;
import org.apache.mina.common.IoSessionConfig;
+import org.apache.mina.common.support.BaseIoSessionConfig;
/**
* A {@link IoSessionConfig} for in-VM pipe transport.
Modified: directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeSessionManagerFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeSessionManagerFilterChain.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeSessionManagerFilterChain.java (original)
+++ directory/network/trunk/src/java/org/apache/mina/transport/vmpipe/VmPipeSessionManagerFilterChain.java Wed Oct 19 01:07:09 2005
@@ -2,8 +2,8 @@
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionManager;
-import org.apache.mina.common.IoSessionManagerFilterChain;
import org.apache.mina.common.IoFilter.WriteRequest;
+import org.apache.mina.common.support.IoSessionManagerFilterChain;
class VmPipeSessionManagerFilterChain extends IoSessionManagerFilterChain {
Modified: directory/network/trunk/src/test/org/apache/mina/common/FutureTest.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/test/org/apache/mina/common/FutureTest.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/test/org/apache/mina/common/FutureTest.java (original)
+++ directory/network/trunk/src/test/org/apache/mina/common/FutureTest.java Wed Oct 19 01:07:09 2005
@@ -23,6 +23,8 @@
import junit.framework.TestCase;
+import org.apache.mina.common.support.BaseIoSession;
+
/**
* Tests {@link IoFuture}s.
*
Modified: directory/network/trunk/src/test/org/apache/mina/common/IoFilterChainTest.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/test/org/apache/mina/common/IoFilterChainTest.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/test/org/apache/mina/common/IoFilterChainTest.java (original)
+++ directory/network/trunk/src/test/org/apache/mina/common/IoFilterChainTest.java Wed Oct 19 01:07:09 2005
@@ -24,6 +24,8 @@
import junit.framework.TestCase;
import org.apache.mina.common.IoFilter.WriteRequest;
+import org.apache.mina.common.support.AbstractIoFilterChain;
+import org.apache.mina.common.support.BaseIoSession;
/**
* Tests {@link AbstractIoFilterChain}.
Modified: directory/network/trunk/src/test/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/test/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/test/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java (original)
+++ directory/network/trunk/src/test/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java Wed Oct 19 01:07:09 2005
@@ -5,7 +5,6 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.BaseIoSession;
import org.apache.mina.common.CloseFuture;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoFilterChain;
@@ -16,6 +15,7 @@
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.IoFilter.NextFilter;
import org.apache.mina.common.IoFilter.WriteRequest;
+import org.apache.mina.common.support.BaseIoSession;
public class ThreadPoolFilterRegressionTest extends TestCase
{
Modified: directory/network/trunk/src/test/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/test/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java?rev=326451&r1=326450&r2=326451&view=diff
==============================================================================
--- directory/network/trunk/src/test/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java (original)
+++ directory/network/trunk/src/test/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java Wed Oct 19 01:07:09 2005
@@ -25,7 +25,6 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.BaseIoSession;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.CloseFuture;
import org.apache.mina.common.IoFilterChain;
@@ -34,6 +33,7 @@
import org.apache.mina.common.IoSessionConfig;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.WriteFuture;
+import org.apache.mina.common.support.BaseIoSession;
/**
* Tests {@link CumulativeProtocolDecoder}.