You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by jv...@apache.org on 2008/06/26 10:50:11 UTC
svn commit: r671827 [3/6] - in /mina:
asyncweb/trunk/client/src/main/java/org/apache/ahc/
asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/
asyncweb/trunk/client/src/main/java/org/apache/ahc/proxy/
asyncweb/trunk/client/src/main/java/org/apache...
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSession.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSession.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSession.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSession.java Thu Jun 26 01:49:48 2008
@@ -17,23 +17,23 @@
* under the License.
*
*/
-package org.apache.mina.common.session;
+package org.apache.mina.core.session;
import java.net.SocketAddress;
import java.util.Set;
-import org.apache.mina.common.filterchain.IoFilter;
-import org.apache.mina.common.filterchain.IoFilterChain;
-import org.apache.mina.common.filterchain.IoFilter.NextFilter;
-import org.apache.mina.common.future.CloseFuture;
-import org.apache.mina.common.future.ReadFuture;
-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.IoService;
-import org.apache.mina.common.service.TransportMetadata;
-import org.apache.mina.common.write.WriteRequest;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.core.filterchain.IoFilterChain;
+import org.apache.mina.core.filterchain.IoFilter.NextFilter;
+import org.apache.mina.core.future.CloseFuture;
+import org.apache.mina.core.future.ReadFuture;
+import org.apache.mina.core.future.WriteFuture;
+import org.apache.mina.core.service.IoAcceptor;
+import org.apache.mina.core.service.IoConnector;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.core.service.IoService;
+import org.apache.mina.core.service.TransportMetadata;
+import org.apache.mina.core.write.WriteRequest;
/**
* A handle which represents connection between two end-points regardless of
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionAttributeMap.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionAttributeMap.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionAttributeMap.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionAttributeMap.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.session;
+package org.apache.mina.core.session;
import java.util.Set;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionConfig.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionConfig.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionConfig.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionConfig.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.session;
+package org.apache.mina.core.session;
import java.util.concurrent.BlockingQueue;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionDataStructureFactory.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionDataStructureFactory.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionDataStructureFactory.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionDataStructureFactory.java Thu Jun 26 01:49:48 2008
@@ -17,12 +17,12 @@
* under the License.
*
*/
-package org.apache.mina.common.session;
+package org.apache.mina.core.session;
import java.util.Comparator;
-import org.apache.mina.common.write.WriteRequest;
-import org.apache.mina.common.write.WriteRequestQueue;
+import org.apache.mina.core.write.WriteRequest;
+import org.apache.mina.core.write.WriteRequestQueue;
/**
* Provides data structures to a newly created session.
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionInitializationException.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionInitializationException.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionInitializationException.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionInitializationException.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.session;
+package org.apache.mina.core.session;
/**
* A {@link RuntimeException} that is thrown when the initialization of
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionInitializer.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionInitializer.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionInitializer.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionInitializer.java Thu Jun 26 01:49:48 2008
@@ -17,9 +17,9 @@
* under the License.
*
*/
-package org.apache.mina.common.session;
+package org.apache.mina.core.session;
-import org.apache.mina.common.future.IoFuture;
+import org.apache.mina.core.future.IoFuture;
/**
* Defines a callback for obtaining the {@link IoSession} during
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionRecycler.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionRecycler.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionRecycler.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/session/IoSessionRecycler.java Thu Jun 26 01:49:48 2008
@@ -17,11 +17,11 @@
* under the License.
*
*/
-package org.apache.mina.common.session;
+package org.apache.mina.core.session;
import java.net.SocketAddress;
-import org.apache.mina.common.service.IoService;
+import org.apache.mina.core.service.IoService;
/**
* A connectionless transport can recycle existing sessions by assigning an
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/session/TrafficMask.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/TrafficMask.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/session/TrafficMask.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/session/TrafficMask.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.session;
+package org.apache.mina.core.session;
import java.nio.channels.SelectionKey;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/session/UnknownMessageTypeException.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/UnknownMessageTypeException.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/session/UnknownMessageTypeException.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/session/UnknownMessageTypeException.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.session;
+package org.apache.mina.core.session;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/write/DefaultWriteRequest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/write/DefaultWriteRequest.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/write/DefaultWriteRequest.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/write/DefaultWriteRequest.java Thu Jun 26 01:49:48 2008
@@ -17,14 +17,14 @@
* under the License.
*
*/
-package org.apache.mina.common.write;
+package org.apache.mina.core.write;
import java.net.SocketAddress;
import java.util.concurrent.TimeUnit;
-import org.apache.mina.common.future.IoFutureListener;
-import org.apache.mina.common.future.WriteFuture;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.future.IoFutureListener;
+import org.apache.mina.core.future.WriteFuture;
+import org.apache.mina.core.session.IoSession;
/**
* The default implementation of {@link WriteRequest}.
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/write/NothingWrittenException.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/write/NothingWrittenException.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/write/NothingWrittenException.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/write/NothingWrittenException.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.write;
+package org.apache.mina.core.write;
import java.util.Collection;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteException.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteException.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteException.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteException.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.write;
+package org.apache.mina.core.write;
import java.io.IOException;
import java.util.ArrayList;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteRequest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteRequest.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteRequest.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteRequest.java Thu Jun 26 01:49:48 2008
@@ -17,13 +17,13 @@
* under the License.
*
*/
-package org.apache.mina.common.write;
+package org.apache.mina.core.write;
import java.net.SocketAddress;
-import org.apache.mina.common.filterchain.IoFilter;
-import org.apache.mina.common.future.WriteFuture;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.core.future.WriteFuture;
+import org.apache.mina.core.session.IoSession;
/**
* Represents write request fired by {@link IoSession#write(Object)}.
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteRequestQueue.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteRequestQueue.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteRequestQueue.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteRequestQueue.java Thu Jun 26 01:49:48 2008
@@ -17,9 +17,9 @@
* under the License.
*
*/
-package org.apache.mina.common.write;
+package org.apache.mina.core.write;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteRequestWrapper.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteRequestWrapper.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteRequestWrapper.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteRequestWrapper.java Thu Jun 26 01:49:48 2008
@@ -17,11 +17,11 @@
* under the License.
*
*/
-package org.apache.mina.common.write;
+package org.apache.mina.core.write;
import java.net.SocketAddress;
-import org.apache.mina.common.future.WriteFuture;
+import org.apache.mina.core.future.WriteFuture;
/**
* A wrapper for an existing {@link WriteRequest}.
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteTimeoutException.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteTimeoutException.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteTimeoutException.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteTimeoutException.java Thu Jun 26 01:49:48 2008
@@ -17,11 +17,11 @@
* under the License.
*
*/
-package org.apache.mina.common.write;
+package org.apache.mina.core.write;
import java.util.Collection;
-import org.apache.mina.common.session.IoSessionConfig;
+import org.apache.mina.core.session.IoSessionConfig;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteToClosedSessionException.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteToClosedSessionException.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteToClosedSessionException.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/write/WriteToClosedSessionException.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.write;
+package org.apache.mina.core.write;
import java.util.Collection;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/AbstractProtocolEncoderOutput.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/AbstractProtocolEncoderOutput.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/AbstractProtocolEncoderOutput.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/AbstractProtocolEncoderOutput.java Thu Jun 26 01:49:48 2008
@@ -21,7 +21,7 @@
import java.util.Queue;
-import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.util.CircularQueue;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/CumulativeProtocolDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/CumulativeProtocolDecoder.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/CumulativeProtocolDecoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/CumulativeProtocolDecoder.java Thu Jun 26 01:49:48 2008
@@ -19,10 +19,10 @@
*/
package org.apache.mina.filter.codec;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.service.TransportMetadata;
-import org.apache.mina.common.session.AttributeKey;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.service.TransportMetadata;
+import org.apache.mina.core.session.AttributeKey;
+import org.apache.mina.core.session.IoSession;
/**
* A {@link ProtocolDecoder} that cumulates the content of received
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFactory.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFactory.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFactory.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFactory.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
/**
* Provides {@link ProtocolEncoder} and {@link ProtocolDecoder} which translates
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?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- 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 Thu Jun 26 01:49:48 2008
@@ -22,19 +22,19 @@
import java.net.SocketAddress;
import java.util.Queue;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.file.FileRegion;
-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.future.DefaultWriteFuture;
-import org.apache.mina.common.future.WriteFuture;
-import org.apache.mina.common.session.AttributeKey;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.write.DefaultWriteRequest;
-import org.apache.mina.common.write.NothingWrittenException;
-import org.apache.mina.common.write.WriteRequest;
-import org.apache.mina.common.write.WriteRequestWrapper;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.file.FileRegion;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.core.filterchain.IoFilterAdapter;
+import org.apache.mina.core.filterchain.IoFilterChain;
+import org.apache.mina.core.future.DefaultWriteFuture;
+import org.apache.mina.core.future.WriteFuture;
+import org.apache.mina.core.session.AttributeKey;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.write.DefaultWriteRequest;
+import org.apache.mina.core.write.NothingWrittenException;
+import org.apache.mina.core.write.WriteRequest;
+import org.apache.mina.core.write.WriteRequestWrapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecSession.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecSession.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecSession.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecSession.java Thu Jun 26 01:49:48 2008
@@ -21,11 +21,11 @@
import java.util.Queue;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.future.DefaultWriteFuture;
-import org.apache.mina.common.future.WriteFuture;
-import org.apache.mina.common.session.DummySession;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.future.DefaultWriteFuture;
+import org.apache.mina.core.future.WriteFuture;
+import org.apache.mina.core.session.DummySession;
+import org.apache.mina.core.session.IoSession;
/**
* A virtual {@link IoSession} that provides {@link ProtocolEncoderOutput}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolDecoder.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolDecoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolDecoder.java Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.filter.codec;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
/**
* Decodes binary or protocol-specific data into higher-level message objects.
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolDecoderAdapter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolDecoderAdapter.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolDecoderAdapter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolDecoderAdapter.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
/**
* An abstract {@link ProtocolDecoder} implementation for those who don't need
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolDecoderException.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolDecoderException.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolDecoderException.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolDecoderException.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec;
-import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.core.buffer.IoBuffer;
/**
* An exception that is thrown when {@link ProtocolDecoder}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoder.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoder.java Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.filter.codec;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
/**
* Encodes higher-level message objects into binary or protocol-specific data.
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoderAdapter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoderAdapter.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoderAdapter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoderAdapter.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
/**
* An abstract {@link ProtocolEncoder} implementation for those who don't have any
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoderOutput.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoderOutput.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoderOutput.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolEncoderOutput.java Thu Jun 26 01:49:48 2008
@@ -19,9 +19,9 @@
*/
package org.apache.mina.filter.codec;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.file.FileRegion;
-import org.apache.mina.common.future.WriteFuture;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.file.FileRegion;
+import org.apache.mina.core.future.WriteFuture;
/**
* Callback for {@link ProtocolEncoder} to generate encoded messages such as
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/RecoverableProtocolDecoderException.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/RecoverableProtocolDecoderException.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/RecoverableProtocolDecoderException.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/RecoverableProtocolDecoderException.java Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.filter.codec;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
/**
* A special exception that tells the {@link ProtocolDecoder} can keep
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/SynchronizedProtocolDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/SynchronizedProtocolDecoder.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/SynchronizedProtocolDecoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/SynchronizedProtocolDecoder.java Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.filter.codec;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
/**
* A {@link ProtocolDecoder} implementation which decorates an existing decoder
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/SynchronizedProtocolEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/SynchronizedProtocolEncoder.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/SynchronizedProtocolEncoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/SynchronizedProtocolEncoder.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
/**
* A {@link ProtocolEncoder} implementation which decorates an existing encoder
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec.demux;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolEncoder;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolDecoder.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolDecoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolDecoder.java Thu Jun 26 01:49:48 2008
@@ -19,9 +19,9 @@
*/
package org.apache.mina.filter.codec.demux;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.session.AttributeKey;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.AttributeKey;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderException;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolEncoder.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolEncoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolEncoder.java Thu Jun 26 01:49:48 2008
@@ -23,9 +23,9 @@
import java.util.Map;
import java.util.Set;
-import org.apache.mina.common.session.AttributeKey;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.session.UnknownMessageTypeException;
+import org.apache.mina.core.session.AttributeKey;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.session.UnknownMessageTypeException;
import org.apache.mina.filter.codec.ProtocolEncoder;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
import org.apache.mina.util.CopyOnWriteMap;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoder.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoder.java Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.filter.codec.demux;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoderAdapter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoderAdapter.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoderAdapter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoderAdapter.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec.demux;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoderResult.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoderResult.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoderResult.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoderResult.java Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.filter.codec.demux;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/demux/MessageEncoder.java Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.filter.codec.demux;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/prefixedstring/PrefixedStringCodecFactory.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/prefixedstring/PrefixedStringCodecFactory.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/prefixedstring/PrefixedStringCodecFactory.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/prefixedstring/PrefixedStringCodecFactory.java Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.filter.codec.prefixedstring;
-import org.apache.mina.common.buffer.BufferDataException;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.BufferDataException;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolEncoder;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/prefixedstring/PrefixedStringDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/prefixedstring/PrefixedStringDecoder.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/prefixedstring/PrefixedStringDecoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/prefixedstring/PrefixedStringDecoder.java Thu Jun 26 01:49:48 2008
@@ -19,9 +19,9 @@
*/
package org.apache.mina.filter.codec.prefixedstring;
-import org.apache.mina.common.buffer.BufferDataException;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.BufferDataException;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/prefixedstring/PrefixedStringEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/prefixedstring/PrefixedStringEncoder.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/prefixedstring/PrefixedStringEncoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/prefixedstring/PrefixedStringEncoder.java Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.filter.codec.prefixedstring;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
import org.apache.mina.filter.codec.ProtocolEncoder;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationCodecFactory.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationCodecFactory.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationCodecFactory.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationCodecFactory.java Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.filter.codec.serialization;
-import org.apache.mina.common.buffer.BufferDataException;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.BufferDataException;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolEncoder;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationDecoder.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationDecoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationDecoder.java Thu Jun 26 01:49:48 2008
@@ -21,9 +21,9 @@
import java.io.Serializable;
-import org.apache.mina.common.buffer.BufferDataException;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.BufferDataException;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationEncoder.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationEncoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationEncoder.java Thu Jun 26 01:49:48 2008
@@ -22,8 +22,8 @@
import java.io.NotSerializableException;
import java.io.Serializable;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoder;
import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationInputStream.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationInputStream.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationInputStream.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationInputStream.java Thu Jun 26 01:49:48 2008
@@ -26,8 +26,8 @@
import java.io.ObjectInput;
import java.io.StreamCorruptedException;
-import org.apache.mina.common.buffer.BufferDataException;
-import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.core.buffer.BufferDataException;
+import org.apache.mina.core.buffer.IoBuffer;
/**
* An {@link ObjectInput} and {@link InputStream} that can read the objects encoded
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationOutputStream.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationOutputStream.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationOutputStream.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/serialization/ObjectSerializationOutputStream.java Thu Jun 26 01:49:48 2008
@@ -24,7 +24,7 @@
import java.io.ObjectOutput;
import java.io.OutputStream;
-import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.core.buffer.IoBuffer;
/**
* An {@link ObjectOutput} and {@link OutputStream} that can write the objects as
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToCrLfDecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToCrLfDecodingState.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToCrLfDecodingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToCrLfDecodingState.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec.statemachine;
-import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDynamicTerminatorDecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDynamicTerminatorDecodingState.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDynamicTerminatorDecodingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDynamicTerminatorDecodingState.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec.statemachine;
-import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToEndOfSessionDecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToEndOfSessionDecodingState.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToEndOfSessionDecodingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToEndOfSessionDecodingState.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec.statemachine;
-import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToTerminatorDecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToTerminatorDecodingState.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToTerminatorDecodingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToTerminatorDecodingState.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec.statemachine;
-import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/CrLfDecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/CrLfDecodingState.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/CrLfDecodingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/CrLfDecodingState.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec.statemachine;
-import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingState.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingState.java Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.filter.codec.statemachine;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateMachine.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateMachine.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateMachine.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateMachine.java Thu Jun 26 01:49:48 2008
@@ -22,7 +22,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.slf4j.Logger;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateProtocolDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateProtocolDecoder.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateProtocolDecoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateProtocolDecoder.java Thu Jun 26 01:49:48 2008
@@ -21,8 +21,8 @@
import java.util.Queue;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.util.CircularQueue;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/FixedLengthDecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/FixedLengthDecodingState.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/FixedLengthDecodingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/FixedLengthDecodingState.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec.statemachine;
-import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/IntegerDecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/IntegerDecodingState.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/IntegerDecodingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/IntegerDecodingState.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec.statemachine;
-import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ShortIntegerDecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ShortIntegerDecodingState.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ShortIntegerDecodingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ShortIntegerDecodingState.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec.statemachine;
-import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SingleByteDecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SingleByteDecodingState.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SingleByteDecodingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SingleByteDecodingState.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec.statemachine;
-import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SkippingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SkippingState.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SkippingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SkippingState.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.codec.statemachine;
-import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineCodecFactory.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineCodecFactory.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineCodecFactory.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineCodecFactory.java Thu Jun 26 01:49:48 2008
@@ -21,8 +21,8 @@
import java.nio.charset.Charset;
-import org.apache.mina.common.buffer.BufferDataException;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.BufferDataException;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolEncoder;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineDecoder.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineDecoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineDecoder.java Thu Jun 26 01:49:48 2008
@@ -23,10 +23,10 @@
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
-import org.apache.mina.common.buffer.BufferDataException;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.session.AttributeKey;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.BufferDataException;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.AttributeKey;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineEncoder.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineEncoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/textline/TextLineEncoder.java Thu Jun 26 01:49:48 2008
@@ -22,9 +22,9 @@
import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.session.AttributeKey;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.AttributeKey;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoder;
import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/errorgenerating/ErrorGeneratingFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/errorgenerating/ErrorGeneratingFilter.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/errorgenerating/ErrorGeneratingFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/errorgenerating/ErrorGeneratingFilter.java Thu Jun 26 01:49:48 2008
@@ -22,12 +22,12 @@
import java.util.Random;
-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.session.IoSession;
-import org.apache.mina.common.write.DefaultWriteRequest;
-import org.apache.mina.common.write.WriteRequest;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.core.filterchain.IoFilterAdapter;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.write.DefaultWriteRequest;
+import org.apache.mina.core.write.WriteRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/executor/DefaultIoEventSizeEstimator.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/executor/DefaultIoEventSizeEstimator.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/executor/DefaultIoEventSizeEstimator.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/executor/DefaultIoEventSizeEstimator.java Thu Jun 26 01:49:48 2008
@@ -26,9 +26,9 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.session.IoEvent;
-import org.apache.mina.common.write.WriteRequest;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoEvent;
+import org.apache.mina.core.write.WriteRequest;
/**
* A default {@link IoEventSizeEstimator} implementation.
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java Thu Jun 26 01:49:48 2008
@@ -29,13 +29,13 @@
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
-import org.apache.mina.common.filterchain.IoFilterAdapter;
-import org.apache.mina.common.filterchain.IoFilterChain;
-import org.apache.mina.common.filterchain.IoFilterEvent;
-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.WriteRequest;
+import org.apache.mina.core.filterchain.IoFilterAdapter;
+import org.apache.mina.core.filterchain.IoFilterChain;
+import org.apache.mina.core.filterchain.IoFilterEvent;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoEventType;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.write.WriteRequest;
/**
* A filter that forwards I/O events to {@link Executor} to enforce a certain
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/executor/IoEventQueueHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/executor/IoEventQueueHandler.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/executor/IoEventQueueHandler.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/executor/IoEventQueueHandler.java Thu Jun 26 01:49:48 2008
@@ -21,7 +21,7 @@
import java.util.EventListener;
-import org.apache.mina.common.session.IoEvent;
+import org.apache.mina.core.session.IoEvent;
/**
* Listens and filters all event queue operations occurring in
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/executor/IoEventQueueThrottle.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/executor/IoEventQueueThrottle.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/executor/IoEventQueueThrottle.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/executor/IoEventQueueThrottle.java Thu Jun 26 01:49:48 2008
@@ -21,7 +21,7 @@
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.mina.common.session.IoEvent;
+import org.apache.mina.core.session.IoEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/executor/IoEventSizeEstimator.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/executor/IoEventSizeEstimator.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/executor/IoEventSizeEstimator.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/executor/IoEventSizeEstimator.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.executor;
-import org.apache.mina.common.session.IoEvent;
+import org.apache.mina.core.session.IoEvent;
/**
* Estimates the amount of memory that the specified {@link IoEvent} occupies
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java Thu Jun 26 01:49:48 2008
@@ -34,10 +34,10 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.mina.common.session.AttributeKey;
-import org.apache.mina.common.session.DummySession;
-import org.apache.mina.common.session.IoEvent;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.AttributeKey;
+import org.apache.mina.core.session.DummySession;
+import org.apache.mina.core.session.IoEvent;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.util.CircularQueue;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/executor/UnorderedThreadPoolExecutor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/executor/UnorderedThreadPoolExecutor.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/executor/UnorderedThreadPoolExecutor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/executor/UnorderedThreadPoolExecutor.java Thu Jun 26 01:49:48 2008
@@ -31,7 +31,7 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.mina.common.session.IoEvent;
+import org.apache.mina.core.session.IoEvent;
/**
* A {@link ThreadPoolExecutor} that does not maintain the order of {@link IoEvent}s.
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/executor/WriteRequestFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/executor/WriteRequestFilter.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/executor/WriteRequestFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/executor/WriteRequestFilter.java Thu Jun 26 01:49:48 2008
@@ -19,14 +19,14 @@
*/
package org.apache.mina.filter.executor;
-import org.apache.mina.common.filterchain.IoFilterAdapter;
-import org.apache.mina.common.future.IoFutureListener;
-import org.apache.mina.common.future.WriteFuture;
-import org.apache.mina.common.service.IoProcessor;
-import org.apache.mina.common.session.IoEvent;
-import org.apache.mina.common.session.IoEventType;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.write.WriteRequest;
+import org.apache.mina.core.filterchain.IoFilterAdapter;
+import org.apache.mina.core.future.IoFutureListener;
+import org.apache.mina.core.future.WriteFuture;
+import org.apache.mina.core.service.IoProcessor;
+import org.apache.mina.core.session.IoEvent;
+import org.apache.mina.core.session.IoEventType;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.write.WriteRequest;
/**
* Attaches an {@link IoEventQueueHandler} to an {@link IoSession}'s
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?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- 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 Thu Jun 26 01:49:48 2008
@@ -25,11 +25,11 @@
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-import org.apache.mina.common.filterchain.IoFilter;
-import org.apache.mina.common.filterchain.IoFilterAdapter;
-import org.apache.mina.common.session.IdleStatus;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.write.WriteRequest;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.core.filterchain.IoFilterAdapter;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.write.WriteRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- 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 Thu Jun 26 01:49:48 2008
@@ -25,9 +25,9 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.mina.common.filterchain.IoFilter;
-import org.apache.mina.common.filterchain.IoFilterAdapter;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.core.filterchain.IoFilterAdapter;
+import org.apache.mina.core.session.IoSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveFilter.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveFilter.java Thu Jun 26 01:49:48 2008
@@ -19,17 +19,17 @@
*/
package org.apache.mina.filter.keepalive;
-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.service.IoHandler;
-import org.apache.mina.common.session.AttributeKey;
-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.session.IoSessionConfig;
-import org.apache.mina.common.write.DefaultWriteRequest;
-import org.apache.mina.common.write.WriteRequest;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.core.filterchain.IoFilterAdapter;
+import org.apache.mina.core.filterchain.IoFilterChain;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.core.session.AttributeKey;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoEventType;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.session.IoSessionConfig;
+import org.apache.mina.core.write.DefaultWriteRequest;
+import org.apache.mina.core.write.WriteRequest;
/**
* An {@link IoFilter} that sends a keep-alive request on
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveMessageFactory.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveMessageFactory.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveMessageFactory.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveMessageFactory.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.keepalive;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
/**
* Provides keep-alive messages to {@link KeepAliveFilter}.
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveRequestTimeoutHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveRequestTimeoutHandler.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveRequestTimeoutHandler.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveRequestTimeoutHandler.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.keepalive;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- 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 Thu Jun 26 01:49:48 2008
@@ -21,12 +21,12 @@
import java.util.Map;
-import org.apache.mina.common.filterchain.IoFilter;
-import org.apache.mina.common.filterchain.IoFilterAdapter;
-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.WriteRequest;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.core.filterchain.IoFilterAdapter;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoEventType;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.write.WriteRequest;
import org.apache.mina.util.CopyOnWriteMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java Thu Jun 26 01:49:48 2008
@@ -27,9 +27,9 @@
import java.util.Arrays;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.mina.common.filterchain.IoFilterEvent;
-import org.apache.mina.common.session.AttributeKey;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.filterchain.IoFilterEvent;
+import org.apache.mina.core.session.AttributeKey;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.util.CommonEventFilter;
import org.slf4j.MDC;
@@ -95,7 +95,7 @@
* You could still add custom keys via {@link #setProperty(IoSession, String, String)}
* @param keys set of keys that should be added to the MDC
*
- * @see #setProperty(org.apache.mina.common.session.IoSession, String, String)
+ * @see #setProperty(org.apache.mina.core.session.IoSession, String, String)
*/
public MdcInjectionFilter(EnumSet<MdcKey> keys) {
this.mdcKeys = keys.clone();
@@ -106,7 +106,7 @@
* You could still add custom keys via {@link #setProperty(IoSession, String, String)}
* @param keys list of keys that should be added to the MDC
*
- * @see #setProperty(org.apache.mina.common.session.IoSession, String, String)
+ * @see #setProperty(org.apache.mina.core.session.IoSession, String, String)
*/
public MdcInjectionFilter(MdcKey... keys) {
Set<MdcKey> keySet = new HashSet<MdcKey>(Arrays.asList(keys));
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?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- 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 Thu Jun 26 01:49:48 2008
@@ -30,10 +30,10 @@
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
-import org.apache.mina.common.filterchain.IoFilterChain;
-import org.apache.mina.common.session.AttributeKey;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.write.WriteRequest;
+import org.apache.mina.core.filterchain.IoFilterChain;
+import org.apache.mina.core.session.AttributeKey;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.write.WriteRequest;
import org.apache.mina.filter.util.WriteRequestFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/reqres/RequestTimeoutException.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/reqres/RequestTimeoutException.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/reqres/RequestTimeoutException.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/reqres/RequestTimeoutException.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.filter.reqres;
-import org.apache.mina.common.RuntimeIoException;
+import org.apache.mina.core.RuntimeIoException;
/**
* An {@link RuntimeIoException} which is thrown when a {@link Request} is timed out.
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?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- 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 Thu Jun 26 01:49:48 2008
@@ -29,19 +29,19 @@
import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.SSLSession;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.filterchain.IoFilterAdapter;
-import org.apache.mina.common.filterchain.IoFilterChain;
-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.future.WriteFuture;
-import org.apache.mina.common.service.IoHandler;
-import org.apache.mina.common.session.AttributeKey;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.write.WriteRequest;
-import org.apache.mina.common.write.WriteRequestWrapper;
-import org.apache.mina.common.write.WriteToClosedSessionException;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.filterchain.IoFilterAdapter;
+import org.apache.mina.core.filterchain.IoFilterChain;
+import org.apache.mina.core.future.DefaultWriteFuture;
+import org.apache.mina.core.future.IoFuture;
+import org.apache.mina.core.future.IoFutureListener;
+import org.apache.mina.core.future.WriteFuture;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.core.session.AttributeKey;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.write.WriteRequest;
+import org.apache.mina.core.write.WriteRequestWrapper;
+import org.apache.mina.core.write.WriteToClosedSessionException;
/**
* 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?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- 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 Thu Jun 26 01:49:48 2008
@@ -30,15 +30,15 @@
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLHandshakeException;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.filterchain.IoFilterEvent;
-import org.apache.mina.common.filterchain.IoFilter.NextFilter;
-import org.apache.mina.common.future.DefaultWriteFuture;
-import org.apache.mina.common.future.WriteFuture;
-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.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.filterchain.IoFilterEvent;
+import org.apache.mina.core.filterchain.IoFilter.NextFilter;
+import org.apache.mina.core.future.DefaultWriteFuture;
+import org.apache.mina.core.future.WriteFuture;
+import org.apache.mina.core.session.IoEventType;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.write.DefaultWriteRequest;
+import org.apache.mina.core.write.WriteRequest;
import org.apache.mina.util.CircularQueue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/statistic/ProfilerTimerFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/statistic/ProfilerTimerFilter.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/statistic/ProfilerTimerFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/statistic/ProfilerTimerFilter.java Thu Jun 26 01:49:48 2008
@@ -26,11 +26,11 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.mina.common.filterchain.IoFilterAdapter;
-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.WriteRequest;
+import org.apache.mina.core.filterchain.IoFilterAdapter;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoEventType;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.write.WriteRequest;
import org.apache.mina.util.CopyOnWriteMap;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/stream/AbstractStreamWriteFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/stream/AbstractStreamWriteFilter.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/stream/AbstractStreamWriteFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/stream/AbstractStreamWriteFilter.java Thu Jun 26 01:49:48 2008
@@ -22,13 +22,13 @@
import java.io.IOException;
import java.util.Queue;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.filterchain.IoFilterAdapter;
-import org.apache.mina.common.filterchain.IoFilterChain;
-import org.apache.mina.common.session.AttributeKey;
-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.core.buffer.IoBuffer;
+import org.apache.mina.core.filterchain.IoFilterAdapter;
+import org.apache.mina.core.filterchain.IoFilterChain;
+import org.apache.mina.core.session.AttributeKey;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.write.DefaultWriteRequest;
+import org.apache.mina.core.write.WriteRequest;
import org.apache.mina.util.CircularQueue;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/stream/FileRegionWriteFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/stream/FileRegionWriteFilter.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/stream/FileRegionWriteFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/stream/FileRegionWriteFilter.java Thu Jun 26 01:49:48 2008
@@ -21,11 +21,11 @@
import java.io.IOException;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.file.FileRegion;
-import org.apache.mina.common.filterchain.IoFilter;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.write.WriteRequest;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.file.FileRegion;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.write.WriteRequest;
/**
* Filter implementation that converts a {@link FileRegion} to {@link IoBuffer}
@@ -33,10 +33,10 @@
* {@code FileRegion} has been reached this filter will call
* {@link IoFilter.NextFilter#messageSent(IoSession,WriteRequest)} using the
* original {@link FileRegion} written to the session and notifies
- * {@link org.apache.mina.common.future.WriteFuture} on the original
- * {@link org.apache.mina.common.write.WriteRequest}.
+ * {@link org.apache.mina.core.future.WriteFuture} on the original
+ * {@link org.apache.mina.core.write.WriteRequest}.
* <p>Normall {@code FileRegion} objects should be handled by the
- * {@link org.apache.mina.common.service.IoProcessor} but this is not always possible
+ * {@link org.apache.mina.core.service.IoProcessor} but this is not always possible
* if a filter is being used that needs to modify the contents of the file
* before sending over the network (i.e. the
* {@link org.apache.mina.filter.ssl.SslFilter} or a data compression filter.)
@@ -47,8 +47,8 @@
* <p><b>NOTE:</b> this filter does not close the file channel in
* {@link FileRegion#getFileChannel()} after the data from the file has been
* written. The {@code FileChannel} should be closed in either
- * {@link org.apache.mina.common.service.IoHandler#messageSent(IoSession,Object)}
- * or in an {@link org.apache.mina.common.future.IoFutureListener} associated with the
+ * {@link org.apache.mina.core.service.IoHandler#messageSent(IoSession,Object)}
+ * or in an {@link org.apache.mina.core.future.IoFutureListener} associated with the
* {@code WriteFuture}.
* </p>
*