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 [5/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/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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -25,12 +25,12 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-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.core.buffer.IoBuffer;
+import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.service.IoAcceptor;
+import org.apache.mina.core.service.IoConnector;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -27,11 +27,11 @@
import junit.framework.TestCase;
-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.core.future.ConnectFuture;
+import org.apache.mina.core.service.IoAcceptor;
+import org.apache.mina.core.service.IoConnector;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -21,9 +21,9 @@
import java.net.SocketAddress;
-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.core.future.ConnectFuture;
+import org.apache.mina.core.service.IoConnector;
+import org.apache.mina.core.service.IoHandler;
import org.apache.mina.transport.AbstractTrafficControlTest;
/**
Modified: mina/trunk/core/src/test/java/org/apache/mina/util/Bar.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/util/Bar.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/util/Bar.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/util/Bar.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.util;
-import org.apache.mina.common.IoBufferTest;
+import org.apache.mina.core.IoBufferTest;
/**
* The subtype of {@link Foo}. It is used to test the serialization of inherited object
Modified: mina/trunk/core/src/test/java/org/apache/mina/util/Foo.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/util/Foo.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/util/Foo.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/util/Foo.java Thu Jun 26 01:49:48 2008
@@ -21,7 +21,7 @@
import java.io.Serializable;
-import org.apache.mina.common.IoBufferTest;
+import org.apache.mina.core.IoBufferTest;
/**
* The parent class of {@link Bar}. It is used to test the serialization of inherited object
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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -19,9 +19,9 @@
*/
package org.apache.mina.util;
-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.core.filterchain.IoFilter;
+import org.apache.mina.core.filterchain.IoFilterAdapter;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -23,9 +23,9 @@
import java.util.HashSet;
import java.util.Set;
-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.core.service.IoHandler;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -21,7 +21,7 @@
import java.net.InetSocketAddress;
-import org.apache.mina.common.filterchain.DefaultIoFilterChainBuilder;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -23,9 +23,9 @@
import javax.net.ssl.SSLContext;
-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.core.future.ConnectFuture;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -19,10 +19,10 @@
*/
package org.apache.mina.example.chat.client;
-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.core.filterchain.IoFilter;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -19,11 +19,11 @@
*/
package org.apache.mina.example.echoserver;
-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.core.buffer.IoBuffer;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -21,7 +21,7 @@
import java.net.InetSocketAddress;
-import org.apache.mina.common.filterchain.DefaultIoFilterChainBuilder;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -23,8 +23,8 @@
import java.net.InetSocketAddress;
import java.nio.charset.Charset;
-import org.apache.mina.common.service.IoAcceptor;
-import org.apache.mina.common.session.IdleStatus;
+import org.apache.mina.core.service.IoAcceptor;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -21,9 +21,9 @@
import java.util.Date;
-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.core.service.IoHandlerAdapter;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -19,10 +19,10 @@
*/
package org.apache.mina.example.imagine.step1.client;
-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.core.RuntimeIoException;
+import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 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.session.IoSession;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.example.imagine.step1.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;
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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.example.imagine.step1.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;
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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -21,8 +21,8 @@
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
-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.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -21,8 +21,8 @@
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
-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.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.example.imagine.step1.server;
-import org.apache.mina.common.service.IoHandlerAdapter;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.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.service.IoHandler}
+ * server-side {@link org.apache.mina.core.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.service.IoHandlerAdapter#sessionOpened(org.apache.mina.common.session.IoSession)
+ * @see org.apache.mina.core.service.IoHandlerAdapter#sessionOpened(org.apache.mina.core.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.service.IoHandlerAdapter#exceptionCaught(org.apache.mina.common.session.IoSession, java.lang.Throwable)
+ * @see org.apache.mina.core.service.IoHandlerAdapter#exceptionCaught(org.apache.mina.core.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.service.IoHandlerAdapter#messageReceived(org.apache.mina.common.session.IoSession, java.lang.Object)
+ * @see org.apache.mina.core.service.IoHandlerAdapter#messageReceived(org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -23,7 +23,7 @@
import java.net.InetSocketAddress;
import java.util.concurrent.Executors;
-import org.apache.mina.common.filterchain.DefaultIoFilterChainBuilder;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -26,7 +26,7 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.mina.common.filterchain.DefaultIoFilterChainBuilder;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -27,8 +27,8 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.mina.common.service.IoHandlerAdapter;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.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.service.IoHandler}
+ * server-side {@link org.apache.mina.core.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.service.IoHandlerAdapter#sessionCreated(org.apache.mina.common.session.IoSession)
+ * @see org.apache.mina.core.service.IoHandlerAdapter#sessionCreated(org.apache.mina.core.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.service.IoHandlerAdapter#sessionOpened(org.apache.mina.common.session.IoSession)
+ * @see org.apache.mina.core.service.IoHandlerAdapter#sessionOpened(org.apache.mina.core.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.service.IoHandlerAdapter#exceptionCaught(org.apache.mina.common.session.IoSession, java.lang.Throwable)
+ * @see org.apache.mina.core.service.IoHandlerAdapter#exceptionCaught(org.apache.mina.core.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.service.IoHandlerAdapter#messageReceived(org.apache.mina.common.session.IoSession, java.lang.Object)
+ * @see org.apache.mina.core.service.IoHandlerAdapter#messageReceived(org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -21,7 +21,7 @@
import java.net.InetSocketAddress;
-import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -19,11 +19,11 @@
*/
package org.apache.mina.example.netcat;
-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.core.buffer.IoBuffer;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -21,15 +21,15 @@
import java.nio.charset.Charset;
-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.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.session.TrafficMask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Base class of {@link org.apache.mina.common.service.IoHandler} classes which handle
+ * Base class of {@link org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -21,12 +21,12 @@
import java.net.SocketAddress;
-import org.apache.mina.common.RuntimeIoException;
-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;
+import org.apache.mina.core.RuntimeIoException;
+import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.future.IoFutureListener;
+import org.apache.mina.core.service.IoConnector;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -21,7 +21,7 @@
import java.net.InetSocketAddress;
-import org.apache.mina.common.service.IoConnector;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -19,9 +19,9 @@
*/
package org.apache.mina.example.reverser;
-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.core.service.IoHandler;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -21,9 +21,9 @@
import java.net.InetSocketAddress;
-import org.apache.mina.common.RuntimeIoException;
-import org.apache.mina.common.future.ConnectFuture;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.RuntimeIoException;
+import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -19,9 +19,9 @@
*/
package org.apache.mina.example.sumup;
-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.core.service.IoHandler;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -19,10 +19,10 @@
*/
package org.apache.mina.example.sumup;
-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.core.service.IoHandler;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.example.sumup.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;
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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.example.sumup.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;
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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.example.sumup.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;
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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.example.sumup.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;
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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.example.sumup.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;
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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
*/
package org.apache.mina.example.sumup.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;
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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -21,10 +21,10 @@
import static org.apache.mina.statemachine.event.IoFilterEvents.*;
-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.core.filterchain.IoFilter.NextFilter;
+import org.apache.mina.core.future.IoFutureListener;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.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=671827&r1=671826&r2=671827&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 Thu Jun 26 01:49:48 2008
@@ -22,8 +22,8 @@
import java.nio.charset.Charset;
import java.util.LinkedList;
-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.filter.codec.textline.LineDelimiter;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/Main.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/Main.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/Main.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/Main.java Thu Jun 26 01:49:48 2008
@@ -21,8 +21,8 @@
import java.net.InetSocketAddress;
-import org.apache.mina.common.filterchain.IoFilter;
-import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.core.service.IoHandler;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.textline.TextLineEncoder;
import org.apache.mina.filter.logging.LoggingFilter;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/TapeDeckServer.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/TapeDeckServer.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/TapeDeckServer.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/tapedeck/TapeDeckServer.java Thu Jun 26 01:49:48 2008
@@ -21,8 +21,8 @@
import static org.apache.mina.statemachine.event.IoHandlerEvents.*;
-import org.apache.mina.common.future.IoFutureListener;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.future.IoFutureListener;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.statemachine.StateControl;
import org.apache.mina.statemachine.annotation.IoHandlerTransition;
import org.apache.mina.statemachine.annotation.IoHandlerTransitions;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/tennis/Main.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/tennis/Main.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/tennis/Main.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/tennis/Main.java Thu Jun 26 01:49:48 2008
@@ -19,9 +19,9 @@
*/
package org.apache.mina.example.tennis;
-import org.apache.mina.common.future.ConnectFuture;
-import org.apache.mina.common.service.IoAcceptor;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.service.IoAcceptor;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.transport.vmpipe.VmPipeAcceptor;
import org.apache.mina.transport.vmpipe.VmPipeAddress;
import org.apache.mina.transport.vmpipe.VmPipeConnector;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/tennis/TennisPlayer.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/tennis/TennisPlayer.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/tennis/TennisPlayer.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/tennis/TennisPlayer.java Thu Jun 26 01:49:48 2008
@@ -19,9 +19,9 @@
*/
package org.apache.mina.example.tennis;
-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.core.service.IoHandler;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.session.IoSession;
/**
* A {@link IoHandler} implementation which plays a tennis game.
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java Thu Jun 26 01:49:48 2008
@@ -31,7 +31,7 @@
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
-import org.apache.mina.common.filterchain.DefaultIoFilterChainBuilder;
+import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.transport.socket.DatagramSessionConfig;
import org.apache.mina.transport.socket.nio.NioDatagramAcceptor;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitorHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitorHandler.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitorHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitorHandler.java Thu Jun 26 01:49:48 2008
@@ -21,10 +21,10 @@
import java.net.SocketAddress;
-import org.apache.mina.common.buffer.IoBuffer;
-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.core.buffer.IoBuffer;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
/**
* Class the extends IoHandlerAdapter in order to properly handle
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/udp/client/MemMonClient.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/udp/client/MemMonClient.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/udp/client/MemMonClient.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/udp/client/MemMonClient.java Thu Jun 26 01:49:48 2008
@@ -21,13 +21,13 @@
import java.net.InetSocketAddress;
-import org.apache.mina.common.buffer.IoBuffer;
-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.service.IoHandlerAdapter;
-import org.apache.mina.common.session.IdleStatus;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.future.IoFutureListener;
+import org.apache.mina.core.service.IoConnector;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.example.udp.MemoryMonitor;
import org.apache.mina.transport.socket.nio.NioDatagramConnector;
import org.slf4j.Logger;
Modified: mina/trunk/example/src/main/resources/org/apache/mina/example/chat/serverContext.xml
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/resources/org/apache/mina/example/chat/serverContext.xml?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/example/src/main/resources/org/apache/mina/example/chat/serverContext.xml (original)
+++ mina/trunk/example/src/main/resources/org/apache/mina/example/chat/serverContext.xml Thu Jun 26 01:49:48 2008
@@ -80,7 +80,7 @@
</bean>
<!-- The non-SSL filter chain. -->
- <bean id="filterChainBuilder" class="org.apache.mina.common.filterchain.DefaultIoFilterChainBuilder">
+ <bean id="filterChainBuilder" class="org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder">
<property name="filters">
<map>
<entry key="executor" value-ref="executorFilter"/>
@@ -92,7 +92,7 @@
</bean>
<!-- The SSL filter chain. -->
- <bean id="sslFilterChainBuilder" class="org.apache.mina.common.filterchain.DefaultIoFilterChainBuilder">
+ <bean id="sslFilterChainBuilder" class="org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder">
<property name="filters">
<map>
<entry key="executor" value-ref="executorFilter"/>
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/chat/SpringMainTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/chat/SpringMainTest.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/chat/SpringMainTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/chat/SpringMainTest.java Thu Jun 26 01:49:48 2008
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
import org.springframework.context.ConfigurableApplicationContext;
-import org.apache.mina.common.service.IoService;
+import org.apache.mina.core.service.IoService;
/**
* TODO Add documentation
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java Thu Jun 26 01:49:48 2008
@@ -25,9 +25,9 @@
import junit.framework.TestCase;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.service.IoAcceptor;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.service.IoAcceptor;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.example.echoserver.ssl.BogusSslContextFactory;
import org.apache.mina.filter.ssl.SslFilter;
import org.apache.mina.transport.socket.DatagramSessionConfig;
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java Thu Jun 26 01:49:48 2008
@@ -23,14 +23,14 @@
import junit.framework.Assert;
-import org.apache.mina.common.RuntimeIoException;
-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.IoConnector;
-import org.apache.mina.common.service.IoHandlerAdapter;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.write.WriteException;
+import org.apache.mina.core.RuntimeIoException;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.future.WriteFuture;
+import org.apache.mina.core.service.IoConnector;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.write.WriteException;
import org.apache.mina.example.echoserver.ssl.BogusSslContextFactory;
import org.apache.mina.filter.ssl.SslFilter;
import org.apache.mina.transport.socket.nio.NioDatagramConnector;
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java Thu Jun 26 01:49:48 2008
@@ -33,8 +33,8 @@
import junit.framework.TestCase;
-import org.apache.mina.common.service.IoHandlerAdapter;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
import org.apache.mina.filter.ssl.SslFilter;
Modified: mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyCodecFactory.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyCodecFactory.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyCodecFactory.java (original)
+++ mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyCodecFactory.java Thu Jun 26 01:49:48 2008
@@ -22,7 +22,7 @@
import net.gleamynode.netty2.Message;
import net.gleamynode.netty2.MessageRecognizer;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
/**
Modified: mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyDecoder.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyDecoder.java (original)
+++ mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyDecoder.java Thu Jun 26 01:49:48 2008
@@ -25,8 +25,8 @@
import net.gleamynode.netty2.MessageParseException;
import net.gleamynode.netty2.MessageRecognizer;
-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.ProtocolDecoderAdapter;
import org.apache.mina.filter.codec.ProtocolDecoderException;
Modified: mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyEncoder.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyEncoder.java (original)
+++ mina/trunk/filter-codec-netty/src/main/java/org/apache/mina/filter/codec/netty/NettyEncoder.java Thu Jun 26 01:49:48 2008
@@ -21,8 +21,8 @@
import net.gleamynode.netty2.Message;
-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.ProtocolEncoderException;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
Modified: mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/compression/CompressionFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/compression/CompressionFilter.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/compression/CompressionFilter.java (original)
+++ mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/compression/CompressionFilter.java Thu Jun 26 01:49:48 2008
@@ -21,12 +21,12 @@
import java.io.IOException;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.filterchain.IoFilter;
-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.buffer.IoBuffer;
+import org.apache.mina.core.filterchain.IoFilter;
+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;
/**
@@ -159,7 +159,7 @@
}
/*
- * @see org.apache.mina.common.IoFilter#filterWrite(org.apache.mina.common.IoFilter.NextFilter, org.apache.mina.common.IoSession, org.apache.mina.common.IoFilter.WriteRequest)
+ * @see org.apache.mina.core.IoFilter#filterWrite(org.apache.mina.core.IoFilter.NextFilter, org.apache.mina.core.IoSession, org.apache.mina.core.IoFilter.WriteRequest)
*/
@Override
protected Object doFilterWrite(
Modified: mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/compression/Zlib.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/compression/Zlib.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/compression/Zlib.java (original)
+++ mina/trunk/filter-compression/src/main/java/org/apache/mina/filter/compression/Zlib.java Thu Jun 26 01:49:48 2008
@@ -21,7 +21,7 @@
import java.io.IOException;
-import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.core.buffer.IoBuffer;
import com.jcraft.jzlib.JZlib;
import com.jcraft.jzlib.ZStream;
Modified: mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/CompressionFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/CompressionFilterTest.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/CompressionFilterTest.java (original)
+++ mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/CompressionFilterTest.java Thu Jun 26 01:49:48 2008
@@ -21,12 +21,12 @@
import junit.framework.TestCase;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.filterchain.IoFilterChain;
-import org.apache.mina.common.filterchain.IoFilter.NextFilter;
-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.IoFilterChain;
+import org.apache.mina.core.filterchain.IoFilter.NextFilter;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.write.DefaultWriteRequest;
+import org.apache.mina.core.write.WriteRequest;
import org.easymock.AbstractMatcher;
import org.easymock.MockControl;
Modified: mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/ZlibTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/ZlibTest.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/ZlibTest.java (original)
+++ mina/trunk/filter-compression/src/test/java/org/apache/mina/filter/compression/ZlibTest.java Thu Jun 26 01:49:48 2008
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
-import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.core.buffer.IoBuffer;
/**
* @author The Apache MINA Project (dev@mina.apache.org)
Modified: mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/TrafficMaskEditor.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/TrafficMaskEditor.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/TrafficMaskEditor.java (original)
+++ mina/trunk/integration-beans/src/main/java/org/apache/mina/integration/beans/TrafficMaskEditor.java Thu Jun 26 01:49:48 2008
@@ -21,7 +21,7 @@
import java.beans.PropertyEditor;
-import org.apache.mina.common.session.TrafficMask;
+import org.apache.mina.core.session.TrafficMask;
/**
* A {@link PropertyEditor} which converts a {@link String} into a
Modified: mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoFilterMBean.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoFilterMBean.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoFilterMBean.java (original)
+++ mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoFilterMBean.java Thu Jun 26 01:49:48 2008
@@ -16,8 +16,8 @@
*/
package org.apache.mina.integration.jmx;
-import org.apache.mina.common.filterchain.IoFilter;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.core.session.IoSession;
/**
* A JMX MBean wrapper for an {@link IoSession}.
Modified: mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoServiceMBean.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoServiceMBean.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoServiceMBean.java (original)
+++ mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoServiceMBean.java Thu Jun 26 01:49:48 2008
@@ -28,8 +28,8 @@
import ognl.Ognl;
-import org.apache.mina.common.service.IoService;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.service.IoService;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.integration.ognl.IoSessionFinder;
/**
Modified: mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoSessionMBean.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoSessionMBean.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoSessionMBean.java (original)
+++ mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoSessionMBean.java Thu Jun 26 01:49:48 2008
@@ -26,8 +26,8 @@
import javax.management.modelmbean.ModelMBeanAttributeInfo;
import javax.management.modelmbean.ModelMBeanOperationInfo;
-import org.apache.mina.common.filterchain.IoFilter;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.core.session.IoSession;
/**
* A JMX MBean wrapper for an {@link IoSession}.
Modified: mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/ObjectMBean.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/ObjectMBean.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/ObjectMBean.java (original)
+++ mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/ObjectMBean.java Thu Jun 26 01:49:48 2008
@@ -72,16 +72,16 @@
import ognl.OgnlRuntime;
import ognl.TypeConverter;
-import org.apache.mina.common.filterchain.DefaultIoFilterChainBuilder;
-import org.apache.mina.common.filterchain.IoFilter;
-import org.apache.mina.common.filterchain.IoFilterChain;
-import org.apache.mina.common.filterchain.IoFilterChainBuilder;
-import org.apache.mina.common.service.IoAcceptor;
-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.session.IoSession;
-import org.apache.mina.common.session.IoSessionDataStructureFactory;
+import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.core.filterchain.IoFilterChain;
+import org.apache.mina.core.filterchain.IoFilterChainBuilder;
+import org.apache.mina.core.service.IoAcceptor;
+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.session.IoSession;
+import org.apache.mina.core.session.IoSessionDataStructureFactory;
import org.apache.mina.filter.executor.ExecutorFilter;
import org.apache.mina.integration.beans.CollectionEditor;
import org.apache.mina.integration.beans.ListEditor;
Modified: mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoFilterPropertyAccessor.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoFilterPropertyAccessor.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoFilterPropertyAccessor.java (original)
+++ mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoFilterPropertyAccessor.java Thu Jun 26 01:49:48 2008
@@ -21,7 +21,7 @@
import ognl.OgnlRuntime;
import ognl.PropertyAccessor;
-import org.apache.mina.common.filterchain.IoFilter;
+import org.apache.mina.core.filterchain.IoFilter;
/**
* An OGNL {@link PropertyAccessor} for {@link IoFilter}.
Modified: mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoServicePropertyAccessor.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoServicePropertyAccessor.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoServicePropertyAccessor.java (original)
+++ mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoServicePropertyAccessor.java Thu Jun 26 01:49:48 2008
@@ -21,7 +21,7 @@
import ognl.OgnlRuntime;
import ognl.PropertyAccessor;
-import org.apache.mina.common.service.IoService;
+import org.apache.mina.core.service.IoService;
/**
* An OGNL {@link PropertyAccessor} for {@link IoService}.
Modified: mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionFinder.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionFinder.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionFinder.java (original)
+++ mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionFinder.java Thu Jun 26 01:49:48 2008
@@ -24,7 +24,7 @@
import ognl.OgnlException;
import ognl.TypeConverter;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
/**
* Finds {@link IoSession}s that match a boolean OGNL expression.
Modified: mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionPropertyAccessor.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionPropertyAccessor.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionPropertyAccessor.java (original)
+++ mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionPropertyAccessor.java Thu Jun 26 01:49:48 2008
@@ -24,7 +24,7 @@
import ognl.OgnlRuntime;
import ognl.PropertyAccessor;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
/**
* An OGNL {@link PropertyAccessor} for {@link IoSession}.
Modified: mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoFilterTransition.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoFilterTransition.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoFilterTransition.java (original)
+++ mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoFilterTransition.java Thu Jun 26 01:49:48 2008
@@ -24,7 +24,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.apache.mina.common.filterchain.IoFilter;
+import org.apache.mina.core.filterchain.IoFilter;
import org.apache.mina.statemachine.StateMachine;
import org.apache.mina.statemachine.event.IoFilterEvents;
Modified: mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoFilterTransitions.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoFilterTransitions.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoFilterTransitions.java (original)
+++ mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoFilterTransitions.java Thu Jun 26 01:49:48 2008
@@ -24,7 +24,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.apache.mina.common.filterchain.IoFilter;
+import org.apache.mina.core.filterchain.IoFilter;
import org.apache.mina.statemachine.StateMachine;
/**
Modified: mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoHandlerTransition.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoHandlerTransition.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoHandlerTransition.java (original)
+++ mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoHandlerTransition.java Thu Jun 26 01:49:48 2008
@@ -24,7 +24,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.core.service.IoHandler;
import org.apache.mina.statemachine.StateMachine;
import org.apache.mina.statemachine.event.IoHandlerEvents;
Modified: mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoHandlerTransitions.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoHandlerTransitions.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoHandlerTransitions.java (original)
+++ mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoHandlerTransitions.java Thu Jun 26 01:49:48 2008
@@ -24,7 +24,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.core.service.IoHandler;
import org.apache.mina.statemachine.StateMachine;
/**
Modified: mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/IoSessionStateContextLookup.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/IoSessionStateContextLookup.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/IoSessionStateContextLookup.java (original)
+++ mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/context/IoSessionStateContextLookup.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.statemachine.context;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
/**
* MINA specific {@link StateContextLookup} which uses an {@link IoSession}
Modified: mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/event/IoFilterEvents.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/event/IoFilterEvents.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/event/IoFilterEvents.java (original)
+++ mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/event/IoFilterEvents.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.statemachine.event;
-import org.apache.mina.common.filterchain.IoFilter;
+import org.apache.mina.core.filterchain.IoFilter;
import org.apache.mina.statemachine.annotation.IoFilterTransition;
/**
Modified: mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/event/IoHandlerEvents.java
URL: http://svn.apache.org/viewvc/mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/event/IoHandlerEvents.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/event/IoHandlerEvents.java (original)
+++ mina/trunk/statemachine/src/main/java/org/apache/mina/statemachine/event/IoHandlerEvents.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.mina.statemachine.event;
-import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.core.service.IoHandler;
import org.apache.mina.statemachine.annotation.IoHandlerTransition;
/**
Modified: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprDatagramSession.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprDatagramSession.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprDatagramSession.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprDatagramSession.java Thu Jun 26 01:49:48 2008
@@ -21,13 +21,13 @@
import java.net.InetSocketAddress;
-import org.apache.mina.common.RuntimeIoException;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.service.DefaultTransportMetadata;
-import org.apache.mina.common.service.IoProcessor;
-import org.apache.mina.common.service.IoService;
-import org.apache.mina.common.service.TransportMetadata;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.RuntimeIoException;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.service.DefaultTransportMetadata;
+import org.apache.mina.core.service.IoProcessor;
+import org.apache.mina.core.service.IoService;
+import org.apache.mina.core.service.TransportMetadata;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.transport.socket.AbstractDatagramSessionConfig;
import org.apache.mina.transport.socket.DatagramSessionConfig;
import org.apache.tomcat.jni.Socket;
Modified: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprIoProcessor.java Thu Jun 26 01:49:48 2008
@@ -27,10 +27,10 @@
import java.util.Map;
import java.util.concurrent.Executor;
-import org.apache.mina.common.RuntimeIoException;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.file.FileRegion;
-import org.apache.mina.common.polling.AbstractPollingIoProcessor;
+import org.apache.mina.core.RuntimeIoException;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.file.FileRegion;
+import org.apache.mina.core.polling.AbstractPollingIoProcessor;
import org.apache.mina.util.CircularQueue;
import org.apache.tomcat.jni.Poll;
import org.apache.tomcat.jni.Pool;
Modified: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSession.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSession.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSession.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSession.java Thu Jun 26 01:49:48 2008
@@ -21,13 +21,13 @@
import java.net.InetSocketAddress;
-import org.apache.mina.common.filterchain.DefaultIoFilterChain;
-import org.apache.mina.common.filterchain.IoFilterChain;
-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.session.AbstractIoSession;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.filterchain.DefaultIoFilterChain;
+import org.apache.mina.core.filterchain.IoFilterChain;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.core.service.IoProcessor;
+import org.apache.mina.core.service.IoService;
+import org.apache.mina.core.session.AbstractIoSession;
+import org.apache.mina.core.session.IoSession;
import org.apache.tomcat.jni.Address;
import org.apache.tomcat.jni.Poll;
import org.apache.tomcat.jni.Socket;
Modified: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java Thu Jun 26 01:49:48 2008
@@ -26,10 +26,10 @@
import java.util.List;
import java.util.concurrent.Executor;
-import org.apache.mina.common.RuntimeIoException;
-import org.apache.mina.common.polling.AbstractPollingIoAcceptor;
-import org.apache.mina.common.service.IoProcessor;
-import org.apache.mina.common.service.TransportMetadata;
+import org.apache.mina.core.RuntimeIoException;
+import org.apache.mina.core.polling.AbstractPollingIoAcceptor;
+import org.apache.mina.core.service.IoProcessor;
+import org.apache.mina.core.service.TransportMetadata;
import org.apache.mina.transport.socket.DefaultSocketSessionConfig;
import org.apache.mina.transport.socket.SocketAcceptor;
import org.apache.mina.transport.socket.SocketSessionConfig;