You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/08/14 11:17:51 UTC
svn commit: r565669 [1/2] - in /mina/trunk:
core/src/main/java/org/apache/mina/common/
core/src/main/java/org/apache/mina/common/support/
core/src/main/java/org/apache/mina/filter/codec/
core/src/main/java/org/apache/mina/filter/codec/support/ core/src...
Author: trustin
Date: Tue Aug 14 02:17:37 2007
New Revision: 565669
URL: http://svn.apache.org/viewvc?view=rev&rev=565669
Log:
Removing cyclic dependencies...
Added:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoFilterChain.java
- copied, changed from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java
mina/trunk/core/src/main/java/org/apache/mina/common/BaseByteBuffer.java
- copied, changed from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseByteBuffer.java
mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoAcceptor.java
- copied, changed from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoConnector.java
- copied, changed from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoConnector.java
mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoService.java
- copied, changed from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java
mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoSession.java
- copied, changed from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java
mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoSessionConfig.java
- copied, changed from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/common/ByteBufferHexDumper.java
- copied, changed from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/ByteBufferHexDumper.java
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultCloseFuture.java
- copied, changed from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultCloseFuture.java
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultConnectFuture.java
- copied, changed from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultConnectFuture.java
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultExceptionMonitor.java
- copied, changed from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultExceptionMonitor.java
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultFileRegion.java
- copied, changed from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultFileRegion.java
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFuture.java
- copied, changed from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultIoFuture.java
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultTransportType.java
- copied, changed from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultTransportType.java
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultWriteFuture.java
- copied, changed from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultWriteFuture.java
mina/trunk/core/src/main/java/org/apache/mina/common/DelegatedIoAcceptor.java
- copied, changed from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/common/DelegatedIoConnector.java
- copied, changed from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoConnector.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoServiceListenerSupport.java
- copied, changed from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/IoServiceListenerSupport.java
mina/trunk/core/src/main/java/org/apache/mina/common/SessionIdleStatusChecker.java
- copied, changed from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/SessionIdleStatusChecker.java
mina/trunk/core/src/main/java/org/apache/mina/common/SessionLog.java
- copied, changed from r565666, mina/trunk/core/src/main/java/org/apache/mina/util/SessionLog.java
Removed:
mina/trunk/core/src/main/java/org/apache/mina/common/support/
mina/trunk/core/src/main/java/org/apache/mina/util/SessionLog.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/ByteBuffer.java
mina/trunk/core/src/main/java/org/apache/mina/common/ExceptionMonitor.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoHandlerAdapter.java
mina/trunk/core/src/main/java/org/apache/mina/common/SimpleByteBufferAllocator.java
mina/trunk/core/src/main/java/org/apache/mina/common/TransportType.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java
mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/reqres/RequestResponseFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java
mina/trunk/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultDatagramSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultSocketSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketFilterChain.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramFilterChain.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/DefaultVmPipeSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipe.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java
mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java
mina/trunk/core/src/test/java/org/apache/mina/common/support/FutureTest.java
mina/trunk/core/src/test/java/org/apache/mina/common/support/IoServiceListenerSupportTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/reqres/RequestResponseFilterTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java
mina/trunk/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java
mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/ServerHandler.java
mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java
mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java
mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java
mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoSessionManager.java
mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/DefaultSerialSessionConfig.java
mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java
mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialFilterChain.java
mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoFilterChain.java (from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoFilterChain.java?view=diff&rev=565669&p1=mina/trunk/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoFilterChain.java&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/AbstractIoFilterChain.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoFilterChain.java Tue Aug 14 02:17:37 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.support;
+package org.apache.mina.common;
import java.util.ArrayList;
import java.util.HashMap;
@@ -25,16 +25,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoFilter;
-import org.apache.mina.common.IoFilterAdapter;
-import org.apache.mina.common.IoFilterChain;
-import org.apache.mina.common.IoFilterLifeCycleException;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.IoFilter.NextFilter;
-import org.apache.mina.util.SessionLog;
/**
* An abstract implementation of {@link IoFilterChain} that provides
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/BaseByteBuffer.java (from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseByteBuffer.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/BaseByteBuffer.java?view=diff&rev=565669&p1=mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseByteBuffer.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/BaseByteBuffer.java&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseByteBuffer.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/BaseByteBuffer.java Tue Aug 14 02:17:37 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.support;
+package org.apache.mina.common;
import java.nio.ByteOrder;
import java.nio.CharBuffer;
@@ -27,8 +27,6 @@
import java.nio.LongBuffer;
import java.nio.ShortBuffer;
-import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.ByteBufferAllocator;
/**
* A base implementation of {@link ByteBuffer}. This implementation
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoAcceptor.java (from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoAcceptor.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoAcceptor.java?view=diff&rev=565669&p1=mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoAcceptor.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoAcceptor.java&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoAcceptor.java Tue Aug 14 02:17:37 2007
@@ -17,13 +17,11 @@
* under the License.
*
*/
-package org.apache.mina.common.support;
+package org.apache.mina.common;
import java.io.IOException;
import java.net.SocketAddress;
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoSessionConfig;
/**
* A base implementation of {@link IoAcceptor}.
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoConnector.java (from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoConnector.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoConnector.java?view=diff&rev=565669&p1=mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoConnector.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoConnector.java&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoConnector.java Tue Aug 14 02:17:37 2007
@@ -17,13 +17,10 @@
* under the License.
*
*/
-package org.apache.mina.common.support;
+package org.apache.mina.common;
import java.net.SocketAddress;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoSessionConfig;
/**
* A base implementation of {@link IoConnector}.
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoService.java (from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoService.java?view=diff&rev=565669&p1=mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoService.java&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoService.java Tue Aug 14 02:17:37 2007
@@ -17,17 +17,10 @@
* under the License.
*
*/
-package org.apache.mina.common.support;
+package org.apache.mina.common;
import java.util.Set;
-import org.apache.mina.common.DefaultIoFilterChainBuilder;
-import org.apache.mina.common.IoFilterChainBuilder;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoService;
-import org.apache.mina.common.IoServiceListener;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionConfig;
/**
* Base implementation of {@link IoService}s.
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoSession.java (from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoSession.java?view=diff&rev=565669&p1=mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoSession.java&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoSession.java Tue Aug 14 02:17:37 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.support;
+package org.apache.mina.common;
import java.io.File;
import java.io.FileInputStream;
@@ -30,19 +30,6 @@
import java.util.Map;
import java.util.Set;
-import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.CloseFuture;
-import org.apache.mina.common.DefaultWriteRequest;
-import org.apache.mina.common.ExceptionMonitor;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoFuture;
-import org.apache.mina.common.IoFutureListener;
-import org.apache.mina.common.IoService;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.TrafficMask;
-import org.apache.mina.common.WriteFuture;
-import org.apache.mina.common.WriteRequest;
/**
* Base implementation of {@link IoSession}.
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoSessionConfig.java (from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoSessionConfig.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoSessionConfig.java?view=diff&rev=565669&p1=mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoSessionConfig.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoSessionConfig.java&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoSessionConfig.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoSessionConfig.java Tue Aug 14 02:17:37 2007
@@ -17,9 +17,8 @@
* under the License.
*
*/
-package org.apache.mina.common.support;
+package org.apache.mina.common;
-import org.apache.mina.common.IoSessionConfig;
/**
* A base implementation of {@link IoSessionConfig}.
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/ByteBuffer.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/ByteBuffer.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/ByteBuffer.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/ByteBuffer.java Tue Aug 14 02:17:37 2007
@@ -42,7 +42,6 @@
import java.util.EnumSet;
import java.util.Set;
-import org.apache.mina.common.support.ByteBufferHexDumper;
/**
* A byte buffer used by MINA applications.
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/ByteBufferHexDumper.java (from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/ByteBufferHexDumper.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/ByteBufferHexDumper.java?view=diff&rev=565669&p1=mina/trunk/core/src/main/java/org/apache/mina/common/support/ByteBufferHexDumper.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/ByteBufferHexDumper.java&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/ByteBufferHexDumper.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/ByteBufferHexDumper.java Tue Aug 14 02:17:37 2007
@@ -17,9 +17,8 @@
* under the License.
*
*/
-package org.apache.mina.common.support;
+package org.apache.mina.common;
-import org.apache.mina.common.ByteBuffer;
/**
* Provides utility methods for ByteBuffers.
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/DefaultCloseFuture.java (from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultCloseFuture.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DefaultCloseFuture.java?view=diff&rev=565669&p1=mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultCloseFuture.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/DefaultCloseFuture.java&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultCloseFuture.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/DefaultCloseFuture.java Tue Aug 14 02:17:37 2007
@@ -17,11 +17,8 @@
* under the License.
*
*/
-package org.apache.mina.common.support;
+package org.apache.mina.common;
-import org.apache.mina.common.CloseFuture;
-import org.apache.mina.common.IoFutureListener;
-import org.apache.mina.common.IoSession;
/**
* A default implementation of {@link CloseFuture}.
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/DefaultConnectFuture.java (from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultConnectFuture.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DefaultConnectFuture.java?view=diff&rev=565669&p1=mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultConnectFuture.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/DefaultConnectFuture.java&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultConnectFuture.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/DefaultConnectFuture.java Tue Aug 14 02:17:37 2007
@@ -17,12 +17,8 @@
* under the License.
*
*/
-package org.apache.mina.common.support;
+package org.apache.mina.common;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoFutureListener;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.RuntimeIOException;
/**
* A default implementation of {@link ConnectFuture}.
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/DefaultExceptionMonitor.java (from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultExceptionMonitor.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DefaultExceptionMonitor.java?view=diff&rev=565669&p1=mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultExceptionMonitor.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/DefaultExceptionMonitor.java&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultExceptionMonitor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/DefaultExceptionMonitor.java Tue Aug 14 02:17:37 2007
@@ -17,10 +17,8 @@
* under the License.
*
*/
-package org.apache.mina.common.support;
+package org.apache.mina.common;
-import org.apache.mina.common.ExceptionMonitor;
-import org.apache.mina.common.IoService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/DefaultFileRegion.java (from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultFileRegion.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DefaultFileRegion.java?view=diff&rev=565669&p1=mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultFileRegion.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/DefaultFileRegion.java&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultFileRegion.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/DefaultFileRegion.java Tue Aug 14 02:17:37 2007
@@ -1,8 +1,7 @@
-package org.apache.mina.common.support;
+package org.apache.mina.common;
import java.nio.channels.FileChannel;
-import org.apache.mina.common.FileRegion;
public class DefaultFileRegion implements FileRegion {
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFuture.java (from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultIoFuture.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFuture.java?view=diff&rev=565669&p1=mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultIoFuture.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFuture.java&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultIoFuture.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFuture.java Tue Aug 14 02:17:37 2007
@@ -17,16 +17,12 @@
* under the License.
*
*/
-package org.apache.mina.common.support;
+package org.apache.mina.common;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import org.apache.mina.common.ExceptionMonitor;
-import org.apache.mina.common.IoFuture;
-import org.apache.mina.common.IoFutureListener;
-import org.apache.mina.common.IoSession;
/**
* A default implementation of {@link IoFuture}.
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/DefaultTransportType.java (from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultTransportType.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DefaultTransportType.java?view=diff&rev=565669&p1=mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultTransportType.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/DefaultTransportType.java&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultTransportType.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/DefaultTransportType.java Tue Aug 14 02:17:37 2007
@@ -17,12 +17,10 @@
* under the License.
*
*/
-package org.apache.mina.common.support;
+package org.apache.mina.common;
import java.net.SocketAddress;
-import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.TransportType;
/**
* A default immutable implementation of {@link TransportType}.
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/DefaultWriteFuture.java (from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultWriteFuture.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DefaultWriteFuture.java?view=diff&rev=565669&p1=mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultWriteFuture.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/DefaultWriteFuture.java&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/DefaultWriteFuture.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/DefaultWriteFuture.java Tue Aug 14 02:17:37 2007
@@ -17,11 +17,8 @@
* under the License.
*
*/
-package org.apache.mina.common.support;
+package org.apache.mina.common;
-import org.apache.mina.common.IoFutureListener;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.WriteFuture;
/**
* A default implementation of {@link WriteFuture}.
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/DelegatedIoAcceptor.java (from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoAcceptor.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DelegatedIoAcceptor.java?view=diff&rev=565669&p1=mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoAcceptor.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/DelegatedIoAcceptor.java&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/DelegatedIoAcceptor.java Tue Aug 14 02:17:37 2007
@@ -17,20 +17,12 @@
* under the License.
*
*/
-package org.apache.mina.common.support;
+package org.apache.mina.common;
import java.io.IOException;
import java.net.SocketAddress;
import java.util.Set;
-import org.apache.mina.common.DefaultIoFilterChainBuilder;
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoFilterChainBuilder;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoServiceListener;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.TransportType;
/**
* A delegated {@link IoAcceptor} that wraps the other {@link IoAcceptor}.
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/DelegatedIoConnector.java (from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoConnector.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DelegatedIoConnector.java?view=diff&rev=565669&p1=mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoConnector.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/DelegatedIoConnector.java&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/DelegatedIoConnector.java Tue Aug 14 02:17:37 2007
@@ -17,20 +17,11 @@
* under the License.
*
*/
-package org.apache.mina.common.support;
+package org.apache.mina.common;
import java.net.SocketAddress;
import java.util.Set;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.DefaultIoFilterChainBuilder;
-import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoFilterChainBuilder;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoServiceListener;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.TransportType;
/**
* A delegated {@link IoConnector} that wraps the other {@link IoConnector}.
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/ExceptionMonitor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/ExceptionMonitor.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/ExceptionMonitor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/ExceptionMonitor.java Tue Aug 14 02:17:37 2007
@@ -19,7 +19,6 @@
*/
package org.apache.mina.common;
-import org.apache.mina.common.support.DefaultExceptionMonitor;
/**
* Monitors uncaught exceptions. {@link #exceptionCaught(Throwable)} is
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/IoHandlerAdapter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoHandlerAdapter.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoHandlerAdapter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoHandlerAdapter.java Tue Aug 14 02:17:37 2007
@@ -19,7 +19,6 @@
*/
package org.apache.mina.common;
-import org.apache.mina.util.SessionLog;
/**
* An abstract adapter class for {@link IoHandler}. You can extend this
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/IoServiceListenerSupport.java (from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/IoServiceListenerSupport.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoServiceListenerSupport.java?view=diff&rev=565669&p1=mina/trunk/core/src/main/java/org/apache/mina/common/support/IoServiceListenerSupport.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/IoServiceListenerSupport.java&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/IoServiceListenerSupport.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoServiceListenerSupport.java Tue Aug 14 02:17:37 2007
@@ -17,19 +17,12 @@
* under the License.
*
*/
-package org.apache.mina.common.support;
+package org.apache.mina.common;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoFuture;
-import org.apache.mina.common.IoFutureListener;
-import org.apache.mina.common.IoService;
-import org.apache.mina.common.IoServiceListener;
-import org.apache.mina.common.IoSession;
import org.apache.mina.util.IdentityHashSet;
/**
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/SessionIdleStatusChecker.java (from r565666, mina/trunk/core/src/main/java/org/apache/mina/common/support/SessionIdleStatusChecker.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/SessionIdleStatusChecker.java?view=diff&rev=565669&p1=mina/trunk/core/src/main/java/org/apache/mina/common/support/SessionIdleStatusChecker.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/SessionIdleStatusChecker.java&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/support/SessionIdleStatusChecker.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/SessionIdleStatusChecker.java Tue Aug 14 02:17:37 2007
@@ -17,12 +17,11 @@
* under the License.
*
*/
-package org.apache.mina.common.support;
+package org.apache.mina.common;
import java.util.Iterator;
import java.util.Set;
-import org.apache.mina.common.IdleStatus;
import org.apache.mina.util.IdentityHashSet;
/**
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/SessionLog.java (from r565666, mina/trunk/core/src/main/java/org/apache/mina/util/SessionLog.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/SessionLog.java?view=diff&rev=565669&p1=mina/trunk/core/src/main/java/org/apache/mina/util/SessionLog.java&r1=565666&p2=mina/trunk/core/src/main/java/org/apache/mina/common/SessionLog.java&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/util/SessionLog.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/SessionLog.java Tue Aug 14 02:17:37 2007
@@ -17,9 +17,8 @@
* under the License.
*
*/
-package org.apache.mina.util;
+package org.apache.mina.common;
-import org.apache.mina.common.IoSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/SimpleByteBufferAllocator.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/SimpleByteBufferAllocator.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/SimpleByteBufferAllocator.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/SimpleByteBufferAllocator.java Tue Aug 14 02:17:37 2007
@@ -21,7 +21,6 @@
import java.nio.ByteOrder;
-import org.apache.mina.common.support.BaseByteBuffer;
/**
* A simplistic {@link ByteBufferAllocator} which simply allocates a new
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/TransportType.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/TransportType.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/TransportType.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/TransportType.java Tue Aug 14 02:17:37 2007
@@ -22,7 +22,6 @@
import java.net.InetSocketAddress;
import java.net.SocketAddress;
-import org.apache.mina.common.support.DefaultTransportType;
import org.apache.mina.transport.socket.nio.DatagramSessionConfig;
import org.apache.mina.transport.socket.nio.SocketSessionConfig;
import org.apache.mina.transport.vmpipe.VmPipeAddress;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java Tue Aug 14 02:17:37 2007
@@ -22,18 +22,18 @@
import java.net.SocketAddress;
import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.DefaultWriteFuture;
import org.apache.mina.common.DefaultWriteRequest;
import org.apache.mina.common.IoFilter;
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoSession;
+import org.apache.mina.common.SessionLog;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.WriteRequestWrapper;
-import org.apache.mina.common.support.DefaultWriteFuture;
import org.apache.mina.filter.codec.support.SimpleProtocolDecoderOutput;
import org.apache.mina.filter.codec.support.SimpleProtocolEncoderOutput;
-import org.apache.mina.util.SessionLog;
/**
* An {@link IoFilter} which translates binary or protocol specific data into
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java Tue Aug 14 02:17:37 2007
@@ -22,9 +22,9 @@
import java.util.LinkedList;
import java.util.Queue;
+import org.apache.mina.common.BaseIoSession;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoFilter.NextFilter;
-import org.apache.mina.common.support.BaseIoSession;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java Tue Aug 14 02:17:37 2007
@@ -30,8 +30,8 @@
import org.apache.mina.common.IoFilter;
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoSession;
+import org.apache.mina.common.SessionLog;
import org.apache.mina.common.WriteRequest;
-import org.apache.mina.util.SessionLog;
/**
* A {@link IoFilter} which blocks connections from blacklisted remote
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java Tue Aug 14 02:17:37 2007
@@ -28,7 +28,7 @@
import org.apache.mina.common.IoFilter;
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.util.SessionLog;
+import org.apache.mina.common.SessionLog;
/**
* A {@link IoFilter} which blocks connections from connecting
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java Tue Aug 14 02:17:37 2007
@@ -27,8 +27,8 @@
import org.apache.mina.common.IoEventType;
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoSession;
+import org.apache.mina.common.SessionLog;
import org.apache.mina.common.WriteRequest;
-import org.apache.mina.util.SessionLog;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/reqres/RequestResponseFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/reqres/RequestResponseFilter.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/reqres/RequestResponseFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/reqres/RequestResponseFilter.java Tue Aug 14 02:17:37 2007
@@ -33,9 +33,9 @@
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoSession;
+import org.apache.mina.common.SessionLog;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.WriteRequestWrapper;
-import org.apache.mina.util.SessionLog;
/**
*
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLFilter.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLFilter.java Tue Aug 14 02:17:37 2007
@@ -28,17 +28,17 @@
import javax.net.ssl.SSLSession;
import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.DefaultWriteFuture;
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoFuture;
import org.apache.mina.common.IoFutureListener;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
+import org.apache.mina.common.SessionLog;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.WriteRequestWrapper;
-import org.apache.mina.common.support.DefaultWriteFuture;
-import org.apache.mina.util.SessionLog;
/**
* An SSL filter that encrypts and decrypts the data exchanged in the session.
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java Tue Aug 14 02:17:37 2007
@@ -32,15 +32,15 @@
import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.SSLSession;
+import org.apache.mina.common.DefaultWriteFuture;
import org.apache.mina.common.DefaultWriteRequest;
import org.apache.mina.common.IoEventType;
import org.apache.mina.common.IoFilterEvent;
import org.apache.mina.common.IoSession;
+import org.apache.mina.common.SessionLog;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.IoFilter.NextFilter;
-import org.apache.mina.common.support.DefaultWriteFuture;
-import org.apache.mina.util.SessionLog;
/**
* A helper class using the SSLEngine API to decrypt/encrypt data.
Modified: mina/trunk/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java Tue Aug 14 02:17:37 2007
@@ -29,7 +29,7 @@
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.util.SessionLog;
+import org.apache.mina.common.SessionLog;
/**
* A {@link IoHandler} that adapts asynchronous MINA events to stream I/O.
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java Tue Aug 14 02:17:37 2007
@@ -23,9 +23,9 @@
import java.net.SocketAddress;
import java.util.concurrent.Executor;
+import org.apache.mina.common.DelegatedIoAcceptor;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoSessionRecycler;
-import org.apache.mina.common.support.DelegatedIoAcceptor;
import org.apache.mina.transport.socket.nio.support.DatagramAcceptorDelegate;
import org.apache.mina.util.NewThreadExecutor;
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java Tue Aug 14 02:17:37 2007
@@ -21,8 +21,8 @@
import java.util.concurrent.Executor;
+import org.apache.mina.common.DelegatedIoConnector;
import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.support.DelegatedIoConnector;
import org.apache.mina.transport.socket.nio.support.DatagramConnectorDelegate;
import org.apache.mina.util.NewThreadExecutor;
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultDatagramSessionConfig.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultDatagramSessionConfig.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultDatagramSessionConfig.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultDatagramSessionConfig.java Tue Aug 14 02:17:37 2007
@@ -22,8 +22,8 @@
import java.net.DatagramSocket;
import java.net.SocketException;
+import org.apache.mina.common.BaseIoSessionConfig;
import org.apache.mina.common.ExceptionMonitor;
-import org.apache.mina.common.support.BaseIoSessionConfig;
/**
* A default implementation of {@link DatagramSessionConfig}.
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultSocketSessionConfig.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultSocketSessionConfig.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultSocketSessionConfig.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultSocketSessionConfig.java Tue Aug 14 02:17:37 2007
@@ -30,8 +30,8 @@
import java.util.Map;
import java.util.Map.Entry;
+import org.apache.mina.common.BaseIoSessionConfig;
import org.apache.mina.common.ExceptionMonitor;
-import org.apache.mina.common.support.BaseIoSessionConfig;
/**
* A default implementation of {@link SocketSessionConfig}.
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java Tue Aug 14 02:17:37 2007
@@ -33,13 +33,13 @@
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor;
+import org.apache.mina.common.BaseIoAcceptor;
import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.IoAcceptor;
+import org.apache.mina.common.IoServiceListenerSupport;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.RuntimeIOException;
import org.apache.mina.common.TransportType;
-import org.apache.mina.common.support.BaseIoAcceptor;
-import org.apache.mina.common.support.IoServiceListenerSupport;
import org.apache.mina.util.NamePreservingRunnable;
import org.apache.mina.util.NewThreadExecutor;
@@ -174,7 +174,7 @@
}
/**
- * @see org.apache.mina.common.support.BaseIoService#getSessionConfig()
+ * @see org.apache.mina.common.BaseIoService#getSessionConfig()
*/
@Override
public SocketSessionConfig getSessionConfig() {
@@ -182,7 +182,7 @@
}
/**
- * @see org.apache.mina.common.support.BaseIoAcceptor#getLocalAddress()
+ * @see org.apache.mina.common.BaseIoAcceptor#getLocalAddress()
*/
@Override
public InetSocketAddress getLocalAddress() {
@@ -193,7 +193,7 @@
// bean property access mechanism.
/**
- * @see org.apache.mina.common.support.BaseIoAcceptor#setLocalAddress(java.net.SocketAddress)
+ * @see org.apache.mina.common.BaseIoAcceptor#setLocalAddress(java.net.SocketAddress)
*/
@Override
public void setLocalAddress(SocketAddress localAddress) {
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java Tue Aug 14 02:17:37 2007
@@ -31,15 +31,15 @@
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor;
+import org.apache.mina.common.AbstractIoFilterChain;
+import org.apache.mina.common.BaseIoConnector;
import org.apache.mina.common.ConnectFuture;
+import org.apache.mina.common.DefaultConnectFuture;
import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.IoConnector;
+import org.apache.mina.common.IoServiceListenerSupport;
import org.apache.mina.common.RuntimeIOException;
import org.apache.mina.common.TransportType;
-import org.apache.mina.common.support.AbstractIoFilterChain;
-import org.apache.mina.common.support.BaseIoConnector;
-import org.apache.mina.common.support.DefaultConnectFuture;
-import org.apache.mina.common.support.IoServiceListenerSupport;
import org.apache.mina.util.NamePreservingRunnable;
import org.apache.mina.util.NewThreadExecutor;
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketFilterChain.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketFilterChain.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketFilterChain.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketFilterChain.java Tue Aug 14 02:17:37 2007
@@ -21,10 +21,10 @@
import java.io.IOException;
+import org.apache.mina.common.AbstractIoFilterChain;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.WriteRequest;
-import org.apache.mina.common.support.AbstractIoFilterChain;
/**
* An {@link IoFilterChain} for socket transport (TCP/IP).
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java Tue Aug 14 02:17:37 2007
@@ -33,12 +33,12 @@
import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoService;
+import org.apache.mina.common.IoServiceListenerSupport;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.RuntimeIOException;
import org.apache.mina.common.FileRegion;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.WriteTimeoutException;
-import org.apache.mina.common.support.IoServiceListenerSupport;
import org.apache.mina.util.NamePreservingRunnable;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java Tue Aug 14 02:17:37 2007
@@ -26,6 +26,8 @@
import java.util.LinkedList;
import java.util.Queue;
+import org.apache.mina.common.BaseIoSession;
+import org.apache.mina.common.BaseIoSessionConfig;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
@@ -35,8 +37,6 @@
import org.apache.mina.common.RuntimeIOException;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.WriteRequest;
-import org.apache.mina.common.support.BaseIoSession;
-import org.apache.mina.common.support.BaseIoSessionConfig;
/**
* An {@link IoSession} for socket transport (TCP/IP).
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java Tue Aug 14 02:17:37 2007
@@ -31,17 +31,17 @@
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor;
+import org.apache.mina.common.BaseIoAcceptor;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.ExpiringSessionRecycler;
import org.apache.mina.common.IoAcceptor;
+import org.apache.mina.common.IoServiceListenerSupport;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionRecycler;
import org.apache.mina.common.RuntimeIOException;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.WriteRequest;
-import org.apache.mina.common.support.BaseIoAcceptor;
-import org.apache.mina.common.support.IoServiceListenerSupport;
import org.apache.mina.transport.socket.nio.DatagramSessionConfig;
import org.apache.mina.transport.socket.nio.DefaultDatagramSessionConfig;
import org.apache.mina.util.NamePreservingRunnable;
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java Tue Aug 14 02:17:37 2007
@@ -30,17 +30,17 @@
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor;
+import org.apache.mina.common.AbstractIoFilterChain;
+import org.apache.mina.common.BaseIoConnector;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.ConnectFuture;
+import org.apache.mina.common.DefaultConnectFuture;
import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.RuntimeIOException;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.WriteRequest;
-import org.apache.mina.common.support.AbstractIoFilterChain;
-import org.apache.mina.common.support.BaseIoConnector;
-import org.apache.mina.common.support.DefaultConnectFuture;
import org.apache.mina.transport.socket.nio.DatagramSessionConfig;
import org.apache.mina.transport.socket.nio.DefaultDatagramSessionConfig;
import org.apache.mina.util.NamePreservingRunnable;
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramFilterChain.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramFilterChain.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramFilterChain.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramFilterChain.java Tue Aug 14 02:17:37 2007
@@ -21,11 +21,11 @@
import java.util.Queue;
+import org.apache.mina.common.AbstractIoFilterChain;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.WriteRequest;
-import org.apache.mina.common.support.AbstractIoFilterChain;
/**
* An {@link IoFilterChain} for datagram transport (UDP/IP).
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java Tue Aug 14 02:17:37 2007
@@ -27,6 +27,7 @@
import java.util.LinkedList;
import java.util.Queue;
+import org.apache.mina.common.BaseIoSession;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoConnector;
@@ -39,7 +40,6 @@
import org.apache.mina.common.TransportType;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.WriteRequest;
-import org.apache.mina.common.support.BaseIoSession;
import org.apache.mina.transport.socket.nio.DatagramSession;
import org.apache.mina.transport.socket.nio.DatagramSessionConfig;
import org.apache.mina.transport.socket.nio.DefaultDatagramSessionConfig;
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/DefaultVmPipeSessionConfig.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/DefaultVmPipeSessionConfig.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/DefaultVmPipeSessionConfig.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/DefaultVmPipeSessionConfig.java Tue Aug 14 02:17:37 2007
@@ -19,7 +19,7 @@
*/
package org.apache.mina.transport.vmpipe;
-import org.apache.mina.common.support.BaseIoSessionConfig;
+import org.apache.mina.common.BaseIoSessionConfig;
/**
* A default implementation of {@link VmPipeSessionConfig}.
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java Tue Aug 14 02:17:37 2007
@@ -24,10 +24,10 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.mina.common.BaseIoAcceptor;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.TransportType;
-import org.apache.mina.common.support.BaseIoAcceptor;
import org.apache.mina.transport.vmpipe.support.VmPipe;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java Tue Aug 14 02:17:37 2007
@@ -24,17 +24,17 @@
import java.util.HashSet;
import java.util.Set;
+import org.apache.mina.common.AbstractIoFilterChain;
+import org.apache.mina.common.BaseIoConnector;
import org.apache.mina.common.ConnectFuture;
+import org.apache.mina.common.DefaultConnectFuture;
import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoFuture;
import org.apache.mina.common.IoFutureListener;
import org.apache.mina.common.IoHandler;
+import org.apache.mina.common.SessionIdleStatusChecker;
import org.apache.mina.common.TransportType;
-import org.apache.mina.common.support.AbstractIoFilterChain;
-import org.apache.mina.common.support.BaseIoConnector;
-import org.apache.mina.common.support.DefaultConnectFuture;
-import org.apache.mina.common.support.SessionIdleStatusChecker;
import org.apache.mina.transport.vmpipe.support.VmPipe;
import org.apache.mina.transport.vmpipe.support.VmPipeFilterChain;
import org.apache.mina.transport.vmpipe.support.VmPipeSessionImpl;
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipe.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipe.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipe.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipe.java Tue Aug 14 02:17:37 2007
@@ -20,7 +20,7 @@
package org.apache.mina.transport.vmpipe.support;
import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.support.IoServiceListenerSupport;
+import org.apache.mina.common.IoServiceListenerSupport;
import org.apache.mina.transport.vmpipe.VmPipeAcceptor;
import org.apache.mina.transport.vmpipe.VmPipeAddress;
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeFilterChain.java Tue Aug 14 02:17:37 2007
@@ -22,11 +22,11 @@
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
+import org.apache.mina.common.AbstractIoFilterChain;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.WriteRequest;
-import org.apache.mina.common.support.AbstractIoFilterChain;
/**
* @author The Apache Directory Project (mina-dev@directory.apache.org)
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java Tue Aug 14 02:17:37 2007
@@ -24,14 +24,14 @@
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
+import org.apache.mina.common.BaseIoSession;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoService;
+import org.apache.mina.common.IoServiceListenerSupport;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.WriteRequest;
-import org.apache.mina.common.support.BaseIoSession;
-import org.apache.mina.common.support.IoServiceListenerSupport;
import org.apache.mina.transport.vmpipe.DefaultVmPipeSessionConfig;
import org.apache.mina.transport.vmpipe.VmPipeAddress;
import org.apache.mina.transport.vmpipe.VmPipeSession;
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java Tue Aug 14 02:17:37 2007
@@ -25,8 +25,6 @@
import junit.framework.TestCase;
import org.apache.mina.common.IoFilterChain.Entry;
-import org.apache.mina.common.support.AbstractIoFilterChain;
-import org.apache.mina.common.support.BaseIoSession;
/**
* Tests {@link AbstractIoFilterChain}.
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/support/FutureTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/support/FutureTest.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/support/FutureTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/support/FutureTest.java Tue Aug 14 02:17:37 2007
@@ -24,6 +24,10 @@
import junit.framework.TestCase;
+import org.apache.mina.common.BaseIoSession;
+import org.apache.mina.common.DefaultCloseFuture;
+import org.apache.mina.common.DefaultConnectFuture;
+import org.apache.mina.common.DefaultWriteFuture;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoFuture;
import org.apache.mina.common.IoFutureListener;
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/support/IoServiceListenerSupportTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/support/IoServiceListenerSupportTest.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/support/IoServiceListenerSupportTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/support/IoServiceListenerSupportTest.java Tue Aug 14 02:17:37 2007
@@ -25,12 +25,14 @@
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.apache.mina.common.BaseIoSession;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoServiceListener;
+import org.apache.mina.common.IoServiceListenerSupport;
import org.apache.mina.common.IoSessionConfig;
import org.apache.mina.common.TransportType;
import org.easymock.MockControl;
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java Tue Aug 14 02:17:37 2007
@@ -26,6 +26,7 @@
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,7 +35,6 @@
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
import org.apache.mina.common.TransportType;
-import org.apache.mina.common.support.BaseIoSession;
/**
* Tests {@link CumulativeProtocolDecoder}.
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java Tue Aug 14 02:17:37 2007
@@ -27,6 +27,7 @@
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.IoFilterChain;
import org.apache.mina.common.IoHandler;
@@ -35,7 +36,6 @@
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;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.ProtocolEncoder;
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java Tue Aug 14 02:17:37 2007
@@ -28,6 +28,7 @@
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.IoFilterChain;
import org.apache.mina.common.IoHandler;
@@ -35,7 +36,6 @@
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
import org.apache.mina.common.TransportType;
-import org.apache.mina.common.support.BaseIoSession;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
/**
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java Tue Aug 14 02:17:37 2007
@@ -25,6 +25,7 @@
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.IoFilterChain;
import org.apache.mina.common.IoHandler;
@@ -33,7 +34,6 @@
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;
import org.apache.mina.filter.codec.support.SimpleProtocolEncoderOutput;
/**
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java Tue Aug 14 02:17:37 2007
@@ -26,6 +26,7 @@
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;
@@ -36,7 +37,6 @@
import org.apache.mina.common.TransportType;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.IoFilter.NextFilter;
-import org.apache.mina.common.support.BaseIoSession;
public class ExecutorFilterRegressionTest extends TestCase {
private ExecutorFilter filter;
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/reqres/RequestResponseFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/reqres/RequestResponseFilterTest.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/reqres/RequestResponseFilterTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/reqres/RequestResponseFilterTest.java Tue Aug 14 02:17:37 2007
@@ -24,6 +24,8 @@
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
+import org.apache.mina.common.AbstractIoFilterChain;
+import org.apache.mina.common.BaseIoSession;
import org.apache.mina.common.DefaultWriteRequest;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
@@ -31,12 +33,10 @@
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
+import org.apache.mina.common.SessionLog;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.IoFilter.NextFilter;
-import org.apache.mina.common.support.AbstractIoFilterChain;
-import org.apache.mina.common.support.BaseIoSession;
-import org.apache.mina.util.SessionLog;
import org.easymock.AbstractMatcher;
import org.easymock.MockControl;
import org.junit.After;
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java Tue Aug 14 02:17:37 2007
@@ -32,6 +32,7 @@
import junit.framework.TestCase;
+import org.apache.mina.common.BaseIoSession;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.DefaultWriteRequest;
import org.apache.mina.common.IdleStatus;
@@ -46,7 +47,6 @@
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.IoFilter.NextFilter;
-import org.apache.mina.common.support.BaseIoSession;
import org.apache.mina.filter.stream.StreamWriteFilter;
import org.apache.mina.transport.socket.nio.SocketAcceptor;
import org.apache.mina.transport.socket.nio.SocketConnector;
Modified: mina/trunk/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java Tue Aug 14 02:17:37 2007
@@ -24,13 +24,13 @@
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.apache.mina.common.BaseIoSession;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
import org.apache.mina.common.TransportType;
-import org.apache.mina.common.support.BaseIoSession;
/**
* A test case for {@link ChainedIoHandler}.
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java Tue Aug 14 02:17:37 2007
@@ -27,7 +27,7 @@
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.util.SessionLog;
+import org.apache.mina.common.SessionLog;
/**
* {@link IoHandler} implementation of a simple chat server protocol.
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/ServerHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/ServerHandler.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/ServerHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/ServerHandler.java Tue Aug 14 02:17:37 2007
@@ -24,7 +24,7 @@
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.util.SessionLog;
+import org.apache.mina.common.SessionLog;
/**
* An {@link IoHandler} for HTTP.
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java Tue Aug 14 02:17:37 2007
@@ -24,8 +24,8 @@
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
+import org.apache.mina.common.SessionLog;
import org.apache.mina.common.TrafficMask;
-import org.apache.mina.util.SessionLog;
/**
* Base class of {@link org.apache.mina.common.IoHandler} classes which handle
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java Tue Aug 14 02:17:37 2007
@@ -22,9 +22,9 @@
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
+import org.apache.mina.common.SessionLog;
import org.apache.mina.example.sumup.message.AddMessage;
import org.apache.mina.example.sumup.message.ResultMessage;
-import org.apache.mina.util.SessionLog;
/**
* {@link IoHandler} for SumUp client.
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java Tue Aug 14 02:17:37 2007
@@ -23,9 +23,9 @@
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
+import org.apache.mina.common.SessionLog;
import org.apache.mina.example.sumup.message.AddMessage;
import org.apache.mina.example.sumup.message.ResultMessage;
-import org.apache.mina.util.SessionLog;
/**
* {@link IoHandler} for SumUp server.
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java Tue Aug 14 02:17:37 2007
@@ -28,12 +28,12 @@
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoSession;
+import org.apache.mina.common.SessionLog;
import org.apache.mina.example.echoserver.ssl.BogusSSLContextFactory;
import org.apache.mina.filter.ssl.SSLFilter;
import org.apache.mina.transport.socket.nio.DatagramAcceptor;
import org.apache.mina.transport.socket.nio.DatagramSessionConfig;
import org.apache.mina.transport.socket.nio.SocketAcceptor;
-import org.apache.mina.util.SessionLog;
/**
* Tests echo server example.
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java?view=diff&rev=565669&r1=565668&r2=565669
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java Tue Aug 14 02:17:37 2007
@@ -29,13 +29,13 @@
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.RuntimeIOException;
+import org.apache.mina.common.SessionLog;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.example.echoserver.ssl.BogusSSLContextFactory;
import org.apache.mina.filter.ssl.SSLFilter;
import org.apache.mina.transport.socket.nio.DatagramConnector;
import org.apache.mina.transport.socket.nio.SocketConnector;
import org.apache.mina.util.AvailablePortFinder;
-import org.apache.mina.util.SessionLog;
/**
* Tests echo server example.