Modified: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java?rev=671827&r1=671826&r2=671827&view=diff ============================================================================== --- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java (original) +++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketConnector.java Thu Jun 26 01:49:48 2008 @@ -31,10 +31,10 @@ import java.util.Set; import java.util.concurrent.Executor; -import org.apache.mina.common.RuntimeIoException; -import org.apache.mina.common.polling.AbstractPollingIoConnector; -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.AbstractPollingIoConnector; +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.SocketConnector; import org.apache.mina.transport.socket.SocketSessionConfig;
Modified: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketSession.java URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketSession.java?rev=671827&r1=671826&r2=671827&view=diff ============================================================================== --- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketSession.java (original) +++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketSession.java Thu Jun 26 01:49:48 2008 @@ -21,14 +21,14 @@ 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.common.session.IoSessionConfig; +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.core.session.IoSessionConfig; import org.apache.mina.transport.socket.AbstractSocketSessionConfig; import org.apache.mina.transport.socket.SocketSessionConfig; import org.apache.tomcat.jni.Socket; Modified: mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/DefaultSerialSessionConfig.java URL: http://svn.apache.org/viewvc/mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/DefaultSerialSessionConfig.java?rev=671827&r1=671826&r2=671827&view=diff ============================================================================== --- mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/DefaultSerialSessionConfig.java (original) +++ mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/DefaultSerialSessionConfig.java Thu Jun 26 01:49:48 2008 @@ -19,8 +19,8 @@ */ package org.apache.mina.transport.serial; -import org.apache.mina.common.AbstractIoSessionConfig; -import org.apache.mina.common.IoSessionConfig; +import org.apache.mina.core.session.AbstractIoSessionConfig; +import org.apache.mina.core.session.IoSessionConfig; /** * The default configuration for a serial session [EMAIL PROTECTED] SerialSessionConfig}. Modified: mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java URL: http://svn.apache.org/viewvc/mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java?rev=671827&r1=671826&r2=671827&view=diff ============================================================================== --- mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java (original) +++ mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java Thu Jun 26 01:49:48 2008 @@ -30,14 +30,14 @@ import java.util.TooManyListenersException; import java.util.concurrent.Executor; -import org.apache.mina.common.AbstractIoConnector; -import org.apache.mina.common.ConnectFuture; -import org.apache.mina.common.DefaultConnectFuture; -import org.apache.mina.common.IdleStatusChecker; -import org.apache.mina.common.IoConnector; -import org.apache.mina.common.IoFuture; -import org.apache.mina.common.IoSessionInitializer; -import org.apache.mina.common.TransportMetadata; +import org.apache.mina.core.service.AbstractIoConnector; +import org.apache.mina.core.future.ConnectFuture; +import org.apache.mina.core.future.DefaultConnectFuture; +import org.apache.mina.core.session.IdleStatusChecker; +import org.apache.mina.core.service.IoConnector; +import org.apache.mina.core.future.IoFuture; +import org.apache.mina.core.session.IoSessionInitializer; +import org.apache.mina.core.service.TransportMetadata; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialPortUnavailableException.java URL: http://svn.apache.org/viewvc/mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialPortUnavailableException.java?rev=671827&r1=671826&r2=671827&view=diff ============================================================================== --- mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialPortUnavailableException.java (original) +++ mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialPortUnavailableException.java Thu Jun 26 01:49:48 2008 @@ -19,7 +19,7 @@ */ package org.apache.mina.transport.serial; -import org.apache.mina.common.RuntimeIoException; +import org.apache.mina.core.RuntimeIoException; /** * Exception thrown when the serial port can't be open because Modified: mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java URL: http://svn.apache.org/viewvc/mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java?rev=671827&r1=671826&r2=671827&view=diff ============================================================================== --- mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java (original) +++ mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java Thu Jun 26 01:49:48 2008 @@ -19,7 +19,7 @@ */ package org.apache.mina.transport.serial; -import org.apache.mina.common.IoSession; +import org.apache.mina.core.session.IoSession; /** * An [EMAIL PROTECTED] IoSession} for serial communication transport. Modified: mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionConfig.java URL: http://svn.apache.org/viewvc/mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionConfig.java?rev=671827&r1=671826&r2=671827&view=diff ============================================================================== --- mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionConfig.java (original) +++ mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionConfig.java Thu Jun 26 01:49:48 2008 @@ -19,7 +19,7 @@ */ package org.apache.mina.transport.serial; -import org.apache.mina.common.IoSessionConfig; +import org.apache.mina.core.session.IoSessionConfig; /** * An [EMAIL PROTECTED] IoSessionConfig} for serial transport type. Modified: mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java URL: http://svn.apache.org/viewvc/mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java?rev=671827&r1=671826&r2=671827&view=diff ============================================================================== --- mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java (original) +++ mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java Thu Jun 26 01:49:48 2008 @@ -28,18 +28,19 @@ import java.io.OutputStream; import java.util.TooManyListenersException; -import org.apache.mina.common.AbstractIoSession; -import org.apache.mina.common.DefaultIoFilterChain; -import org.apache.mina.common.DefaultTransportMetadata; -import org.apache.mina.common.ExceptionMonitor; -import org.apache.mina.common.IoBuffer; -import org.apache.mina.common.IoFilterChain; -import org.apache.mina.common.IoHandler; -import org.apache.mina.common.IoProcessor; -import org.apache.mina.common.IoService; -import org.apache.mina.common.IoServiceListenerSupport; -import org.apache.mina.common.TransportMetadata; -import org.apache.mina.common.WriteRequest; +import org.apache.mina.core.session.AbstractIoSession; +import org.apache.mina.core.filterchain.DefaultIoFilterChain; +import org.apache.mina.core.service.DefaultTransportMetadata; +import org.apache.mina.core.ExceptionMonitor; +import org.apache.mina.core.buffer.IoBuffer; +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.service.IoServiceListenerSupport; +import org.apache.mina.core.service.TransportMetadata; +import org.apache.mina.core.write.WriteRequest; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -235,7 +236,7 @@ } @Override - protected IoProcessor<SerialSessionImpl> getProcessor() { + public IoProcessor<SerialSessionImpl> getProcessor() { return processor; }
