You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2008/06/24 11:55:53 UTC
svn commit: r671108 [5/6] - in /mina/trunk:
core/src/main/java/org/apache/mina/common/
core/src/main/java/org/apache/mina/common/buffer/
core/src/main/java/org/apache/mina/common/file/
core/src/main/java/org/apache/mina/common/filterchain/ core/src/mai...
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?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- 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 Jun 24 02:55:42 2008
@@ -28,11 +28,11 @@
import java.util.Set;
import java.util.concurrent.Executor;
-import org.apache.mina.common.AbstractIoAcceptor;
-import org.apache.mina.common.IoFuture;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.TransportMetadata;
+import org.apache.mina.common.future.IoFuture;
+import org.apache.mina.common.service.AbstractIoAcceptor;
+import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.common.service.TransportMetadata;
+import org.apache.mina.common.session.IoSession;
/**
* Binds the specified {@link IoHandler} to the specified
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?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- 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 Jun 24 02:55:42 2008
@@ -25,16 +25,16 @@
import java.util.Set;
import java.util.concurrent.Executor;
-import org.apache.mina.common.AbstractIoConnector;
-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.IoSessionInitializer;
-import org.apache.mina.common.TransportMetadata;
+import org.apache.mina.common.filterchain.IoFilterChain;
+import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.common.future.DefaultConnectFuture;
+import org.apache.mina.common.future.IoFuture;
+import org.apache.mina.common.future.IoFutureListener;
+import org.apache.mina.common.service.AbstractIoConnector;
+import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.common.service.TransportMetadata;
+import org.apache.mina.common.session.IoSessionInitializer;
/**
* Connects to {@link IoHandler}s which is bound on the specified
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeFilterChain.java Tue Jun 24 02:55:42 2008
@@ -24,16 +24,16 @@
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
-import org.apache.mina.common.AbstractIoSession;
-import org.apache.mina.common.DefaultIoFilterChain;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoEvent;
-import org.apache.mina.common.IoEventType;
-import org.apache.mina.common.IoProcessor;
-import org.apache.mina.common.WriteRequest;
-import org.apache.mina.common.WriteRequestQueue;
-import org.apache.mina.common.WriteToClosedSessionException;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.filterchain.DefaultIoFilterChain;
+import org.apache.mina.common.service.IoProcessor;
+import org.apache.mina.common.session.AbstractIoSession;
+import org.apache.mina.common.session.IdleStatus;
+import org.apache.mina.common.session.IoEvent;
+import org.apache.mina.common.session.IoEventType;
+import org.apache.mina.common.write.WriteRequest;
+import org.apache.mina.common.write.WriteRequestQueue;
+import org.apache.mina.common.write.WriteToClosedSessionException;
/**
* TODO Add documentation
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSession.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSession.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSession.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSession.java Tue Jun 24 02:55:42 2008
@@ -24,22 +24,22 @@
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.mina.common.AbstractIoSession;
-import org.apache.mina.common.DefaultTransportMetadata;
-import org.apache.mina.common.IoFilterChain;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoProcessor;
-import org.apache.mina.common.IoService;
-import org.apache.mina.common.IoServiceListenerSupport;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.TransportMetadata;
-import org.apache.mina.common.WriteRequestQueue;
+import org.apache.mina.common.filterchain.IoFilterChain;
+import org.apache.mina.common.service.DefaultTransportMetadata;
+import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.common.service.IoProcessor;
+import org.apache.mina.common.service.IoService;
+import org.apache.mina.common.service.IoServiceListenerSupport;
+import org.apache.mina.common.service.TransportMetadata;
+import org.apache.mina.common.session.AbstractIoSession;
+import org.apache.mina.common.session.IoSession;
+import org.apache.mina.common.write.WriteRequestQueue;
/**
* A {@link IoSession} for in-VM transport (VM_PIPE).
*
* @author The Apache MINA Project (dev@mina.apache.org)
- * @version $Rev$, $Date$
+ * @version $Rev: 668702 $, $Date: 2008-06-17 17:11:14 +0200 (Tue, 17 Jun 2008) $
*/
class VmPipeSession extends AbstractIoSession {
@@ -110,7 +110,7 @@
}
@Override
- protected IoProcessor<VmPipeSession> getProcessor() {
+ public IoProcessor<VmPipeSession> getProcessor() {
return filterChain.getProcessor();
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSessionConfig.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSessionConfig.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSessionConfig.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSessionConfig.java Tue Jun 24 02:55:42 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.transport.vmpipe;
-import org.apache.mina.common.IoSessionConfig;
+import org.apache.mina.common.session.IoSessionConfig;
/**
* An {@link IoSessionConfig} for vmpipe transport type.
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/DefaultIoFilterChainBuilderTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/DefaultIoFilterChainBuilderTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/DefaultIoFilterChainBuilderTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/DefaultIoFilterChainBuilderTest.java Tue Jun 24 02:55:42 2008
@@ -22,7 +22,10 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.IoFilterChain.Entry;
+import org.apache.mina.common.filterchain.DefaultIoFilterChainBuilder;
+import org.apache.mina.common.filterchain.IoFilter;
+import org.apache.mina.common.filterchain.IoFilterAdapter;
+import org.apache.mina.common.filterchain.IoFilterChain.Entry;
/**
* Tests {@link DefaultIoFilterChainBuilder}.
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/FutureTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/FutureTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/FutureTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/FutureTest.java Tue Jun 24 02:55:42 2008
@@ -21,6 +21,14 @@
import java.io.IOException;
+import org.apache.mina.common.future.DefaultCloseFuture;
+import org.apache.mina.common.future.DefaultConnectFuture;
+import org.apache.mina.common.future.DefaultWriteFuture;
+import org.apache.mina.common.future.IoFuture;
+import org.apache.mina.common.future.IoFutureListener;
+import org.apache.mina.common.session.DummySession;
+import org.apache.mina.common.session.IoSession;
+
import junit.framework.TestCase;
/**
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/IoBufferTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/IoBufferTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/IoBufferTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/IoBufferTest.java Tue Jun 24 02:55:42 2008
@@ -35,6 +35,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.apache.mina.common.buffer.IoBuffer;
import org.apache.mina.util.Bar;
/**
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?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- 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 Jun 24 02:55:42 2008
@@ -22,7 +22,18 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.IoFilterChain.Entry;
+import org.apache.mina.common.filterchain.DefaultIoFilterChain;
+import org.apache.mina.common.filterchain.IoFilter;
+import org.apache.mina.common.filterchain.IoFilterAdapter;
+import org.apache.mina.common.filterchain.IoFilterChain;
+import org.apache.mina.common.filterchain.IoFilterChain.Entry;
+import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.DummySession;
+import org.apache.mina.common.session.IdleStatus;
+import org.apache.mina.common.session.IoSession;
+import org.apache.mina.common.write.DefaultWriteRequest;
+import org.apache.mina.common.write.WriteRequest;
/**
* Tests {@link DefaultIoFilterChain}.
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java Tue Jun 24 02:55:42 2008
@@ -25,6 +25,13 @@
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.apache.mina.common.service.IoAcceptor;
+import org.apache.mina.common.service.IoConnector;
+import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.common.service.IoService;
+import org.apache.mina.common.service.IoServiceListener;
+import org.apache.mina.common.service.IoServiceListenerSupport;
+import org.apache.mina.common.session.DummySession;
import org.easymock.EasyMock;
/**
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?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- 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 Jun 24 02:55:42 2008
@@ -26,10 +26,10 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.DefaultTransportMetadata;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionConfig;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.service.DefaultTransportMetadata;
+import org.apache.mina.common.session.IoSession;
+import org.apache.mina.common.session.IoSessionConfig;
/**
* 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?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- 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 Jun 24 02:55:42 2008
@@ -24,7 +24,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolCodecSession;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
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?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- 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 Jun 24 02:55:42 2008
@@ -25,7 +25,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolCodecSession;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.RecoverableProtocolDecoderException;
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?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- 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 Jun 24 02:55:42 2008
@@ -24,7 +24,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolCodecSession;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
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?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- 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 Jun 24 02:55:42 2008
@@ -25,12 +25,12 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.DummySession;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.TrafficMask;
-import org.apache.mina.common.WriteRequest;
-import org.apache.mina.common.IoFilter.NextFilter;
+import org.apache.mina.common.filterchain.IoFilter.NextFilter;
+import org.apache.mina.common.session.DummySession;
+import org.apache.mina.common.session.IdleStatus;
+import org.apache.mina.common.session.IoSession;
+import org.apache.mina.common.session.TrafficMask;
+import org.apache.mina.common.write.WriteRequest;
/**
* TODO Add documentation
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/firewall/ConnectionThrottleFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/firewall/ConnectionThrottleFilterTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/firewall/ConnectionThrottleFilterTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/firewall/ConnectionThrottleFilterTest.java Tue Jun 24 02:55:42 2008
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
-import org.apache.mina.common.DummySession;
+import org.apache.mina.common.session.DummySession;
/**
* TODO Add documentation
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/keepalive/KeepAliveFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/keepalive/KeepAliveFilterTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/keepalive/KeepAliveFilterTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/keepalive/KeepAliveFilterTest.java Tue Jun 24 02:55:42 2008
@@ -26,11 +26,11 @@
import junit.framework.TestCase;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IdleStatus;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java Tue Jun 24 02:55:42 2008
@@ -32,13 +32,13 @@
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.Level;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.DefaultIoFilterChainBuilder;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoFilterAdapter;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.filterchain.DefaultIoFilterChainBuilder;
+import org.apache.mina.common.filterchain.IoFilterAdapter;
+import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IdleStatus;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.ProtocolDecoder;
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?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- 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 Jun 24 02:55:42 2008
@@ -25,12 +25,12 @@
import junit.framework.TestCase;
-import org.apache.mina.common.DefaultWriteRequest;
-import org.apache.mina.common.DummySession;
-import org.apache.mina.common.IoFilterChain;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.WriteRequest;
-import org.apache.mina.common.IoFilter.NextFilter;
+import org.apache.mina.common.filterchain.IoFilterChain;
+import org.apache.mina.common.filterchain.IoFilter.NextFilter;
+import org.apache.mina.common.session.DummySession;
+import org.apache.mina.common.session.IoSession;
+import org.apache.mina.common.write.DefaultWriteRequest;
+import org.apache.mina.common.write.WriteRequest;
import org.easymock.AbstractMatcher;
import org.easymock.MockControl;
import org.junit.After;
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/stream/AbstractStreamWriteFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/stream/AbstractStreamWriteFilterTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/stream/AbstractStreamWriteFilterTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/stream/AbstractStreamWriteFilterTest.java Tue Jun 24 02:55:42 2008
@@ -30,16 +30,16 @@
import junit.framework.TestCase;
-import org.apache.mina.common.DefaultWriteRequest;
-import org.apache.mina.common.DummySession;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoFutureListener;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.WriteFuture;
-import org.apache.mina.common.WriteRequest;
-import org.apache.mina.common.IoFilter.NextFilter;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.filterchain.IoFilter.NextFilter;
+import org.apache.mina.common.future.IoFutureListener;
+import org.apache.mina.common.future.WriteFuture;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.DummySession;
+import org.apache.mina.common.session.IdleStatus;
+import org.apache.mina.common.session.IoSession;
+import org.apache.mina.common.write.DefaultWriteRequest;
+import org.apache.mina.common.write.WriteRequest;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.apache.mina.util.AvailablePortFinder;
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/stream/FileRegionWriteFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/stream/FileRegionWriteFilterTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/stream/FileRegionWriteFilterTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/stream/FileRegionWriteFilterTest.java Tue Jun 24 02:55:42 2008
@@ -25,8 +25,8 @@
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
-import org.apache.mina.common.DefaultFileRegion;
-import org.apache.mina.common.FileRegion;
+import org.apache.mina.common.file.DefaultFileRegion;
+import org.apache.mina.common.file.FileRegion;
/**
* Tests {@link StreamWriteFilter}.
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/util/WrappingFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/util/WrappingFilterTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/util/WrappingFilterTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/util/WrappingFilterTest.java Tue Jun 24 02:55:42 2008
@@ -24,14 +24,14 @@
import junit.framework.TestCase;
-import org.apache.mina.common.DefaultWriteRequest;
-import org.apache.mina.common.DummySession;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoEventType;
-import org.apache.mina.common.IoFilter;
-import org.apache.mina.common.IoFilterEvent;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.WriteRequest;
+import org.apache.mina.common.filterchain.IoFilter;
+import org.apache.mina.common.filterchain.IoFilterEvent;
+import org.apache.mina.common.session.DummySession;
+import org.apache.mina.common.session.IdleStatus;
+import org.apache.mina.common.session.IoEventType;
+import org.apache.mina.common.session.IoSession;
+import org.apache.mina.common.write.DefaultWriteRequest;
+import org.apache.mina.common.write.WriteRequest;
import org.easymock.EasyMock;
/**
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?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- 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 Jun 24 02:55:42 2008
@@ -22,8 +22,8 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.DummySession;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.session.DummySession;
+import org.apache.mina.common.session.IoSession;
/**
* A test case for {@link ChainedIoHandler}.
Modified: mina/trunk/core/src/test/java/org/apache/mina/handler/demux/DemuxingIoHandlerTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/handler/demux/DemuxingIoHandlerTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/handler/demux/DemuxingIoHandlerTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/handler/demux/DemuxingIoHandlerTest.java Tue Jun 24 02:55:42 2008
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.session.IoSession;
import org.easymock.EasyMock;
/**
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractBindTest.java Tue Jun 24 02:55:42 2008
@@ -27,13 +27,13 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.common.service.IoAcceptor;
+import org.apache.mina.common.service.IoConnector;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IdleStatus;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.transport.socket.DatagramAcceptor;
import org.apache.mina.transport.socket.DatagramSessionConfig;
import org.apache.mina.transport.socket.SocketAcceptor;
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractConnectorTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractConnectorTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractConnectorTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractConnectorTest.java Tue Jun 24 02:55:42 2008
@@ -27,13 +27,13 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionInitializer;
import org.apache.mina.common.RuntimeIoException;
+import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.common.service.IoAcceptor;
+import org.apache.mina.common.service.IoConnector;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IoSession;
+import org.apache.mina.common.session.IoSessionInitializer;
import org.apache.mina.util.AvailablePortFinder;
/**
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractFileRegionTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractFileRegionTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractFileRegionTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractFileRegionTest.java Tue Jun 24 02:55:42 2008
@@ -29,12 +29,12 @@
import junit.framework.TestCase;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.common.service.IoAcceptor;
+import org.apache.mina.common.service.IoConnector;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.util.AvailablePortFinder;
/**
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java Tue Jun 24 02:55:42 2008
@@ -23,13 +23,13 @@
import junit.framework.TestCase;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.TransportMetadata;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.common.service.IoAcceptor;
+import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.service.TransportMetadata;
+import org.apache.mina.common.session.IoSession;
/**
* Abstract base class for testing suspending and resuming reads and
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramBindTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramBindTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramBindTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramBindTest.java Tue Jun 24 02:55:42 2008
@@ -22,7 +22,7 @@
import java.net.InetSocketAddress;
import java.net.SocketAddress;
-import org.apache.mina.common.IoConnector;
+import org.apache.mina.common.service.IoConnector;
import org.apache.mina.transport.AbstractBindTest;
/**
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java Tue Jun 24 02:55:42 2008
@@ -24,16 +24,16 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoFilter;
-import org.apache.mina.common.IoFilterAdapter;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.WriteFuture;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.filterchain.IoFilter;
+import org.apache.mina.common.filterchain.IoFilterAdapter;
+import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.common.future.WriteFuture;
+import org.apache.mina.common.service.IoAcceptor;
+import org.apache.mina.common.service.IoConnector;
+import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.util.AvailablePortFinder;
/**
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConnectorTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConnectorTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConnectorTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConnectorTest.java Tue Jun 24 02:55:42 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.transport.socket.nio;
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoConnector;
+import org.apache.mina.common.service.IoAcceptor;
+import org.apache.mina.common.service.IoConnector;
import org.apache.mina.transport.AbstractConnectorTest;
/**
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java Tue Jun 24 02:55:42 2008
@@ -24,13 +24,13 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.ExpiringSessionRecycler;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.WriteFuture;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.common.future.WriteFuture;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.ExpiringSessionRecycler;
+import org.apache.mina.common.session.IdleStatus;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.util.AvailablePortFinder;
/**
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramTrafficControlTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramTrafficControlTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramTrafficControlTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramTrafficControlTest.java Tue Jun 24 02:55:42 2008
@@ -22,9 +22,9 @@
import java.net.InetSocketAddress;
import java.net.SocketAddress;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoHandler;
+import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.common.service.IoConnector;
+import org.apache.mina.common.service.IoHandler;
import org.apache.mina.transport.AbstractTrafficControlTest;
/**
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/NioFileRegionTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/NioFileRegionTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/NioFileRegionTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/NioFileRegionTest.java Tue Jun 24 02:55:42 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.transport.socket.nio;
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoConnector;
+import org.apache.mina.common.service.IoAcceptor;
+import org.apache.mina.common.service.IoConnector;
import org.apache.mina.transport.AbstractFileRegionTest;
/**
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketBindTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketBindTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketBindTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketBindTest.java Tue Jun 24 02:55:42 2008
@@ -22,7 +22,7 @@
import java.net.InetSocketAddress;
import java.net.SocketAddress;
-import org.apache.mina.common.IoConnector;
+import org.apache.mina.common.service.IoConnector;
import org.apache.mina.transport.AbstractBindTest;
/**
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketConnectorTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketConnectorTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketConnectorTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketConnectorTest.java Tue Jun 24 02:55:42 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.transport.socket.nio;
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoConnector;
+import org.apache.mina.common.service.IoAcceptor;
+import org.apache.mina.common.service.IoConnector;
import org.apache.mina.transport.AbstractConnectorTest;
/**
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketTrafficControlTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketTrafficControlTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketTrafficControlTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketTrafficControlTest.java Tue Jun 24 02:55:42 2008
@@ -22,9 +22,9 @@
import java.net.InetSocketAddress;
import java.net.SocketAddress;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoHandler;
+import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.common.service.IoConnector;
+import org.apache.mina.common.service.IoHandler;
import org.apache.mina.transport.AbstractTrafficControlTest;
/**
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeBindTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeBindTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeBindTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeBindTest.java Tue Jun 24 02:55:42 2008
@@ -21,7 +21,7 @@
import java.net.SocketAddress;
-import org.apache.mina.common.IoConnector;
+import org.apache.mina.common.service.IoConnector;
import org.apache.mina.transport.AbstractBindTest;
/**
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeEventOrderTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeEventOrderTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeEventOrderTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeEventOrderTest.java Tue Jun 24 02:55:42 2008
@@ -25,12 +25,12 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.common.service.IoAcceptor;
+import org.apache.mina.common.service.IoConnector;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.filter.executor.ExecutorFilter;
/**
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeSessionCrossCommunicationTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeSessionCrossCommunicationTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeSessionCrossCommunicationTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeSessionCrossCommunicationTest.java Tue Jun 24 02:55:42 2008
@@ -27,11 +27,11 @@
import junit.framework.TestCase;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.common.service.IoAcceptor;
+import org.apache.mina.common.service.IoConnector;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IoSession;
/**
* TODO Add documentation
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeTrafficControlTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeTrafficControlTest.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeTrafficControlTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/vmpipe/VmPipeTrafficControlTest.java Tue Jun 24 02:55:42 2008
@@ -21,9 +21,9 @@
import java.net.SocketAddress;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoHandler;
+import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.common.service.IoConnector;
+import org.apache.mina.common.service.IoHandler;
import org.apache.mina.transport.AbstractTrafficControlTest;
/**
Modified: mina/trunk/core/src/test/java/org/apache/mina/util/IoFilterImpl.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/util/IoFilterImpl.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/util/IoFilterImpl.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/util/IoFilterImpl.java Tue Jun 24 02:55:42 2008
@@ -19,9 +19,9 @@
*/
package org.apache.mina.util;
-import org.apache.mina.common.IoFilter;
-import org.apache.mina.common.IoFilterAdapter;
-import org.apache.mina.common.IoFilterChain;
+import org.apache.mina.common.filterchain.IoFilter;
+import org.apache.mina.common.filterchain.IoFilterAdapter;
+import org.apache.mina.common.filterchain.IoFilterChain;
/**
* Bogus implementation of {@link IoFilter} to test
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?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- 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 Jun 24 02:55:42 2008
@@ -23,9 +23,9 @@
import java.util.HashSet;
import java.util.Set;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.filter.logging.MdcInjectionFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/chat/Main.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/Main.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/chat/Main.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/chat/Main.java Tue Jun 24 02:55:42 2008
@@ -21,7 +21,7 @@
import java.net.InetSocketAddress;
-import org.apache.mina.common.DefaultIoFilterChainBuilder;
+import org.apache.mina.common.filterchain.DefaultIoFilterChainBuilder;
import org.apache.mina.example.echoserver.ssl.BogusSslContextFactory;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java Tue Jun 24 02:55:42 2008
@@ -23,9 +23,9 @@
import javax.net.ssl.SSLContext;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.example.echoserver.ssl.BogusSslContextFactory;
import org.apache.mina.filter.ssl.SslFilter;
import org.apache.mina.filter.logging.MdcInjectionFilter;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClientHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClientHandler.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClientHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClientHandler.java Tue Jun 24 02:55:42 2008
@@ -19,10 +19,10 @@
*/
package org.apache.mina.example.chat.client;
-import org.apache.mina.common.IoFilter;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.filterchain.IoFilter;
+import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.example.chat.ChatCommand;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java Tue Jun 24 02:55:42 2008
@@ -19,11 +19,11 @@
*/
package org.apache.mina.example.echoserver;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IdleStatus;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.filter.ssl.SslFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/Main.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/Main.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/Main.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/Main.java Tue Jun 24 02:55:42 2008
@@ -21,7 +21,7 @@
import java.net.InetSocketAddress;
-import org.apache.mina.common.DefaultIoFilterChainBuilder;
+import org.apache.mina.common.filterchain.DefaultIoFilterChainBuilder;
import org.apache.mina.example.echoserver.ssl.BogusSslContextFactory;
import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.filter.ssl.SslFilter;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/gettingstarted/timeserver/MinaTimeServer.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/gettingstarted/timeserver/MinaTimeServer.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/gettingstarted/timeserver/MinaTimeServer.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/gettingstarted/timeserver/MinaTimeServer.java Tue Jun 24 02:55:42 2008
@@ -23,8 +23,8 @@
import java.net.InetSocketAddress;
import java.nio.charset.Charset;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoAcceptor;
+import org.apache.mina.common.service.IoAcceptor;
+import org.apache.mina.common.session.IdleStatus;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
import org.apache.mina.filter.logging.LoggingFilter;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/gettingstarted/timeserver/TimeServerHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/gettingstarted/timeserver/TimeServerHandler.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/gettingstarted/timeserver/TimeServerHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/gettingstarted/timeserver/TimeServerHandler.java Tue Jun 24 02:55:42 2008
@@ -21,9 +21,9 @@
import java.util.Date;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IdleStatus;
+import org.apache.mina.common.session.IoSession;
/**
* TODO Add documentation
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/client/ImageClient.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/client/ImageClient.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/client/ImageClient.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/client/ImageClient.java Tue Jun 24 02:55:42 2008
@@ -19,10 +19,10 @@
*/
package org.apache.mina.example.imagine.step1.client;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
import org.apache.mina.common.RuntimeIoException;
+import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.example.imagine.step1.ImageRequest;
import org.apache.mina.example.imagine.step1.ImageResponse;
import org.apache.mina.example.imagine.step1.server.ImageServer;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageCodecFactory.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageCodecFactory.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageCodecFactory.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageCodecFactory.java Tue Jun 24 02:55:42 2008
@@ -22,7 +22,7 @@
import org.apache.mina.filter.codec.ProtocolCodecFactory;
import org.apache.mina.filter.codec.ProtocolEncoder;
import org.apache.mina.filter.codec.ProtocolDecoder;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.session.IoSession;
/**
* a {@link ProtocolCodecFactory} for the tutorial on how to write a protocol codec
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageRequestDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageRequestDecoder.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageRequestDecoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageRequestDecoder.java Tue Jun 24 02:55:42 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.example.imagine.step1.codec;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.example.imagine.step1.ImageRequest;
import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageRequestEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageRequestEncoder.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageRequestEncoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageRequestEncoder.java Tue Jun 24 02:55:42 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.example.imagine.step1.codec;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.example.imagine.step1.ImageRequest;
import org.apache.mina.filter.codec.ProtocolEncoder;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageResponseDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageResponseDecoder.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageResponseDecoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageResponseDecoder.java Tue Jun 24 02:55:42 2008
@@ -21,8 +21,8 @@
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.example.imagine.step1.ImageResponse;
import javax.imageio.ImageIO;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageResponseEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageResponseEncoder.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageResponseEncoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageResponseEncoder.java Tue Jun 24 02:55:42 2008
@@ -21,8 +21,8 @@
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.example.imagine.step1.ImageResponse;
import javax.imageio.ImageIO;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/server/ImageServerIoHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/server/ImageServerIoHandler.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/server/ImageServerIoHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/server/ImageServerIoHandler.java Tue Jun 24 02:55:42 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.example.imagine.step1.server;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.example.imagine.step1.ImageRequest;
import org.apache.mina.example.imagine.step1.ImageResponse;
import org.slf4j.Logger;
@@ -32,7 +32,7 @@
import java.awt.image.BufferedImage;
/**
- * server-side {@link org.apache.mina.common.IoHandler}
+ * server-side {@link org.apache.mina.common.service.IoHandler}
*
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
@@ -49,7 +49,7 @@
/**
* Called when the session is opened, which will come after the session created.
*
- * @see org.apache.mina.common.IoHandlerAdapter#sessionOpened(org.apache.mina.common.IoSession)
+ * @see org.apache.mina.common.service.IoHandlerAdapter#sessionOpened(org.apache.mina.common.session.IoSession)
*/
public void sessionOpened(IoSession session) throws Exception {
session.setAttribute(INDEX_KEY, 0);
@@ -59,7 +59,7 @@
* This method will be called whenever an exception occurs. For this handler,
* the logger will generate a warning message.
*
- * @see org.apache.mina.common.IoHandlerAdapter#exceptionCaught(org.apache.mina.common.IoSession, java.lang.Throwable)
+ * @see org.apache.mina.common.service.IoHandlerAdapter#exceptionCaught(org.apache.mina.common.session.IoSession, java.lang.Throwable)
*/
public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
logger.warn(cause.getMessage(), cause);
@@ -68,7 +68,7 @@
/**
* Handle incoming messages.
*
- * @see org.apache.mina.common.IoHandlerAdapter#messageReceived(org.apache.mina.common.IoSession, java.lang.Object)
+ * @see org.apache.mina.common.service.IoHandlerAdapter#messageReceived(org.apache.mina.common.session.IoSession, java.lang.Object)
*/
public void messageReceived(IoSession session, Object message) throws Exception {
ImageRequest request = (ImageRequest) message;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step2/server/ImageServer.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step2/server/ImageServer.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step2/server/ImageServer.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step2/server/ImageServer.java Tue Jun 24 02:55:42 2008
@@ -23,7 +23,7 @@
import java.net.InetSocketAddress;
import java.util.concurrent.Executors;
-import org.apache.mina.common.DefaultIoFilterChainBuilder;
+import org.apache.mina.common.filterchain.DefaultIoFilterChainBuilder;
import org.apache.mina.example.imagine.step1.codec.ImageCodecFactory;
import org.apache.mina.example.imagine.step1.server.ImageServerIoHandler;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step3/server/ImageServer.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step3/server/ImageServer.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step3/server/ImageServer.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step3/server/ImageServer.java Tue Jun 24 02:55:42 2008
@@ -26,7 +26,7 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.mina.common.DefaultIoFilterChainBuilder;
+import org.apache.mina.common.filterchain.DefaultIoFilterChainBuilder;
import org.apache.mina.example.imagine.step1.codec.ImageCodecFactory;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.executor.ExecutorFilter;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step3/server/ImageServerIoHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step3/server/ImageServerIoHandler.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step3/server/ImageServerIoHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step3/server/ImageServerIoHandler.java Tue Jun 24 02:55:42 2008
@@ -27,8 +27,8 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.example.imagine.step1.ImageRequest;
import org.apache.mina.example.imagine.step1.ImageResponse;
import org.apache.mina.integration.jmx.IoSessionMBean;
@@ -36,7 +36,7 @@
import org.slf4j.LoggerFactory;
/**
- * server-side {@link org.apache.mina.common.IoHandler}
+ * server-side {@link org.apache.mina.common.service.IoHandler}
*
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
@@ -68,7 +68,7 @@
* This method is called first when a new connection to the server is made. In here we will set
* up the JMX session MBean.
*
- * @see org.apache.mina.common.IoHandlerAdapter#sessionCreated(org.apache.mina.common.IoSession)
+ * @see org.apache.mina.common.service.IoHandlerAdapter#sessionCreated(org.apache.mina.common.session.IoSession)
*/
public void sessionCreated( IoSession session ) throws Exception
{
@@ -88,7 +88,7 @@
/**
* Called when the session is opened, which will come after the session created.
*
- * @see org.apache.mina.common.IoHandlerAdapter#sessionOpened(org.apache.mina.common.IoSession)
+ * @see org.apache.mina.common.service.IoHandlerAdapter#sessionOpened(org.apache.mina.common.session.IoSession)
*/
public void sessionOpened(IoSession session) throws Exception {
@@ -101,7 +101,7 @@
* This method will be called whenever an exception occurs. For this handler,
* the logger will generate a warning message.
*
- * @see org.apache.mina.common.IoHandlerAdapter#exceptionCaught(org.apache.mina.common.IoSession, java.lang.Throwable)
+ * @see org.apache.mina.common.service.IoHandlerAdapter#exceptionCaught(org.apache.mina.common.session.IoSession, java.lang.Throwable)
*/
public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
logger.warn(cause.getMessage(), cause);
@@ -110,7 +110,7 @@
/**
* Handle incoming messages.
*
- * @see org.apache.mina.common.IoHandlerAdapter#messageReceived(org.apache.mina.common.IoSession, java.lang.Object)
+ * @see org.apache.mina.common.service.IoHandlerAdapter#messageReceived(org.apache.mina.common.session.IoSession, java.lang.Object)
*/
public void messageReceived(IoSession session, Object message) throws Exception {
ImageRequest request = (ImageRequest) message;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/netcat/Main.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/netcat/Main.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/netcat/Main.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/netcat/Main.java Tue Jun 24 02:55:42 2008
@@ -21,7 +21,7 @@
import java.net.InetSocketAddress;
-import org.apache.mina.common.ConnectFuture;
+import org.apache.mina.common.future.ConnectFuture;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
/**
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java Tue Jun 24 02:55:42 2008
@@ -19,11 +19,11 @@
*/
package org.apache.mina.example.netcat;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IdleStatus;
+import org.apache.mina.common.session.IoSession;
/**
* {@link IoHandler} implementation for NetCat client. This class extended
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?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- 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 Jun 24 02:55:42 2008
@@ -21,15 +21,15 @@
import java.nio.charset.Charset;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.TrafficMask;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IoSession;
+import org.apache.mina.common.session.TrafficMask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Base class of {@link org.apache.mina.common.IoHandler} classes which handle
+ * Base class of {@link org.apache.mina.common.service.IoHandler} classes which handle
* proxied connections.
*
* @author The Apache MINA Project (dev@mina.apache.org)
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/proxy/ClientToProxyIoHandler.java Tue Jun 24 02:55:42 2008
@@ -21,12 +21,12 @@
import java.net.SocketAddress;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoFutureListener;
-import org.apache.mina.common.IoSession;
import org.apache.mina.common.RuntimeIoException;
-import org.apache.mina.common.TrafficMask;
+import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.common.future.IoFutureListener;
+import org.apache.mina.common.service.IoConnector;
+import org.apache.mina.common.session.IoSession;
+import org.apache.mina.common.session.TrafficMask;
/**
* Handles the client to proxy part of the proxied connection.
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/proxy/Main.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/proxy/Main.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/proxy/Main.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/proxy/Main.java Tue Jun 24 02:55:42 2008
@@ -21,7 +21,7 @@
import java.net.InetSocketAddress;
-import org.apache.mina.common.IoConnector;
+import org.apache.mina.common.service.IoConnector;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/reverser/ReverseProtocolHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/reverser/ReverseProtocolHandler.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/reverser/ReverseProtocolHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/reverser/ReverseProtocolHandler.java Tue Jun 24 02:55:42 2008
@@ -19,9 +19,9 @@
*/
package org.apache.mina.example.reverser;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IoSession;
/**
* {@link IoHandler} implementation of reverser server protocol.
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Client.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Client.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Client.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Client.java Tue Jun 24 02:55:42 2008
@@ -21,9 +21,9 @@
import java.net.InetSocketAddress;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoSession;
import org.apache.mina.common.RuntimeIoException;
+import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.example.sumup.codec.SumUpProtocolCodecFactory;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.serialization.ObjectSerializationCodecFactory;
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?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- 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 Jun 24 02:55:42 2008
@@ -19,9 +19,9 @@
*/
package org.apache.mina.example.sumup;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.example.sumup.message.AddMessage;
import org.apache.mina.example.sumup.message.ResultMessage;
import org.slf4j.Logger;
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?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- 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 Jun 24 02:55:42 2008
@@ -19,10 +19,10 @@
*/
package org.apache.mina.example.sumup;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IdleStatus;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.example.sumup.message.AddMessage;
import org.apache.mina.example.sumup.message.ResultMessage;
import org.slf4j.Logger;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AbstractMessageDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AbstractMessageDecoder.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AbstractMessageDecoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AbstractMessageDecoder.java Tue Jun 24 02:55:42 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.example.sumup.codec;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.example.sumup.message.AbstractMessage;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.demux.MessageDecoder;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AbstractMessageEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AbstractMessageEncoder.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AbstractMessageEncoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AbstractMessageEncoder.java Tue Jun 24 02:55:42 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.example.sumup.codec;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.example.sumup.message.AbstractMessage;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
import org.apache.mina.filter.codec.demux.MessageEncoder;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageDecoder.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageDecoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageDecoder.java Tue Jun 24 02:55:42 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.example.sumup.codec;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.example.sumup.message.AbstractMessage;
import org.apache.mina.example.sumup.message.AddMessage;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java Tue Jun 24 02:55:42 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.example.sumup.codec;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.example.sumup.message.AddMessage;
import org.apache.mina.filter.codec.demux.MessageEncoder;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageDecoder.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageDecoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageDecoder.java Tue Jun 24 02:55:42 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.example.sumup.codec;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.example.sumup.message.AbstractMessage;
import org.apache.mina.example.sumup.message.ResultMessage;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java Tue Jun 24 02:55:42 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.example.sumup.codec;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.example.sumup.message.ResultMessage;
import org.apache.mina.filter.codec.demux.MessageEncoder;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/AuthenticationHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/AuthenticationHandler.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/AuthenticationHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/AuthenticationHandler.java Tue Jun 24 02:55:42 2008
@@ -21,10 +21,10 @@
import static org.apache.mina.statemachine.event.IoFilterEvents.*;
-import org.apache.mina.common.IoFutureListener;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.WriteRequest;
-import org.apache.mina.common.IoFilter.NextFilter;
+import org.apache.mina.common.filterchain.IoFilter.NextFilter;
+import org.apache.mina.common.future.IoFutureListener;
+import org.apache.mina.common.session.IoSession;
+import org.apache.mina.common.write.WriteRequest;
import org.apache.mina.example.tapedeck.TapeDeckServer.TapeDeckContext;
import org.apache.mina.statemachine.StateControl;
import org.apache.mina.statemachine.annotation.IoFilterTransition;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/CommandDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/CommandDecoder.java?rev=671108&r1=671107&r2=671108&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/CommandDecoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/CommandDecoder.java Tue Jun 24 02:55:42 2008
@@ -22,8 +22,8 @@
import java.nio.charset.Charset;
import java.util.LinkedList;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.textline.LineDelimiter;