You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by tr...@apache.org on 2006/01/25 16:22:22 UTC
svn commit: r372238 - in /directory/trunks/mina/integration-spring/src:
main/java/org/apache/mina/integration/spring/
main/java/org/apache/mina/integration/spring/support/
test/java/org/apache/mina/integration/spring/support/
Author: trustin
Date: Wed Jan 25 07:22:11 2006
New Revision: 372238
URL: http://svn.apache.org/viewcvs?rev=372238&view=rev
Log:
Fixed compilation errors.
Added:
directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/support/AbstractIoServiceFactoryBean.java
- copied, changed from r372224, directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/support/AbstractIoSessionManagerFactoryBean.java
directory/trunks/mina/integration-spring/src/test/java/org/apache/mina/integration/spring/support/AbstractIoServiceFactoryBeanTest.java
- copied, changed from r372224, directory/trunks/mina/integration-spring/src/test/java/org/apache/mina/integration/spring/support/AbstractIoSessionManagerFactoryBeanTest.java
Removed:
directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/support/AbstractIoSessionManagerFactoryBean.java
directory/trunks/mina/integration-spring/src/test/java/org/apache/mina/integration/spring/support/AbstractIoSessionManagerFactoryBeanTest.java
Modified:
directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/IoFilterMapping.java
directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/support/AbstractIoAcceptorFactoryBean.java
directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/support/AbstractIoConnectorFactoryBean.java
directory/trunks/mina/integration-spring/src/test/java/org/apache/mina/integration/spring/support/AbstractIoAcceptorFactoryBeanTest.java
directory/trunks/mina/integration-spring/src/test/java/org/apache/mina/integration/spring/support/AbstractIoConnectorFactoryBeanTest.java
Modified: directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/IoFilterMapping.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/IoFilterMapping.java?rev=372238&r1=372237&r2=372238&view=diff
==============================================================================
--- directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/IoFilterMapping.java (original)
+++ directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/IoFilterMapping.java Wed Jan 25 07:22:11 2006
@@ -28,8 +28,8 @@
* <p>
* Use this class when you want to configure the
* filters added to the filter chain of all sessions created from a particular
- * {@link org.apache.mina.common.IoSessionManager} created using one of the
- * {@link org.apache.mina.integration.spring.support.AbstractIoSessionManagerFactoryBean}
+ * {@link org.apache.mina.common.IoService} created using one of the
+ * {@link org.apache.mina.integration.spring.support.AbstractIoServiceFactoryBean}
* sub-classes but you don't want the names to be generated automatically.
* </p>
* <p>
@@ -43,7 +43,7 @@
*
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
- * @see org.apache.mina.integration.spring.support.AbstractIoSessionManagerFactoryBean
+ * @see org.apache.mina.integration.spring.support.AbstractIoServiceFactoryBean
* @see org.apache.mina.integration.spring.Binding
*/
public class IoFilterMapping implements InitializingBean
Modified: directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/support/AbstractIoAcceptorFactoryBean.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/support/AbstractIoAcceptorFactoryBean.java?rev=372238&r1=372237&r2=372238&view=diff
==============================================================================
--- directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/support/AbstractIoAcceptorFactoryBean.java (original)
+++ directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/support/AbstractIoAcceptorFactoryBean.java Wed Jan 25 07:22:11 2006
@@ -24,7 +24,7 @@
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoFilterChainBuilder;
import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoSessionManager;
+import org.apache.mina.common.IoService;
import org.apache.mina.integration.spring.Binding;
import org.apache.mina.integration.spring.IoFilterMapping;
import org.springframework.util.Assert;
@@ -44,7 +44,7 @@
* @version $Rev$, $Date$
*/
public abstract class AbstractIoAcceptorFactoryBean extends
- AbstractIoSessionManagerFactoryBean
+ AbstractIoServiceFactoryBean
{
protected Binding[] bindings = new Binding[ 0 ];
@@ -61,7 +61,7 @@
/**
* Creates a new {@link IoAcceptor}. Calls {@link #createIoAcceptor()} to
* get the new {@link IoAcceptor} instance and then calls
- * {@link AbstractIoSessionManagerFactoryBean#initIoSessionManager(IoSessionManager)}
+ * {@link AbstractIoServiceFactoryBean#initIoService(IoService)}
* followed by {@link #initIoAcceptor(IoAcceptor)}.
*
* @return the {@link IoAcceptor} instance.
@@ -72,7 +72,7 @@
acceptor.setDisconnectClientsOnUnbind( disconnectClientsOnUnbind );
- initIoSessionManager( acceptor );
+ initIoService( acceptor );
initIoAcceptor( acceptor );
return acceptor;
@@ -112,7 +112,7 @@
/**
* Destroys an {@link IoAcceptor} created by the factory bean by calling
* {@link #destroyIoAcceptor(IoAcceptor)} and then
- * {@link AbstractIoSessionManagerFactoryBean#destroyIoSessionManager(IoSessionManager)}.
+ * {@link AbstractIoServiceFactoryBean#destroyIoService(IoService)}.
* This method may be overridden by extending classes if additional calls
* are necessary to shutdown the {@link IoAcceptor} or if the sequence of
* calls should be different.
@@ -128,7 +128,7 @@
{
IoAcceptor acceptor = ( IoAcceptor ) instance;
destroyIoAcceptor( acceptor );
- destroyIoSessionManager( acceptor );
+ destroyIoService( acceptor );
}
/**
Modified: directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/support/AbstractIoConnectorFactoryBean.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/support/AbstractIoConnectorFactoryBean.java?rev=372238&r1=372237&r2=372238&view=diff
==============================================================================
--- directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/support/AbstractIoConnectorFactoryBean.java (original)
+++ directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/support/AbstractIoConnectorFactoryBean.java Wed Jan 25 07:22:11 2006
@@ -19,7 +19,7 @@
package org.apache.mina.integration.spring.support;
import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoSessionManager;
+import org.apache.mina.common.IoService;
/**
* Abstract Spring FactoryBean which creates {@link IoConnector} instances and
@@ -29,7 +29,7 @@
* @version $Rev$, $Date$
*/
public abstract class AbstractIoConnectorFactoryBean extends
- AbstractIoSessionManagerFactoryBean
+ AbstractIoServiceFactoryBean
{
private int connectTimeout = 60;
@@ -44,7 +44,7 @@
/**
* Creates a new {@link IoConnector}. Calls {@link #createIoConnector()} to
- * get the new instance and then calls {@link AbstractIoSessionManagerFactoryBean#initIoSessionManager(IoSessionManager)}
+ * get the new instance and then calls {@link AbstractIoServiceFactoryBean#initIoService(IoService)}
* followed by {@link #initIoConnector(IoConnector)}.
*
* @return the new instance
@@ -53,7 +53,7 @@
{
IoConnector connector = createIoConnector();
- initIoSessionManager( connector );
+ initIoService( connector );
initIoConnector( connector );
return connector;
@@ -72,7 +72,7 @@
/**
* Destroys an IoConnector created by the factory bean by calling
- * {@link AbstractIoSessionManagerFactoryBean#destroyIoSessionManager(IoSessionManager)}.
+ * {@link AbstractIoServiceFactoryBean#destroyIoService(IoService)}.
* This method may be overridden by extending classes if additional calls
* are necessary to shutdown the IoConnector or if the sequence of calls
* should be different.
@@ -88,7 +88,7 @@
protected void destroyInstance( Object instance ) throws Exception
{
IoConnector connector = ( IoConnector ) instance;
- destroyIoSessionManager( connector );
+ destroyIoService( connector );
}
public Class getObjectType()
Copied: directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/support/AbstractIoServiceFactoryBean.java (from r372224, directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/support/AbstractIoSessionManagerFactoryBean.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/support/AbstractIoServiceFactoryBean.java?p2=directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/support/AbstractIoServiceFactoryBean.java&p1=directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/support/AbstractIoSessionManagerFactoryBean.java&r1=372224&r2=372238&rev=372238&view=diff
==============================================================================
--- directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/support/AbstractIoSessionManagerFactoryBean.java (original)
+++ directory/trunks/mina/integration-spring/src/main/java/org/apache/mina/integration/spring/support/AbstractIoServiceFactoryBean.java Wed Jan 25 07:22:11 2006
@@ -20,16 +20,16 @@
import org.apache.mina.common.DefaultIoFilterChainBuilder;
import org.apache.mina.common.IoFilter;
-import org.apache.mina.common.IoSessionManager;
+import org.apache.mina.common.IoService;
import org.apache.mina.integration.spring.IoFilterMapping;
import org.springframework.beans.factory.config.AbstractFactoryBean;
import org.springframework.util.Assert;
/**
* Abstract Spring {@link org.springframework.beans.factory.FactoryBean}
- * which creates {@link org.apache.mina.common.IoSessionManager} instances. This
+ * which creates {@link org.apache.mina.common.IoService} instances. This
* factory bean makes it possible to configure the filters to be added to all the
- * sessions created by the {@link org.apache.mina.common.IoSessionManager} using
+ * sessions created by the {@link org.apache.mina.common.IoService} using
* Spring.
* <p>
* The filters may be set up in two ways. By creating
@@ -47,18 +47,18 @@
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-public abstract class AbstractIoSessionManagerFactoryBean extends
+public abstract class AbstractIoServiceFactoryBean extends
AbstractFactoryBean
{
private IoFilterMapping[] filterMappings = new IoFilterMapping[ 0 ];
/**
- * Initializes an {@link IoSessionManager} configured by this factory bean.
+ * Initializes an {@link IoService} configured by this factory bean.
*
- * @param sessionManager the {@link IoSessionManager}.
+ * @param sessionManager the {@link IoService}.
* @throws Exception on errors.
*/
- protected void initIoSessionManager( IoSessionManager sessionManager )
+ protected void initIoService( IoService sessionManager )
throws Exception
{
/*
@@ -73,11 +73,11 @@
}
/**
- * Destroys an {@link IoSessionManager} created by the factory bean.
+ * Destroys an {@link IoService} created by the factory bean.
*
- * @param sessionManager the IoSessionManager instance to be destroyed.
+ * @param sessionManager the IoService instance to be destroyed.
*/
- protected void destroyIoSessionManager( IoSessionManager sessionManager )
+ protected void destroyIoService( IoService sessionManager )
throws Exception
{
@@ -89,7 +89,7 @@
/**
* Sets a number of unnamed filters which will be added to the filter
- * chain of all sessions created by the {@link IoSessionManager} created by
+ * chain of all sessions created by the {@link IoService} created by
* this factory bean. The filters will be assigned automatically generated
* names (<code>managerFilter0</code>, <code>managerFilter1</code>, etc).
*
@@ -112,7 +112,7 @@
/**
* Sets a number of named filters which will be added to the filter
- * chain of all sessions created by the {@link IoSessionManager} created by
+ * chain of all sessions created by the {@link IoService} created by
* this factory bean.
*
* @param filterMappings the name to filter mappings.
Modified: directory/trunks/mina/integration-spring/src/test/java/org/apache/mina/integration/spring/support/AbstractIoAcceptorFactoryBeanTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/integration-spring/src/test/java/org/apache/mina/integration/spring/support/AbstractIoAcceptorFactoryBeanTest.java?rev=372238&r1=372237&r2=372238&view=diff
==============================================================================
--- directory/trunks/mina/integration-spring/src/test/java/org/apache/mina/integration/spring/support/AbstractIoAcceptorFactoryBeanTest.java (original)
+++ directory/trunks/mina/integration-spring/src/test/java/org/apache/mina/integration/spring/support/AbstractIoAcceptorFactoryBeanTest.java Wed Jan 25 07:22:11 2006
@@ -29,7 +29,7 @@
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoFilter;
import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoSessionManager;
+import org.apache.mina.common.IoService;
import org.apache.mina.common.IoFilterChain.Entry;
import org.apache.mina.integration.spring.Binding;
import org.easymock.AbstractMatcher;
@@ -61,7 +61,7 @@
/*
* Create the object to be tested. We're using EasyMock to mock some of
* the methods in the super class since we're already testing those in
- * AbstractIoSessionManagerFactoryBeanTest and we don't want to test
+ * AbstractIoServiceFactoryBeanTest and we don't want to test
* them in this test again.
*/
mockFactory = MockClassControl
@@ -72,14 +72,14 @@
TestIoAcceptorFactoryBean.class
.getDeclaredMethod( "createIoAcceptor",
new Class[ 0 ] ),
- AbstractIoSessionManagerFactoryBean.class
+ AbstractIoServiceFactoryBean.class
.getDeclaredMethod(
- "initIoSessionManager",
- new Class[] { IoSessionManager.class } ),
- AbstractIoSessionManagerFactoryBean.class
+ "initIoService",
+ new Class[] { IoService.class } ),
+ AbstractIoServiceFactoryBean.class
.getDeclaredMethod(
- "destroyIoSessionManager",
- new Class[] { IoSessionManager.class } ) } );
+ "destroyIoService",
+ new Class[] { IoService.class } ) } );
factory = ( AbstractIoAcceptorFactoryBean ) mockFactory.getMock();
@@ -126,7 +126,7 @@
factory.createIoAcceptor();
mockFactory.setReturnValue( ioAcceptor );
ioAcceptor.setDisconnectClientsOnUnbind( true );
- factory.initIoSessionManager( ioAcceptor );
+ factory.initIoService( ioAcceptor );
ioAcceptor.bind( new DummySocketAddress( ":110" ), popHandler, builder1 );
mockIoAcceptor.setMatcher( new IoAcceptorBindArgumentsMatcher() );
ioAcceptor.bind( new DummySocketAddress( "127.0.0.1:22" ), sshHandler, builder2 );
@@ -164,7 +164,7 @@
// ignored.
mockIoAcceptor.setThrowable( new NullPointerException() );
ioAcceptor.unbind( new DummySocketAddress( "192.168.0.1:80" ) );
- factory.destroyIoSessionManager( ioAcceptor );
+ factory.destroyIoService( ioAcceptor );
/*
* Replay.
Modified: directory/trunks/mina/integration-spring/src/test/java/org/apache/mina/integration/spring/support/AbstractIoConnectorFactoryBeanTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/integration-spring/src/test/java/org/apache/mina/integration/spring/support/AbstractIoConnectorFactoryBeanTest.java?rev=372238&r1=372237&r2=372238&view=diff
==============================================================================
--- directory/trunks/mina/integration-spring/src/test/java/org/apache/mina/integration/spring/support/AbstractIoConnectorFactoryBeanTest.java (original)
+++ directory/trunks/mina/integration-spring/src/test/java/org/apache/mina/integration/spring/support/AbstractIoConnectorFactoryBeanTest.java Wed Jan 25 07:22:11 2006
@@ -23,7 +23,7 @@
import junit.framework.TestCase;
import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoSessionManager;
+import org.apache.mina.common.IoService;
import org.easymock.MockControl;
import org.easymock.classextension.MockClassControl;
@@ -49,7 +49,7 @@
/*
* Create the object to be tested. We're using EasyMock to mock some of
* the methods in the super class since we're already testing those in
- * AbstractIoSessionManagerFactoryBeanTest and we don't want to test
+ * AbstractIoServiceFactoryBeanTest and we don't want to test
* them in this test again.
*/
mockFactory = MockClassControl
@@ -61,14 +61,14 @@
.getDeclaredMethod(
"createIoConnector",
new Class[ 0 ] ),
- AbstractIoSessionManagerFactoryBean.class
+ AbstractIoServiceFactoryBean.class
.getDeclaredMethod(
- "initIoSessionManager",
- new Class[] { IoSessionManager.class } ),
- AbstractIoSessionManagerFactoryBean.class
+ "initIoService",
+ new Class[] { IoService.class } ),
+ AbstractIoServiceFactoryBean.class
.getDeclaredMethod(
- "destroyIoSessionManager",
- new Class[] { IoSessionManager.class } ) } );
+ "destroyIoService",
+ new Class[] { IoService.class } ) } );
factory = ( AbstractIoConnectorFactoryBean ) mockFactory.getMock();
@@ -86,7 +86,7 @@
*/
factory.createIoConnector();
mockFactory.setReturnValue( ioConnector );
- factory.initIoSessionManager( ioConnector );
+ factory.initIoService( ioConnector );
ioConnector.setConnectTimeout( 30 );
/*
@@ -112,7 +112,7 @@
/*
* Record expectations.
*/
- factory.destroyIoSessionManager( ioConnector );
+ factory.destroyIoService( ioConnector );
/*
* Replay.
Copied: directory/trunks/mina/integration-spring/src/test/java/org/apache/mina/integration/spring/support/AbstractIoServiceFactoryBeanTest.java (from r372224, directory/trunks/mina/integration-spring/src/test/java/org/apache/mina/integration/spring/support/AbstractIoSessionManagerFactoryBeanTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/integration-spring/src/test/java/org/apache/mina/integration/spring/support/AbstractIoServiceFactoryBeanTest.java?p2=directory/trunks/mina/integration-spring/src/test/java/org/apache/mina/integration/spring/support/AbstractIoServiceFactoryBeanTest.java&p1=directory/trunks/mina/integration-spring/src/test/java/org/apache/mina/integration/spring/support/AbstractIoSessionManagerFactoryBeanTest.java&r1=372224&r2=372238&rev=372238&view=diff
==============================================================================
--- directory/trunks/mina/integration-spring/src/test/java/org/apache/mina/integration/spring/support/AbstractIoSessionManagerFactoryBeanTest.java (original)
+++ directory/trunks/mina/integration-spring/src/test/java/org/apache/mina/integration/spring/support/AbstractIoServiceFactoryBeanTest.java Wed Jan 25 07:22:11 2006
@@ -22,28 +22,28 @@
import org.apache.mina.common.DefaultIoFilterChainBuilder;
import org.apache.mina.common.IoFilter;
-import org.apache.mina.common.IoSessionManager;
+import org.apache.mina.common.IoService;
import org.apache.mina.integration.spring.IoFilterMapping;
import org.easymock.MockControl;
import org.easymock.classextension.MockClassControl;
/**
* Tests
- * {@link org.apache.mina.integration.spring.support.AbstractIoSessionManagerFactoryBean}.
+ * {@link org.apache.mina.integration.spring.support.AbstractIoServiceFactoryBean}.
*
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-public class AbstractIoSessionManagerFactoryBeanTest extends TestCase
+public class AbstractIoServiceFactoryBeanTest extends TestCase
{
- AbstractIoSessionManagerFactoryBean factory;
+ AbstractIoServiceFactoryBean factory;
protected void setUp() throws Exception
{
/*
* Create the object under test.
*/
- factory = new AbstractIoSessionManagerFactoryBean()
+ factory = new AbstractIoServiceFactoryBean()
{
public Class getObjectType()
{
@@ -61,7 +61,7 @@
/**
* Tests that
- * {@link AbstractIoSessionManagerFactoryBean#initIoSessionManager(IoSessionManager)}
+ * {@link AbstractIoServiceFactoryBean#initIoService(IoService)}
* initializes the filter chain in the expected order and using auto
* generated names.
*/
@@ -72,8 +72,8 @@
*/
MockControl mockIoFilterChainBuilder = MockClassControl
.createStrictControl( DefaultIoFilterChainBuilder.class );
- MockControl mockIoSessionManager = MockControl
- .createControl( IoSessionManager.class );
+ MockControl mockIoService = MockControl
+ .createControl( IoService.class );
IoFilter[] filters = new IoFilter[] {
( IoFilter ) MockControl.createControl( IoFilter.class )
@@ -83,8 +83,8 @@
( IoFilter ) MockControl.createControl( IoFilter.class )
.getMock() };
- IoSessionManager ioSessionManager =
- ( IoSessionManager ) mockIoSessionManager.getMock();
+ IoService ioSessionManager =
+ ( IoService ) mockIoService.getMock();
DefaultIoFilterChainBuilder ioFilterChainBuilder =
( DefaultIoFilterChainBuilder ) mockIoFilterChainBuilder.getMock();
@@ -96,27 +96,27 @@
ioFilterChainBuilder.addLast( "managerFilter2", filters[ 2 ] );
ioSessionManager.getFilterChain();
- mockIoSessionManager.setReturnValue( mockIoFilterChainBuilder.getMock() );
+ mockIoService.setReturnValue( mockIoFilterChainBuilder.getMock() );
/*
* Replay.
*/
mockIoFilterChainBuilder.replay();
- mockIoSessionManager.replay();
+ mockIoService.replay();
factory.setFilters( filters );
- factory.initIoSessionManager( ioSessionManager );
+ factory.initIoService( ioSessionManager );
/*
* Verify.
*/
mockIoFilterChainBuilder.verify();
- mockIoSessionManager.verify();
+ mockIoService.verify();
}
/**
* Tests that
- * {@link AbstractIoSessionManagerFactoryBean#initIoSessionManager(IoSessionManager)}
+ * {@link AbstractIoServiceFactoryBean#initIoService(IoService)}
* initializes the filter chain in the expected order and using the
* specified names.
*/
@@ -127,8 +127,8 @@
*/
MockControl mockIoFilterChainBuilder = MockClassControl
.createStrictControl( DefaultIoFilterChainBuilder.class );
- MockControl mockIoSessionManager = MockControl
- .createControl( IoSessionManager.class );
+ MockControl mockIoService = MockControl
+ .createControl( IoService.class );
IoFilterMapping[] mappings = new IoFilterMapping[] {
new IoFilterMapping( "first", ( IoFilter ) MockControl
@@ -138,7 +138,7 @@
new IoFilterMapping( "third", ( IoFilter ) MockControl
.createControl( IoFilter.class ).getMock() ) };
- IoSessionManager ioSessionManager = ( IoSessionManager ) mockIoSessionManager
+ IoService ioSessionManager = ( IoService ) mockIoService
.getMock();
DefaultIoFilterChainBuilder ioFilterChainBuilder = ( DefaultIoFilterChainBuilder ) mockIoFilterChainBuilder
.getMock();
@@ -151,38 +151,38 @@
ioFilterChainBuilder.addLast( "third", mappings[ 2 ].getFilter() );
ioSessionManager.getFilterChain();
- mockIoSessionManager.setReturnValue( mockIoFilterChainBuilder.getMock() );
+ mockIoService.setReturnValue( mockIoFilterChainBuilder.getMock() );
/*
* Replay.
*/
mockIoFilterChainBuilder.replay();
- mockIoSessionManager.replay();
+ mockIoService.replay();
factory.setFilterMappings( mappings );
- factory.initIoSessionManager( ioSessionManager );
+ factory.initIoService( ioSessionManager );
/*
* Verify.
*/
mockIoFilterChainBuilder.verify();
- mockIoSessionManager.verify();
+ mockIoService.verify();
}
/**
* Tests that
- * {@link AbstractIoSessionManagerFactoryBean#initIoSessionManager(IoSessionManager)}
- * sets the configured ExceptionManager on the IoSessionManager.
+ * {@link AbstractIoServiceFactoryBean#initIoService(IoService)}
+ * sets the configured ExceptionManager on the IoService.
*/
public void testInitWithExceptionMonitor() throws Exception
{
/*
* Create EasyMock mocks.
*/
- MockControl mockIoSessionManager = MockControl
- .createControl( IoSessionManager.class );
+ MockControl mockIoService = MockControl
+ .createControl( IoService.class );
- IoSessionManager ioSessionManager = ( IoSessionManager ) mockIoSessionManager
+ IoService ioSessionManager = ( IoService ) mockIoService
.getMock();
DefaultIoFilterChainBuilder ioFilterChainBuilder = ( DefaultIoFilterChainBuilder ) MockClassControl
.createControl( DefaultIoFilterChainBuilder.class ).getMock();
@@ -191,37 +191,37 @@
* Record expectations.
*/
ioSessionManager.getFilterChain();
- mockIoSessionManager.setReturnValue( ioFilterChainBuilder );
+ mockIoService.setReturnValue( ioFilterChainBuilder );
/*
* Replay.
*/
- mockIoSessionManager.replay();
+ mockIoService.replay();
- factory.initIoSessionManager( ioSessionManager );
+ factory.initIoService( ioSessionManager );
/*
* Verify.
*/
- mockIoSessionManager.verify();
+ mockIoService.verify();
}
/**
* Tests that
- * {@link AbstractIoSessionManagerFactoryBean#destroyIoSessionManager(IoSessionManager)}
- * clears the filter chain of the IoSessionManager.
+ * {@link AbstractIoServiceFactoryBean#destroyIoService(IoService)}
+ * clears the filter chain of the IoService.
*/
- public void testDestroyIoSessionManager() throws Exception
+ public void testDestroyIoService() throws Exception
{
/*
* Create EasyMock mocks.
*/
MockControl mockIoFilterChainBuilder = MockClassControl
.createStrictControl( DefaultIoFilterChainBuilder.class );
- MockControl mockIoSessionManager = MockControl
- .createControl( IoSessionManager.class );
+ MockControl mockIoService = MockControl
+ .createControl( IoService.class );
- IoSessionManager ioSessionManager = ( IoSessionManager ) mockIoSessionManager
+ IoService ioSessionManager = ( IoService ) mockIoService
.getMock();
DefaultIoFilterChainBuilder ioFilterChainBuilder = ( DefaultIoFilterChainBuilder ) mockIoFilterChainBuilder
.getMock();
@@ -230,27 +230,27 @@
* Record expectations.
*/
ioSessionManager.getFilterChain();
- mockIoSessionManager.setReturnValue( ioFilterChainBuilder );
+ mockIoService.setReturnValue( ioFilterChainBuilder );
ioFilterChainBuilder.clear();
/*
* Replay.
*/
mockIoFilterChainBuilder.replay();
- mockIoSessionManager.replay();
+ mockIoService.replay();
- factory.destroyIoSessionManager( ioSessionManager );
+ factory.destroyIoService( ioSessionManager );
/*
* Verify.
*/
mockIoFilterChainBuilder.verify();
- mockIoSessionManager.verify();
+ mockIoService.verify();
}
/**
* Tests that
- * {@link AbstractIoSessionManagerFactoryBean#setFilters(IoFilter[])}
+ * {@link AbstractIoServiceFactoryBean#setFilters(IoFilter[])}
* validates the method arguments.
*/
public void testSetIoFilters()
@@ -267,7 +267,7 @@
/**
* Tests that
- * {@link AbstractIoSessionManagerFactoryBean#setFilterMappings(IoFilterMapping[])}
+ * {@link AbstractIoServiceFactoryBean#setFilterMappings(IoFilterMapping[])}
* validates the method arguments.
*/
public void testSetIoFilterMappings()