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:01:41 UTC
svn commit: r372232 - in /directory/trunks/mina/core/src:
main/java/org/apache/mina/common/ main/java/org/apache/mina/common/support/
main/java/org/apache/mina/transport/socket/nio/
main/java/org/apache/mina/transport/socket/nio/support/ main/java/org/...
Author: trustin
Date: Wed Jan 25 07:01:12 2006
New Revision: 372232
URL: http://svn.apache.org/viewcvs?rev=372232&view=rev
Log:
Renamed IoSessionManager to IoService, which is shorter.
Added:
directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoService.java
- copied, changed from r372224, directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoSessionManager.java
directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoService.java
- copied, changed from r372224, directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoSessionManager.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramService.java
- copied, changed from r372224, directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSessionManager.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramService.java
- copied, changed from r372224, directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionManager.java
Removed:
directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoSessionManager.java
directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoSessionManager.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSessionManager.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionManager.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionManager.java
Modified:
directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoAcceptor.java
directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoConnector.java
directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoSession.java
directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoAcceptor.java
directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoConnector.java
directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java
directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/DefaultExceptionMonitor.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSession.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramFilterChain.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketAcceptorDelegate.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketConnectorDelegate.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketSessionImpl.java
directory/trunks/mina/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java
directory/trunks/mina/core/src/test/java/org/apache/mina/common/FutureTest.java
directory/trunks/mina/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java
directory/trunks/mina/core/src/test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java
directory/trunks/mina/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
directory/trunks/mina/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java
directory/trunks/mina/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java
directory/trunks/mina/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoAcceptor.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoAcceptor.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoAcceptor.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoAcceptor.java Wed Jan 25 07:01:12 2006
@@ -41,7 +41,7 @@
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-public interface IoAcceptor extends IoSessionManager
+public interface IoAcceptor extends IoService
{
/**
* Binds to the specified <code>address</code> and handles incoming
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoConnector.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoConnector.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoConnector.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoConnector.java Wed Jan 25 07:01:12 2006
@@ -39,7 +39,7 @@
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-public interface IoConnector extends IoSessionManager
+public interface IoConnector extends IoService
{
/**
* Connects to the specified <code>address</code>. If communication starts
Copied: directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoService.java (from r372224, directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoSessionManager.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoService.java?p2=directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoService.java&p1=directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoSessionManager.java&r1=372224&r2=372232&rev=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoSessionManager.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoService.java Wed Jan 25 07:01:12 2006
@@ -20,13 +20,13 @@
/**
- * Base interface for all acceptors and connectors that manage
- * sessions.
+ * Base interface for all {@link IoAcceptor}s and {@link IoConnector}s
+ * that provide I/O service and manage {@link IoSession}s.
*
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-public interface IoSessionManager {
+public interface IoService {
/**
* Returns the {@link IoFilterChainBuilder} which will modify the
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoSession.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoSession.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoSession.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/common/IoSession.java Wed Jan 25 07:01:12 2006
@@ -50,9 +50,9 @@
public interface IoSession {
/**
- * Returns the {@link IoSessionManager} which manages this session.
+ * Returns the {@link IoService} which manages this session.
*/
- IoSessionManager getManager();
+ IoService getManager();
/**
* Returns the {@link IoHandler} which handles this session.
@@ -209,7 +209,7 @@
/**
* Sets the {@link TrafficMask} of this session which will result
- * the parent {@link IoSessionManager} to start to control the traffic
+ * the parent {@link IoService} to start to control the traffic
* of this session immediately.
*/
void setTrafficMask( TrafficMask trafficMask );
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoAcceptor.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoAcceptor.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoAcceptor.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoAcceptor.java Wed Jan 25 07:01:12 2006
@@ -33,7 +33,7 @@
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-public abstract class BaseIoAcceptor extends BaseIoSessionManager implements IoAcceptor
+public abstract class BaseIoAcceptor extends BaseIoService implements IoAcceptor
{
private boolean disconnectClientsOnUnbind = true;
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoConnector.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoConnector.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoConnector.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoConnector.java Wed Jan 25 07:01:12 2006
@@ -31,7 +31,7 @@
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-public abstract class BaseIoConnector extends BaseIoSessionManager implements IoConnector
+public abstract class BaseIoConnector extends BaseIoService implements IoConnector
{
private int defaultConnectTimeout = 60; // 1 minute
Copied: directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoService.java (from r372224, directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoSessionManager.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoService.java?p2=directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoService.java&p1=directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoSessionManager.java&r1=372224&r2=372232&rev=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoSessionManager.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoService.java Wed Jan 25 07:01:12 2006
@@ -19,29 +19,23 @@
package org.apache.mina.common.support;
import org.apache.mina.common.DefaultIoFilterChainBuilder;
-import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.IoFilterChainBuilder;
-import org.apache.mina.common.IoSessionManager;
+import org.apache.mina.common.IoService;
/**
- * Base implementation of {@link IoSessionManager}s.
+ * Base implementation of {@link IoService}s.
*
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-public abstract class BaseIoSessionManager implements IoSessionManager {
+public abstract class BaseIoService implements IoService {
/**
- * Current exception monitor.
- */
- protected ExceptionMonitor exceptionMonitor = new DefaultExceptionMonitor();
-
- /**
* Current filter chain builder.
*/
protected IoFilterChainBuilder filterChainBuilder = new DefaultIoFilterChainBuilder();
- protected BaseIoSessionManager()
+ protected BaseIoService()
{
}
@@ -70,20 +64,5 @@
throw new IllegalStateException(
"Current filter chain builder is not a DefaultIoFilterChainBuilder." );
}
- }
-
- public ExceptionMonitor getExceptionMonitor()
- {
- return exceptionMonitor;
- }
-
- public void setExceptionMonitor( ExceptionMonitor monitor )
- {
- if( monitor == null )
- {
- monitor = new DefaultExceptionMonitor();
- }
-
- this.exceptionMonitor = monitor;
}
}
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/BaseIoSession.java Wed Jan 25 07:01:12 2006
@@ -26,7 +26,7 @@
import org.apache.mina.common.CloseFuture;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionManager;
+import org.apache.mina.common.IoService;
import org.apache.mina.common.TrafficMask;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.IoFilter.WriteRequest;
@@ -303,7 +303,7 @@
}
/**
- * Signals the {@link IoSessionManager} that the {@link TrafficMask} of this
+ * Signals the {@link IoService} that the {@link TrafficMask} of this
* session has been changed.
*/
protected abstract void updateTrafficMask();
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/DefaultExceptionMonitor.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/DefaultExceptionMonitor.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/DefaultExceptionMonitor.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/common/support/DefaultExceptionMonitor.java Wed Jan 25 07:01:12 2006
@@ -19,7 +19,7 @@
package org.apache.mina.common.support;
import org.apache.mina.common.ExceptionMonitor;
-import org.apache.mina.common.IoSessionManager;
+import org.apache.mina.common.IoService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,7 +27,7 @@
* A default {@link ExceptionMonitor} implementation that logs uncaught
* exceptions using {@link Logger}.
* <p>
- * All {@link IoSessionManager}s have this implementation as a default exception
+ * All {@link IoService}s have this implementation as a default exception
* monitor.
*
* @author The Apache Directory Project (dev@directory.apache.org)
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java Wed Jan 25 07:01:12 2006
@@ -28,7 +28,7 @@
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-public class DatagramAcceptor extends DelegatedIoAcceptor implements DatagramSessionManager
+public class DatagramAcceptor extends DelegatedIoAcceptor implements DatagramService
{
/**
* Creates a new instance.
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java Wed Jan 25 07:01:12 2006
@@ -28,7 +28,7 @@
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-public class DatagramConnector extends DelegatedIoConnector implements DatagramSessionManager
+public class DatagramConnector extends DelegatedIoConnector implements DatagramService
{
/**
* Creates a new instance.
Copied: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramService.java (from r372224, directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSessionManager.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramService.java?p2=directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramService.java&p1=directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSessionManager.java&r1=372224&r2=372232&rev=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSessionManager.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramService.java Wed Jan 25 07:01:12 2006
@@ -20,17 +20,17 @@
import java.net.DatagramSocket;
-import org.apache.mina.common.IoSessionManager;
+import org.apache.mina.common.IoService;
/**
- * An {@link IoSessionManager} which provides some common properties related with
+ * An {@link IoService} which provides some common properties related with
* NIO UDP/IP sockets.
*
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
*
*/
-public interface DatagramSessionManager extends IoSessionManager
+public interface DatagramService extends IoService
{
/**
* @see DatagramSocket#getBroadcast()
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSession.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSession.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSession.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSession.java Wed Jan 25 07:01:12 2006
@@ -18,6 +18,7 @@
*/
package org.apache.mina.transport.socket.nio;
+import java.net.DatagramSocket;
import java.net.SocketException;
import org.apache.mina.common.IoSession;
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java Wed Jan 25 07:01:12 2006
@@ -28,7 +28,7 @@
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-public class SocketAcceptor extends DelegatedIoAcceptor implements SocketSessionManager
+public class SocketAcceptor extends DelegatedIoAcceptor
{
/**
* Creates a new instance.
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java Wed Jan 25 07:01:12 2006
@@ -28,7 +28,7 @@
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-public class SocketConnector extends DelegatedIoConnector implements SocketSessionManager
+public class SocketConnector extends DelegatedIoConnector
{
/**
* Creates a new instance.
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java Wed Jan 25 07:01:12 2006
@@ -45,7 +45,7 @@
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-public class DatagramAcceptorDelegate extends BaseIoAcceptor implements IoAcceptor, DatagramSessionManager
+public class DatagramAcceptorDelegate extends BaseIoAcceptor implements IoAcceptor, DatagramService
{
private static volatile int nextId = 0;
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java Wed Jan 25 07:01:12 2006
@@ -43,7 +43,7 @@
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-public class DatagramConnectorDelegate extends BaseIoConnector implements DatagramSessionManager
+public class DatagramConnectorDelegate extends BaseIoConnector implements DatagramService
{
private static volatile int nextId = 0;
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramFilterChain.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramFilterChain.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramFilterChain.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramFilterChain.java Wed Jan 25 07:01:12 2006
@@ -47,7 +47,7 @@
writeRequestQueue.push( writeRequest );
if( writeRequestQueue.size() == 1 && session.getTrafficMask().isWritable() )
{
- // Notify DatagramSessionManager only when writeRequestQueue was empty.
+ // Notify DatagramService only when writeRequestQueue was empty.
s.getManagerDelegate().flushSession( s );
}
}
@@ -56,7 +56,7 @@
protected void doClose( IoSession session, CloseFuture closeFuture )
{
DatagramSessionImpl s = ( DatagramSessionImpl ) session;
- DatagramSessionManager manager = s.getManagerDelegate();
+ DatagramService manager = s.getManagerDelegate();
if( manager instanceof DatagramConnectorDelegate )
{
( ( DatagramConnectorDelegate ) manager ).closeSession( s );
Copied: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramService.java (from r372224, directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionManager.java)
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramService.java?p2=directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramService.java&p1=directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionManager.java&r1=372224&r2=372232&rev=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionManager.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramService.java Wed Jan 25 07:01:12 2006
@@ -25,7 +25,7 @@
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-interface DatagramSessionManager extends org.apache.mina.transport.socket.nio.DatagramSessionManager
+interface DatagramService extends org.apache.mina.transport.socket.nio.DatagramService
{
/**
* Requests this processor to flush the write buffer of the specified
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java Wed Jan 25 07:01:12 2006
@@ -27,7 +27,7 @@
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionManager;
+import org.apache.mina.common.IoService;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.IoFilter.WriteRequest;
import org.apache.mina.common.support.BaseIoSession;
@@ -42,8 +42,8 @@
*/
class DatagramSessionImpl extends BaseIoSession implements DatagramSession
{
- private final IoSessionManager wrapperManager;
- private final DatagramSessionManager managerDelegate;
+ private final IoService wrapperManager;
+ private final DatagramService managerDelegate;
private final DatagramFilterChain filterChain;
private final DatagramChannel ch;
private final Queue writeRequestQueue;
@@ -55,8 +55,8 @@
/**
* Creates a new instance.
*/
- DatagramSessionImpl( IoSessionManager wrapperManager,
- DatagramSessionManager managerDelegate,
+ DatagramSessionImpl( IoService wrapperManager,
+ DatagramService managerDelegate,
DatagramChannel ch, IoHandler defaultHandler )
{
this.wrapperManager = wrapperManager;
@@ -69,12 +69,12 @@
this.localAddress = ch.socket().getLocalSocketAddress();
}
- public IoSessionManager getManager()
+ public IoService getManager()
{
return wrapperManager;
}
- DatagramSessionManager getManagerDelegate()
+ DatagramService getManagerDelegate()
{
return managerDelegate;
}
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketAcceptorDelegate.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketAcceptorDelegate.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketAcceptorDelegate.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketAcceptorDelegate.java Wed Jan 25 07:01:12 2006
@@ -42,7 +42,6 @@
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.support.BaseIoAcceptor;
-import org.apache.mina.transport.socket.nio.SocketSessionManager;
import org.apache.mina.util.Queue;
/**
@@ -51,7 +50,7 @@
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-public class SocketAcceptorDelegate extends BaseIoAcceptor implements SocketSessionManager
+public class SocketAcceptorDelegate extends BaseIoAcceptor
{
private static volatile int nextId = 0;
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketConnectorDelegate.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketConnectorDelegate.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketConnectorDelegate.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketConnectorDelegate.java Wed Jan 25 07:01:12 2006
@@ -36,7 +36,6 @@
import org.apache.mina.common.IoFilterChainBuilder;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.support.BaseIoConnector;
-import org.apache.mina.transport.socket.nio.SocketSessionManager;
import org.apache.mina.util.Queue;
/**
@@ -45,7 +44,7 @@
* @author The Apache Directory Project (dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-public class SocketConnectorDelegate extends BaseIoConnector implements SocketSessionManager
+public class SocketConnectorDelegate extends BaseIoConnector
{
private static volatile int nextId = 0;
@@ -286,16 +285,6 @@
session.getManagedSessions().add( session );
session.getIoProcessor().addNew( session );
return session;
- }
-
- public int getProcessors()
- {
- throw new UnsupportedOperationException();
- }
-
- public void setProcessors( int nProcessor )
- {
- throw new UnsupportedOperationException();
}
private class Worker extends Thread
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketSessionImpl.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketSessionImpl.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketSessionImpl.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/socket/nio/support/SocketSessionImpl.java Wed Jan 25 07:01:12 2006
@@ -28,7 +28,7 @@
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionManager;
+import org.apache.mina.common.IoService;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.IoFilter.WriteRequest;
import org.apache.mina.common.support.BaseIoSession;
@@ -45,7 +45,7 @@
{
private static final int DEFAULT_READ_BUFFER_SIZE = 1024;
- private final IoSessionManager manager;
+ private final IoService manager;
private final SocketIoProcessor ioProcessor;
private final SocketFilterChain filterChain;
private final SocketChannel ch;
@@ -61,7 +61,7 @@
* Creates a new instance.
*/
public SocketSessionImpl(
- IoSessionManager manager, Set managedSessions,
+ IoService manager, Set managedSessions,
SocketChannel ch, IoHandler defaultHandler )
{
this.manager = manager;
@@ -75,7 +75,7 @@
this.localAddress = ch.socket().getLocalSocketAddress();
}
- public IoSessionManager getManager()
+ public IoService getManager()
{
return manager;
}
Modified: directory/trunks/mina/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java (original)
+++ directory/trunks/mina/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java Wed Jan 25 07:01:12 2006
@@ -13,7 +13,7 @@
import org.apache.mina.common.IoFilterChainBuilder;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionManager;
+import org.apache.mina.common.IoService;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.IoFilter.WriteRequest;
import org.apache.mina.common.support.BaseIoSession;
@@ -30,7 +30,7 @@
*/
public class VmPipeSessionImpl extends BaseIoSession implements VmPipeSession
{
- private final IoSessionManager manager;
+ private final IoService manager;
private final SocketAddress localAddress;
private final SocketAddress remoteAddress;
private final IoHandler handler;
@@ -43,7 +43,7 @@
/**
* Constructor for client-side session.
*/
- public VmPipeSessionImpl( IoSessionManager manager, Object lock, SocketAddress localAddress,
+ public VmPipeSessionImpl( IoService manager, Object lock, SocketAddress localAddress,
IoHandler handler, IoFilterChainBuilder filterChainBuilder,
VmPipe remoteEntry ) throws IOException
{
@@ -99,7 +99,7 @@
/**
* Constructor for server-side session.
*/
- private VmPipeSessionImpl( IoSessionManager manager, VmPipeSessionImpl remoteSession, VmPipe entry )
+ private VmPipeSessionImpl( IoService manager, VmPipeSessionImpl remoteSession, VmPipe entry )
{
this.manager = manager;
this.lock = remoteSession.lock;
@@ -117,7 +117,7 @@
return managedSessions;
}
- public IoSessionManager getManager()
+ public IoService getManager()
{
return manager;
}
Modified: directory/trunks/mina/core/src/test/java/org/apache/mina/common/FutureTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/test/java/org/apache/mina/common/FutureTest.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/test/java/org/apache/mina/common/FutureTest.java (original)
+++ directory/trunks/mina/core/src/test/java/org/apache/mina/common/FutureTest.java Wed Jan 25 07:01:12 2006
@@ -102,7 +102,7 @@
return false;
}
- public IoSessionManager getManager()
+ public IoService getManager()
{
return null;
}
Modified: directory/trunks/mina/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java (original)
+++ directory/trunks/mina/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java Wed Jan 25 07:01:12 2006
@@ -295,7 +295,7 @@
return false;
}
- public IoSessionManager getManager()
+ public IoService getManager()
{
return null;
}
@@ -381,7 +381,7 @@
{
}
- public IoSessionManager getManager()
+ public IoService getManager()
{
return null;
}
Modified: directory/trunks/mina/core/src/test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java (original)
+++ directory/trunks/mina/core/src/test/java/org/apache/mina/filter/ThreadPoolFilterRegressionTest.java Wed Jan 25 07:01:12 2006
@@ -10,7 +10,7 @@
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionManager;
+import org.apache.mina.common.IoService;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.IoFilter.NextFilter;
@@ -186,7 +186,7 @@
return false;
}
- public IoSessionManager getManager()
+ public IoService getManager()
{
return null;
}
@@ -290,7 +290,7 @@
return false;
}
- public IoSessionManager getManager()
+ public IoService getManager()
{
return null;
}
Modified: directory/trunks/mina/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java (original)
+++ directory/trunks/mina/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java Wed Jan 25 07:01:12 2006
@@ -30,7 +30,7 @@
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionManager;
+import org.apache.mina.common.IoService;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.support.BaseIoSession;
@@ -228,7 +228,7 @@
return false;
}
- public IoSessionManager getManager()
+ public IoService getManager()
{
return null;
}
Modified: directory/trunks/mina/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java (original)
+++ directory/trunks/mina/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java Wed Jan 25 07:01:12 2006
@@ -29,7 +29,7 @@
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionManager;
+import org.apache.mina.common.IoService;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.support.BaseIoSession;
import org.apache.mina.filter.codec.support.SimpleProtocolDecoderOutput;
@@ -184,7 +184,7 @@
{
}
- public IoSessionManager getManager()
+ public IoService getManager()
{
return null;
}
Modified: directory/trunks/mina/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java (original)
+++ directory/trunks/mina/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java Wed Jan 25 07:01:12 2006
@@ -28,7 +28,7 @@
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionManager;
+import org.apache.mina.common.IoService;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.support.BaseIoSession;
@@ -78,7 +78,7 @@
{
}
- public IoSessionManager getManager()
+ public IoService getManager()
{
return null;
}
Modified: directory/trunks/mina/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/mina/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java?rev=372232&r1=372231&r2=372232&view=diff
==============================================================================
--- directory/trunks/mina/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java (original)
+++ directory/trunks/mina/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java Wed Jan 25 07:01:12 2006
@@ -26,7 +26,7 @@
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionManager;
+import org.apache.mina.common.IoService;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.support.BaseIoSession;
@@ -58,7 +58,7 @@
{
}
- public IoSessionManager getManager()
+ public IoService getManager()
{
return null;
}