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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -21,8 +21,8 @@ import java.net.InetSocketAddress; -import org.apache.mina.common.IoFilter; -import org.apache.mina.common.IoHandler; +import org.apache.mina.common.filterchain.IoFilter; +import org.apache.mina.common.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -21,8 +21,8 @@ import static org.apache.mina.statemachine.event.IoHandlerEvents.*; -import org.apache.mina.common.IoFutureListener; -import org.apache.mina.common.IoSession; +import org.apache.mina.common.future.IoFutureListener; +import org.apache.mina.common.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -19,9 +19,9 @@ */ package org.apache.mina.example.tennis; -import org.apache.mina.common.ConnectFuture; -import org.apache.mina.common.IoAcceptor; -import org.apache.mina.common.IoSession; +import org.apache.mina.common.future.ConnectFuture; +import org.apache.mina.common.service.IoAcceptor; +import org.apache.mina.common.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -19,9 +19,9 @@ */ package org.apache.mina.example.tennis; -import org.apache.mina.common.IoHandler; -import org.apache.mina.common.IoHandlerAdapter; -import org.apache.mina.common.IoSession; +import org.apache.mina.common.service.IoHandler; +import org.apache.mina.common.service.IoHandlerAdapter; +import org.apache.mina.common.session.IoSession; /** * A [EMAIL PROTECTED] 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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -31,7 +31,7 @@ import javax.swing.JPanel; import javax.swing.JTabbedPane; -import org.apache.mina.common.DefaultIoFilterChainBuilder; +import org.apache.mina.common.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -21,10 +21,10 @@ import java.net.SocketAddress; -import org.apache.mina.common.IoBuffer; -import org.apache.mina.common.IdleStatus; -import org.apache.mina.common.IoHandlerAdapter; -import org.apache.mina.common.IoSession; +import org.apache.mina.common.buffer.IoBuffer; +import org.apache.mina.common.service.IoHandlerAdapter; +import org.apache.mina.common.session.IdleStatus; +import org.apache.mina.common.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -21,13 +21,13 @@ import java.net.InetSocketAddress; -import org.apache.mina.common.ConnectFuture; -import org.apache.mina.common.IdleStatus; -import org.apache.mina.common.IoBuffer; -import org.apache.mina.common.IoConnector; -import org.apache.mina.common.IoFutureListener; -import org.apache.mina.common.IoHandlerAdapter; -import org.apache.mina.common.IoSession; +import org.apache.mina.common.buffer.IoBuffer; +import org.apache.mina.common.future.ConnectFuture; +import org.apache.mina.common.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.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -80,7 +80,7 @@ </bean> <!-- The non-SSL filter chain. --> - <bean id="filterChainBuilder" class="org.apache.mina.common.DefaultIoFilterChainBuilder"> + <bean id="filterChainBuilder" class="org.apache.mina.common.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.DefaultIoFilterChainBuilder"> + <bean id="sslFilterChainBuilder" class="org.apache.mina.common.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -21,7 +21,7 @@ import junit.framework.TestCase; import org.springframework.context.ConfigurableApplicationContext; -import org.apache.mina.common.IoService; +import org.apache.mina.common.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -25,9 +25,9 @@ import junit.framework.TestCase; -import org.apache.mina.common.IoAcceptor; -import org.apache.mina.common.IoBuffer; -import org.apache.mina.common.IoSession; +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.example.echoserver.ssl.BogusSslContextFactory; import org.apache.mina.filter.ssl.SslFilter; import org.apache.mina.transport.socket.DatagramSessionConfig; @@ -150,12 +150,13 @@ } } }); - socketAcceptor.bind(address); - socketBound = true; - datagramAcceptor.setHandler(new EchoProtocolHandler()); - datagramAcceptor.bind(address); - datagramBound = true; + socketAcceptor.bind(address); + socketBound = true; + + datagramAcceptor.setHandler(new EchoProtocolHandler()); + datagramAcceptor.bind(address); + datagramBound = true; } catch (IOException e) { // Do nothing } finally { 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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -23,14 +23,14 @@ import junit.framework.Assert; -import org.apache.mina.common.ConnectFuture; -import org.apache.mina.common.IoBuffer; -import org.apache.mina.common.IoConnector; -import org.apache.mina.common.IoHandlerAdapter; -import org.apache.mina.common.IoSession; import org.apache.mina.common.RuntimeIoException; -import org.apache.mina.common.WriteException; -import org.apache.mina.common.WriteFuture; +import org.apache.mina.common.buffer.IoBuffer; +import org.apache.mina.common.future.ConnectFuture; +import org.apache.mina.common.future.WriteFuture; +import org.apache.mina.common.service.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.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -33,8 +33,8 @@ import junit.framework.TestCase; -import org.apache.mina.common.IoHandlerAdapter; -import org.apache.mina.common.IoSession; +import org.apache.mina.common.service.IoHandlerAdapter; +import org.apache.mina.common.session.IoSession; import org.apache.mina.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -22,7 +22,7 @@ import net.gleamynode.netty2.Message; import net.gleamynode.netty2.MessageRecognizer; -import org.apache.mina.common.IoSession; +import org.apache.mina.common.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -25,8 +25,8 @@ import net.gleamynode.netty2.MessageParseException; import net.gleamynode.netty2.MessageRecognizer; -import org.apache.mina.common.IoBuffer; -import org.apache.mina.common.IoSession; +import org.apache.mina.common.buffer.IoBuffer; +import org.apache.mina.common.session.IoSession; import org.apache.mina.filter.codec.ProtocolDecoder; import org.apache.mina.filter.codec.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -21,8 +21,8 @@ import net.gleamynode.netty2.Message; -import org.apache.mina.common.IoBuffer; -import org.apache.mina.common.IoSession; +import org.apache.mina.common.buffer.IoBuffer; +import org.apache.mina.common.session.IoSession; import org.apache.mina.filter.codec.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -21,12 +21,12 @@ import java.io.IOException; -import org.apache.mina.common.IoBuffer; -import org.apache.mina.common.AttributeKey; -import org.apache.mina.common.IoFilter; -import org.apache.mina.common.IoFilterChain; -import org.apache.mina.common.IoSession; -import org.apache.mina.common.WriteRequest; +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.filter.util.WriteRequestFilter; /** 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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -21,7 +21,7 @@ import java.io.IOException; -import org.apache.mina.common.IoBuffer; +import org.apache.mina.common.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -21,12 +21,12 @@ import junit.framework.TestCase; -import org.apache.mina.common.IoBuffer; -import org.apache.mina.common.DefaultWriteRequest; -import org.apache.mina.common.IoFilterChain; -import org.apache.mina.common.IoSession; -import org.apache.mina.common.WriteRequest; -import org.apache.mina.common.IoFilter.NextFilter; +import org.apache.mina.common.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.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -24,7 +24,7 @@ import junit.framework.TestCase; -import org.apache.mina.common.IoBuffer; +import org.apache.mina.common.buffer.IoBuffer; /** * @author The Apache MINA Project ([EMAIL PROTECTED]) 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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -21,7 +21,7 @@ import java.beans.PropertyEditor; -import org.apache.mina.common.TrafficMask; +import org.apache.mina.common.session.TrafficMask; /** * A [EMAIL PROTECTED] PropertyEditor} which converts a [EMAIL PROTECTED] 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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -16,8 +16,8 @@ */ package org.apache.mina.integration.jmx; -import org.apache.mina.common.IoFilter; -import org.apache.mina.common.IoSession; +import org.apache.mina.common.filterchain.IoFilter; +import org.apache.mina.common.session.IoSession; /** * A JMX MBean wrapper for an [EMAIL PROTECTED] 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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -28,8 +28,8 @@ import ognl.Ognl; -import org.apache.mina.common.IoService; -import org.apache.mina.common.IoSession; +import org.apache.mina.common.service.IoService; +import org.apache.mina.common.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -26,8 +26,8 @@ import javax.management.modelmbean.ModelMBeanAttributeInfo; import javax.management.modelmbean.ModelMBeanOperationInfo; -import org.apache.mina.common.IoFilter; -import org.apache.mina.common.IoSession; +import org.apache.mina.common.filterchain.IoFilter; +import org.apache.mina.common.session.IoSession; /** * A JMX MBean wrapper for an [EMAIL PROTECTED] 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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -72,16 +72,16 @@ import ognl.OgnlRuntime; import ognl.TypeConverter; -import org.apache.mina.common.DefaultIoFilterChainBuilder; -import org.apache.mina.common.IoAcceptor; -import org.apache.mina.common.IoFilter; -import org.apache.mina.common.IoFilterChain; -import org.apache.mina.common.IoFilterChainBuilder; -import org.apache.mina.common.IoHandler; -import org.apache.mina.common.IoService; -import org.apache.mina.common.IoSession; -import org.apache.mina.common.IoSessionDataStructureFactory; -import org.apache.mina.common.TransportMetadata; +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.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -21,7 +21,7 @@ import ognl.OgnlRuntime; import ognl.PropertyAccessor; -import org.apache.mina.common.IoFilter; +import org.apache.mina.common.filterchain.IoFilter; /** * An OGNL [EMAIL PROTECTED] PropertyAccessor} for [EMAIL PROTECTED] 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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -21,7 +21,7 @@ import ognl.OgnlRuntime; import ognl.PropertyAccessor; -import org.apache.mina.common.IoService; +import org.apache.mina.common.service.IoService; /** * An OGNL [EMAIL PROTECTED] PropertyAccessor} for [EMAIL PROTECTED] 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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -24,7 +24,7 @@ import ognl.OgnlException; import ognl.TypeConverter; -import org.apache.mina.common.IoSession; +import org.apache.mina.common.session.IoSession; /** * Finds [EMAIL PROTECTED] 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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -24,7 +24,7 @@ import ognl.OgnlRuntime; import ognl.PropertyAccessor; -import org.apache.mina.common.IoSession; +import org.apache.mina.common.session.IoSession; /** * An OGNL [EMAIL PROTECTED] PropertyAccessor} for [EMAIL PROTECTED] 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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.apache.mina.common.IoFilter; +import org.apache.mina.common.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.apache.mina.common.IoFilter; +import org.apache.mina.common.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.apache.mina.common.IoHandler; +import org.apache.mina.common.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.apache.mina.common.IoHandler; +import org.apache.mina.common.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -19,7 +19,7 @@ */ package org.apache.mina.statemachine.context; -import org.apache.mina.common.IoSession; +import org.apache.mina.common.session.IoSession; /** * MINA specific [EMAIL PROTECTED] StateContextLookup} which uses an [EMAIL PROTECTED] 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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -19,7 +19,7 @@ */ package org.apache.mina.statemachine.event; -import org.apache.mina.common.IoFilter; +import org.apache.mina.common.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -19,7 +19,7 @@ */ package org.apache.mina.statemachine.event; -import org.apache.mina.common.IoHandler; +import org.apache.mina.common.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -21,13 +21,13 @@ import java.net.InetSocketAddress; -import org.apache.mina.common.DefaultTransportMetadata; -import org.apache.mina.common.IoBuffer; -import org.apache.mina.common.IoProcessor; -import org.apache.mina.common.IoService; -import org.apache.mina.common.IoSession; import org.apache.mina.common.RuntimeIoException; -import org.apache.mina.common.TransportMetadata; +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.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -27,10 +27,10 @@ import java.util.Map; import java.util.concurrent.Executor; -import org.apache.mina.common.AbstractPollingIoProcessor; -import org.apache.mina.common.FileRegion; -import org.apache.mina.common.IoBuffer; 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.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -21,13 +21,13 @@ import java.net.InetSocketAddress; -import org.apache.mina.common.AbstractIoSession; -import org.apache.mina.common.DefaultIoFilterChain; -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.IoSession; +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.tomcat.jni.Address; import org.apache.tomcat.jni.Poll; import org.apache.tomcat.jni.Socket; @@ -131,7 +131,7 @@ * [EMAIL PROTECTED] */ @Override - protected IoProcessor<AprSession> getProcessor() { + public IoProcessor<AprSession> getProcessor() { return processor; } 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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -26,10 +26,10 @@ import java.util.List; import java.util.concurrent.Executor; -import org.apache.mina.common.AbstractPollingIoAcceptor; -import org.apache.mina.common.IoProcessor; import org.apache.mina.common.RuntimeIoException; -import org.apache.mina.common.TransportMetadata; +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.transport.socket.DefaultSocketSessionConfig; import org.apache.mina.transport.socket.SocketAcceptor; import org.apache.mina.transport.socket.SocketSessionConfig; 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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -31,10 +31,10 @@ import java.util.Set; import java.util.concurrent.Executor; -import org.apache.mina.common.AbstractPollingIoConnector; -import org.apache.mina.common.IoProcessor; import org.apache.mina.common.RuntimeIoException; -import org.apache.mina.common.TransportMetadata; +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.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=671108&r1=671107&r2=671108&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 Tue Jun 24 02:55:42 2008 @@ -21,14 +21,14 @@ import java.net.InetSocketAddress; -import org.apache.mina.common.DefaultTransportMetadata; -import org.apache.mina.common.IoBuffer; -import org.apache.mina.common.IoProcessor; -import org.apache.mina.common.IoService; -import org.apache.mina.common.IoSession; -import org.apache.mina.common.IoSessionConfig; import org.apache.mina.common.RuntimeIoException; -import org.apache.mina.common.TransportMetadata; +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.transport.socket.AbstractSocketSessionConfig; import org.apache.mina.transport.socket.SocketSessionConfig; import org.apache.tomcat.jni.Socket;
