You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/08/14 11:34:09 UTC
svn commit: r565673 [1/2] - in /mina/trunk:
core/src/main/java/org/apache/mina/common/
core/src/main/java/org/apache/mina/filter/codec/
core/src/main/java/org/apache/mina/filter/codec/support/
core/src/main/java/org/apache/mina/filter/firewall/ core/sr...
Author: trustin
Date: Tue Aug 14 02:33:51 2007
New Revision: 565673
URL: http://svn.apache.org/viewvc?view=rev&rev=565673
Log:
* Renamed Base* to Abstract* which sounds more familiar to most developers
* Renamed DelegatedIoAcceptor to IoAcceptorWrapper and DelegatedIoConnector to IoConnectorWrapper respectively
* Renamed SessionIdleStatusChecked to IdleStatusChecker to make its name get aligned with IdleStatus type
* Renamed SessionLog to IoSessionLogger to make its name get aligned with IoSession type and SLF4J Logger type
Added:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractByteBuffer.java
- copied, changed from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/BaseByteBuffer.java
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java
- copied, changed from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoConnector.java
- copied, changed from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoConnector.java
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java
- copied, changed from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoService.java
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSession.java
- copied, changed from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoSession.java
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSessionConfig.java
- copied, changed from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/common/IdleStatusChecker.java
- copied, changed from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/SessionIdleStatusChecker.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoAcceptorWrapper.java
- copied, changed from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/DelegatedIoAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoConnectorWrapper.java
- copied, changed from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/DelegatedIoConnector.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoSessionLogger.java
- copied, changed from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/SessionLog.java
Removed:
mina/trunk/core/src/main/java/org/apache/mina/common/BaseByteBuffer.java
mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoConnector.java
mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoService.java
mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoSession.java
mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/common/DelegatedIoAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/common/DelegatedIoConnector.java
mina/trunk/core/src/main/java/org/apache/mina/common/SessionIdleStatusChecker.java
mina/trunk/core/src/main/java/org/apache/mina/common/SessionLog.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoFilterChain.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoHandlerAdapter.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/common/SimpleByteBufferAllocator.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java
mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/reqres/RequestResponseFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java
mina/trunk/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultDatagramSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultSocketSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/DefaultVmPipeSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java
mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java
mina/trunk/core/src/test/java/org/apache/mina/common/support/FutureTest.java
mina/trunk/core/src/test/java/org/apache/mina/common/support/IoServiceListenerSupportTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/reqres/RequestResponseFilterTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java
mina/trunk/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java
mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/ServerHandler.java
mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java
mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java
mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java
mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoSessionManager.java
mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/DefaultSerialSessionConfig.java
mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java
mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/AbstractByteBuffer.java (from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/BaseByteBuffer.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractByteBuffer.java?view=diff&rev=565673&p1=mina/trunk/core/src/main/java/org/apache/mina/common/BaseByteBuffer.java&r1=565669&p2=mina/trunk/core/src/main/java/org/apache/mina/common/AbstractByteBuffer.java&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/BaseByteBuffer.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractByteBuffer.java Tue Aug 14 02:33:51 2007
@@ -39,7 +39,7 @@
* @noinspection StaticNonFinalField
* @see ByteBufferAllocator
*/
-public abstract class BaseByteBuffer extends ByteBuffer {
+public abstract class AbstractByteBuffer extends ByteBuffer {
private boolean autoExpand;
private boolean autoExpandAllowed = true;
@@ -50,11 +50,11 @@
*/
private int mark = -1;
- protected BaseByteBuffer() {
+ protected AbstractByteBuffer() {
this(true);
}
- protected BaseByteBuffer(boolean autoExpandAllowed) {
+ protected AbstractByteBuffer(boolean autoExpandAllowed) {
this.autoExpandAllowed = autoExpandAllowed;
}
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java (from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoAcceptor.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java?view=diff&rev=565673&p1=mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoAcceptor.java&r1=565669&p2=mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java Tue Aug 14 02:33:51 2007
@@ -29,7 +29,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public abstract class BaseIoAcceptor extends BaseIoService implements
+public abstract class AbstractIoAcceptor extends AbstractIoService implements
IoAcceptor {
private SocketAddress localAddress;
@@ -44,7 +44,7 @@
*/
protected final Object bindLock = new Object();
- protected BaseIoAcceptor(IoSessionConfig sessionConfig) {
+ protected AbstractIoAcceptor(IoSessionConfig sessionConfig) {
super(sessionConfig);
}
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoConnector.java (from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoConnector.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoConnector.java?view=diff&rev=565673&p1=mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoConnector.java&r1=565669&p2=mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoConnector.java&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoConnector.java Tue Aug 14 02:33:51 2007
@@ -28,11 +28,11 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public abstract class BaseIoConnector extends BaseIoService implements
+public abstract class AbstractIoConnector extends AbstractIoService implements
IoConnector {
private int connectTimeout = 60; // 1 minute
- protected BaseIoConnector(IoSessionConfig sessionConfig) {
+ protected AbstractIoConnector(IoSessionConfig sessionConfig) {
super(sessionConfig);
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoFilterChain.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoFilterChain.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoFilterChain.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoFilterChain.java Tue Aug 14 02:33:51 2007
@@ -396,7 +396,7 @@
entry.getFilter().exceptionCaught(entry.getNextFilter(), session,
cause);
} catch (Throwable e) {
- SessionLog.warn(session,
+ IoSessionLogger.warn(session,
"Unexpected exception from exceptionCaught handler.", e);
}
}
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java (from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoService.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java?view=diff&rev=565673&p1=mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoService.java&r1=565669&p2=mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoService.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java Tue Aug 14 02:33:51 2007
@@ -28,7 +28,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public abstract class BaseIoService implements IoService {
+public abstract class AbstractIoService implements IoService {
/**
* Current filter chain builder.
*/
@@ -49,7 +49,7 @@
*/
private IoSessionConfig sessionConfig;
- protected BaseIoService(IoSessionConfig sessionConfig) {
+ protected AbstractIoService(IoSessionConfig sessionConfig) {
if (sessionConfig == null) {
throw new NullPointerException("sessionConfig");
}
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSession.java (from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoSession.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSession.java?view=diff&rev=565673&p1=mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoSession.java&r1=565669&p2=mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSession.java&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoSession.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSession.java Tue Aug 14 02:33:51 2007
@@ -37,7 +37,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public abstract class BaseIoSession implements IoSession {
+public abstract class AbstractIoSession implements IoSession {
private final Object lock = new Object();
private final Map<String, Object> attributes = Collections
@@ -88,7 +88,7 @@
private long lastIdleTimeForWrite;
- protected BaseIoSession() {
+ protected AbstractIoSession() {
creationTime = lastReadTime = lastWriteTime = lastIdleTimeForBoth = lastIdleTimeForRead = lastIdleTimeForWrite = System
.currentTimeMillis();
}
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSessionConfig.java (from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoSessionConfig.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSessionConfig.java?view=diff&rev=565673&p1=mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoSessionConfig.java&r1=565669&p2=mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSessionConfig.java&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/BaseIoSessionConfig.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSessionConfig.java Tue Aug 14 02:33:51 2007
@@ -26,19 +26,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public abstract class BaseIoSessionConfig implements IoSessionConfig, Cloneable {
- protected BaseIoSessionConfig() {
- }
-
- @Override
- public Object clone() {
- BaseIoSessionConfig ret;
- try {
- ret = (BaseIoSessionConfig) super.clone();
- } catch (CloneNotSupportedException e) {
- throw (InternalError) new InternalError().initCause(e);
- }
-
- return ret;
+public abstract class AbstractIoSessionConfig implements IoSessionConfig {
+ protected AbstractIoSessionConfig() {
}
}
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/IdleStatusChecker.java (from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/SessionIdleStatusChecker.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IdleStatusChecker.java?view=diff&rev=565673&p1=mina/trunk/core/src/main/java/org/apache/mina/common/SessionIdleStatusChecker.java&r1=565669&p2=mina/trunk/core/src/main/java/org/apache/mina/common/IdleStatusChecker.java&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/SessionIdleStatusChecker.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IdleStatusChecker.java Tue Aug 14 02:33:51 2007
@@ -30,22 +30,22 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev: 525369 $, $Date: 2007-04-04 05:05:11 +0200 (mer., 04 avr. 2007) $
*/
-public class SessionIdleStatusChecker {
- private static final SessionIdleStatusChecker INSTANCE = new SessionIdleStatusChecker();
+public class IdleStatusChecker {
+ private static final IdleStatusChecker INSTANCE = new IdleStatusChecker();
- public static SessionIdleStatusChecker getInstance() {
+ public static IdleStatusChecker getInstance() {
return INSTANCE;
}
- private final Set<BaseIoSession> sessions = new IdentityHashSet<BaseIoSession>();
+ private final Set<AbstractIoSession> sessions = new IdentityHashSet<AbstractIoSession>();
private final Worker worker = new Worker();
- private SessionIdleStatusChecker() {
+ private IdleStatusChecker() {
worker.start();
}
- public void addSession(BaseIoSession session) {
+ public void addSession(AbstractIoSession session) {
synchronized (sessions) {
sessions.add(session);
}
@@ -68,9 +68,9 @@
long currentTime = System.currentTimeMillis();
synchronized (sessions) {
- Iterator<BaseIoSession> it = sessions.iterator();
+ Iterator<AbstractIoSession> it = sessions.iterator();
while (it.hasNext()) {
- BaseIoSession session = it.next();
+ AbstractIoSession session = it.next();
if (!session.isConnected()) {
it.remove();
} else {
@@ -82,7 +82,7 @@
}
}
- private void notifyIdleSession(BaseIoSession session, long currentTime) {
+ private void notifyIdleSession(AbstractIoSession session, long currentTime) {
notifyIdleSession0(session, currentTime, session
.getIdleTimeInMillis(IdleStatus.BOTH_IDLE),
IdleStatus.BOTH_IDLE, Math.max(session.getLastIoTime(), session
@@ -97,7 +97,7 @@
session.getLastIdleTime(IdleStatus.WRITER_IDLE)));
}
- private void notifyIdleSession0(BaseIoSession session, long currentTime,
+ private void notifyIdleSession0(AbstractIoSession session, long currentTime,
long idleTime, IdleStatus status, long lastIoTime) {
if (idleTime > 0 && lastIoTime != 0
&& (currentTime - lastIoTime) >= idleTime) {
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/IoAcceptorWrapper.java (from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/DelegatedIoAcceptor.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoAcceptorWrapper.java?view=diff&rev=565673&p1=mina/trunk/core/src/main/java/org/apache/mina/common/DelegatedIoAcceptor.java&r1=565669&p2=mina/trunk/core/src/main/java/org/apache/mina/common/IoAcceptorWrapper.java&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/DelegatedIoAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoAcceptorWrapper.java Tue Aug 14 02:33:51 2007
@@ -25,97 +25,97 @@
/**
- * A delegated {@link IoAcceptor} that wraps the other {@link IoAcceptor}.
+ * An {@link IoAcceptor} that wraps the other {@link IoAcceptor}.
*
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public class DelegatedIoAcceptor implements IoAcceptor {
- protected IoAcceptor delegate;
+public class IoAcceptorWrapper implements IoAcceptor {
+ protected IoAcceptor acceptor;
/**
* Creates a new instance.
*/
- protected DelegatedIoAcceptor() {
+ protected IoAcceptorWrapper() {
}
/**
- * Sets the delegate. This method should be invoked before any operations
+ * Sets the acceptor to be wrapped. This method should be invoked before any operations
* is requested.
*/
- protected void init(IoAcceptor delegate) {
- this.delegate = delegate;
+ protected void init(IoAcceptor acceptor) {
+ this.acceptor = acceptor;
}
public IoFilterChainBuilder getFilterChainBuilder() {
- return delegate.getFilterChainBuilder();
+ return acceptor.getFilterChainBuilder();
}
public void setFilterChainBuilder(IoFilterChainBuilder builder) {
- delegate.setFilterChainBuilder(builder);
+ acceptor.setFilterChainBuilder(builder);
}
public DefaultIoFilterChainBuilder getFilterChain() {
- return delegate.getFilterChain();
+ return acceptor.getFilterChain();
}
public void addListener(IoServiceListener listener) {
- delegate.addListener(listener);
+ acceptor.addListener(listener);
}
public void removeListener(IoServiceListener listener) {
- delegate.removeListener(listener);
+ acceptor.removeListener(listener);
}
public void bind() throws IOException {
- delegate.bind();
+ acceptor.bind();
}
public SocketAddress getLocalAddress() {
- return delegate.getLocalAddress();
+ return acceptor.getLocalAddress();
}
public boolean isDisconnectOnUnbind() {
- return delegate.isDisconnectOnUnbind();
+ return acceptor.isDisconnectOnUnbind();
}
public IoSession newSession(SocketAddress remoteAddress) {
- return delegate.newSession(remoteAddress);
+ return acceptor.newSession(remoteAddress);
}
public void setDisconnectOnUnbind(boolean disconnectOnUnbind) {
- delegate.setDisconnectOnUnbind(disconnectOnUnbind);
+ acceptor.setDisconnectOnUnbind(disconnectOnUnbind);
}
public void setLocalAddress(SocketAddress localAddress) {
- delegate.setLocalAddress(localAddress);
+ acceptor.setLocalAddress(localAddress);
}
public void unbind() {
- delegate.unbind();
+ acceptor.unbind();
}
public IoHandler getHandler() {
- return delegate.getHandler();
+ return acceptor.getHandler();
}
public Set<IoSession> getManagedSessions() {
- return delegate.getManagedSessions();
+ return acceptor.getManagedSessions();
}
public IoSessionConfig getSessionConfig() {
- return delegate.getSessionConfig();
+ return acceptor.getSessionConfig();
}
public void setHandler(IoHandler handler) {
- delegate.setHandler(handler);
+ acceptor.setHandler(handler);
}
public boolean isBound() {
- return delegate.isBound();
+ return acceptor.isBound();
}
public TransportType getTransportType() {
- return delegate.getTransportType();
+ return acceptor.getTransportType();
}
}
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/IoConnectorWrapper.java (from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/DelegatedIoConnector.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoConnectorWrapper.java?view=diff&rev=565673&p1=mina/trunk/core/src/main/java/org/apache/mina/common/DelegatedIoConnector.java&r1=565669&p2=mina/trunk/core/src/main/java/org/apache/mina/common/IoConnectorWrapper.java&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/DelegatedIoConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoConnectorWrapper.java Tue Aug 14 02:33:51 2007
@@ -24,86 +24,86 @@
/**
- * A delegated {@link IoConnector} that wraps the other {@link IoConnector}.
+ * An {@link IoConnector} that wraps the other {@link IoConnector}.
*
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public class DelegatedIoConnector implements IoConnector {
- protected IoConnector delegate;
+public class IoConnectorWrapper implements IoConnector {
+ protected IoConnector connector;
/**
* Creates a new instance.
*/
- protected DelegatedIoConnector() {
+ protected IoConnectorWrapper() {
}
/**
- * Sets the delegate. This method should be invoked before any operation
+ * Sets the connector to be wrapped. This method should be invoked before any operation
* is requested.
*/
- protected void init(IoConnector delegate) {
- this.delegate = delegate;
+ protected void init(IoConnector connector) {
+ this.connector = connector;
}
public IoFilterChainBuilder getFilterChainBuilder() {
- return delegate.getFilterChainBuilder();
+ return connector.getFilterChainBuilder();
}
public void setFilterChainBuilder(IoFilterChainBuilder builder) {
- delegate.setFilterChainBuilder(builder);
+ connector.setFilterChainBuilder(builder);
}
public DefaultIoFilterChainBuilder getFilterChain() {
- return delegate.getFilterChain();
+ return connector.getFilterChain();
}
public void addListener(IoServiceListener listener) {
- delegate.addListener(listener);
+ connector.addListener(listener);
}
public void removeListener(IoServiceListener listener) {
- delegate.removeListener(listener);
+ connector.removeListener(listener);
}
public ConnectFuture connect(SocketAddress remoteAddress) {
- return delegate.connect(remoteAddress);
+ return connector.connect(remoteAddress);
}
public ConnectFuture connect(SocketAddress remoteAddress,
SocketAddress localAddress) {
- return delegate.connect(remoteAddress, localAddress);
+ return connector.connect(remoteAddress, localAddress);
}
public int getConnectTimeout() {
- return delegate.getConnectTimeout();
+ return connector.getConnectTimeout();
}
public long getConnectTimeoutMillis() {
- return delegate.getConnectTimeoutMillis();
+ return connector.getConnectTimeoutMillis();
}
public void setConnectTimeout(int connectTimeout) {
- delegate.setConnectTimeout(connectTimeout);
+ connector.setConnectTimeout(connectTimeout);
}
public IoHandler getHandler() {
- return delegate.getHandler();
+ return connector.getHandler();
}
public Set<IoSession> getManagedSessions() {
- return delegate.getManagedSessions();
+ return connector.getManagedSessions();
}
public IoSessionConfig getSessionConfig() {
- return delegate.getSessionConfig();
+ return connector.getSessionConfig();
}
public void setHandler(IoHandler handler) {
- delegate.setHandler(handler);
+ connector.setHandler(handler);
}
public TransportType getTransportType() {
- return delegate.getTransportType();
+ return connector.getTransportType();
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/IoHandlerAdapter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoHandlerAdapter.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoHandlerAdapter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoHandlerAdapter.java Tue Aug 14 02:33:51 2007
@@ -44,8 +44,8 @@
public void exceptionCaught(IoSession session, Throwable cause)
throws Exception {
- if (SessionLog.isWarnEnabled(session)) {
- SessionLog.warn(session, "EXCEPTION, please implement "
+ if (IoSessionLogger.isWarnEnabled(session)) {
+ IoSessionLogger.warn(session, "EXCEPTION, please implement "
+ getClass().getName()
+ ".exceptionCaught() for proper handling:", cause);
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/IoSessionConfig.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoSessionConfig.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoSessionConfig.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoSessionConfig.java Tue Aug 14 02:33:51 2007
@@ -26,8 +26,4 @@
* @version $Rev$, $Date$
*/
public interface IoSessionConfig {
- /**
- * Returns a deep clone of this configuration.
- */
- Object clone();
}
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/IoSessionLogger.java (from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/SessionLog.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoSessionLogger.java?view=diff&rev=565673&p1=mina/trunk/core/src/main/java/org/apache/mina/common/SessionLog.java&r1=565669&p2=mina/trunk/core/src/main/java/org/apache/mina/common/IoSessionLogger.java&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/SessionLog.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoSessionLogger.java Tue Aug 14 02:33:51 2007
@@ -34,18 +34,18 @@
* @version $Rev$, $Date$
*
*/
-public class SessionLog {
+public class IoSessionLogger {
/**
* Session attribute key: prefix string
*/
- public static final String PREFIX = SessionLog.class.getName() + ".prefix";
+ public static final String PREFIX = IoSessionLogger.class.getName() + ".prefix";
/**
* Session attribute key: {@link Logger}
*/
- public static final String LOGGER = SessionLog.class.getName() + ".logger";
+ public static final String LOGGER = IoSessionLogger.class.getName() + ".logger";
- private static Class getClass(IoSession session) {
+ private static Class<? extends IoHandler> getClass(IoSession session) {
return session.getHandler().getClass();
}
@@ -174,7 +174,7 @@
Logger log = (Logger) session.getAttribute(LOGGER);
if (log == null) {
log = LoggerFactory.getLogger(getClass(session).getName() + "."
- + SessionLog.class.getSimpleName());
+ + IoSessionLogger.class.getSimpleName());
setLogger(session, log);
}
return log;
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/SimpleByteBufferAllocator.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/SimpleByteBufferAllocator.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/SimpleByteBufferAllocator.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/SimpleByteBufferAllocator.java Tue Aug 14 02:33:51 2007
@@ -52,7 +52,7 @@
public void dispose() {
}
- private static class SimpleByteBuffer extends BaseByteBuffer {
+ private static class SimpleByteBuffer extends AbstractByteBuffer {
private java.nio.ByteBuffer buf;
protected SimpleByteBuffer(java.nio.ByteBuffer buf,
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java Tue Aug 14 02:33:51 2007
@@ -28,7 +28,7 @@
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.SessionLog;
+import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.WriteRequestWrapper;
@@ -296,7 +296,7 @@
try {
encoder.dispose(session);
} catch (Throwable t) {
- SessionLog.warn(session, "Failed to dispose: "
+ IoSessionLogger.warn(session, "Failed to dispose: "
+ encoder.getClass().getName() + " (" + encoder + ')');
}
}
@@ -311,7 +311,7 @@
try {
decoder.dispose(session);
} catch (Throwable t) {
- SessionLog.warn(session, "Falied to dispose: "
+ IoSessionLogger.warn(session, "Falied to dispose: "
+ decoder.getClass().getName() + " (" + decoder + ')');
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/support/SimpleProtocolDecoderOutput.java Tue Aug 14 02:33:51 2007
@@ -22,7 +22,7 @@
import java.util.LinkedList;
import java.util.Queue;
-import org.apache.mina.common.BaseIoSession;
+import org.apache.mina.common.AbstractIoSession;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoFilter.NextFilter;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
@@ -52,8 +52,8 @@
}
messageQueue.offer(message);
- if (session instanceof BaseIoSession) {
- ((BaseIoSession) session).increaseReadMessages();
+ if (session instanceof AbstractIoSession) {
+ ((AbstractIoSession) session).increaseReadMessages();
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java Tue Aug 14 02:33:51 2007
@@ -30,7 +30,7 @@
import org.apache.mina.common.IoFilter;
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.SessionLog;
+import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.WriteRequest;
/**
@@ -180,7 +180,7 @@
}
private void blockSession(IoSession session) {
- SessionLog.info(session, "Remote address in the blacklist; closing.");
+ IoSessionLogger.info(session, "Remote address in the blacklist; closing.");
session.close();
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java Tue Aug 14 02:33:51 2007
@@ -28,7 +28,7 @@
import org.apache.mina.common.IoFilter;
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.SessionLog;
+import org.apache.mina.common.IoSessionLogger;
/**
* A {@link IoFilter} which blocks connections from connecting
@@ -94,14 +94,14 @@
if (clients.containsKey(addr.getAddress().getHostAddress())) {
clients.put(addr.getAddress().getHostAddress(), now);
- SessionLog.info(session, "This is not a new client");
+ IoSessionLogger.info(session, "This is not a new client");
Long lastConnTime = clients.get(addr.getAddress()
.getHostAddress());
// if the interval between now and the last connection is
// less than the allowed interval, return false
if ((now - lastConnTime) < allowedInterval) {
- SessionLog.error(session,
+ IoSessionLogger.error(session,
"Session connection interval too short");
return false;
} else {
@@ -120,7 +120,7 @@
public void sessionCreated(NextFilter nextFilter, IoSession session)
throws Exception {
if (!isConnectionOk(session)) {
- SessionLog
+ IoSessionLogger
.info(session, "Connections coming in too fast; closing.");
session.close();
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java Tue Aug 14 02:33:51 2007
@@ -27,12 +27,12 @@
import org.apache.mina.common.IoEventType;
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.SessionLog;
+import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.WriteRequest;
/**
- * Logs all MINA protocol events using the {@link SessionLog}. Each event can be
+ * Logs all MINA protocol events using the {@link IoSessionLogger}. Each event can be
* tuned to use a different level based on the user's specific requirements. Methods
* are in place that allow the user to use either the get or set method for each event
* and pass in the {@link IoEventType} and the {@link LogLevel}.
@@ -80,14 +80,14 @@
@Override
public void log( IoSession session, String message )
{
- SessionLog.debug( session, message );
+ IoSessionLogger.debug( session, message );
}
@Override
public void log( IoSession session, String message, Throwable cause )
{
- SessionLog.debug( session, message, cause );
+ IoSessionLogger.debug( session, message, cause );
}
@@ -106,14 +106,14 @@
@Override
public void log( IoSession session, String message )
{
- SessionLog.info( session, message );
+ IoSessionLogger.info( session, message );
}
@Override
public void log( IoSession session, String message, Throwable cause )
{
- SessionLog.info( session, message, cause );
+ IoSessionLogger.info( session, message, cause );
}
@@ -132,14 +132,14 @@
@Override
public void log( IoSession session, String message )
{
- SessionLog.warn( session, message );
+ IoSessionLogger.warn( session, message );
}
@Override
public void log( IoSession session, String message, Throwable cause )
{
- SessionLog.warn( session, message, cause );
+ IoSessionLogger.warn( session, message, cause );
}
@@ -158,14 +158,14 @@
@Override
public void log( IoSession session, String message )
{
- SessionLog.error( session, message );
+ IoSessionLogger.error( session, message );
}
@Override
public void log( IoSession session, String message, Throwable cause )
{
- SessionLog.error( session, message, cause );
+ IoSessionLogger.error( session, message, cause );
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/reqres/RequestResponseFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/reqres/RequestResponseFilter.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/reqres/RequestResponseFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/reqres/RequestResponseFilter.java Tue Aug 14 02:33:51 2007
@@ -33,7 +33,7 @@
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.SessionLog;
+import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.WriteRequestWrapper;
@@ -152,8 +152,8 @@
if (request == null) {
// A response message without request. Swallow the event because
// the response might have arrived too late.
- if (SessionLog.isWarnEnabled(session)) {
- SessionLog.warn(session, "Unknown request ID '" + requestId
+ if (IoSessionLogger.isWarnEnabled(session)) {
+ IoSessionLogger.warn(session, "Unknown request ID '" + requestId
+ "' for the response message. Timed out already?: "
+ message);
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLFilter.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLFilter.java Tue Aug 14 02:33:51 2007
@@ -35,7 +35,7 @@
import org.apache.mina.common.IoFutureListener;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.SessionLog;
+import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.WriteRequestWrapper;
@@ -53,7 +53,7 @@
* Java version 5 or above is mandatory to use this filter. And please note that
* this filter only works for TCP/IP connections.
* <p>
- * This filter logs debug information using {@link SessionLog}.
+ * This filter logs debug information using {@link IoSessionLogger}.
*
* <h2>Implementing StartTLS</h2>
* <p>
@@ -389,8 +389,8 @@
try {
synchronized (handler) {
if (isSSLStarted(session)) {
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " Closed: "
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " Closed: "
+ getSSLSessionHandler(session));
}
}
@@ -415,8 +415,8 @@
handler.scheduleMessageReceived(nextFilter, message);
} else {
ByteBuffer buf = (ByteBuffer) message;
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " Data Read: " + handler + " ("
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " Data Read: " + handler + " ("
+ buf + ')');
}
@@ -429,8 +429,8 @@
if (handler.isInboundDone()) {
if (handler.isOutboundDone()) {
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session,
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session,
" SSL Session closed.");
}
@@ -491,22 +491,22 @@
// Otherwise, encrypt the buffer.
ByteBuffer buf = (ByteBuffer) writeRequest.getMessage();
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " Filtered Write: " + handler);
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " Filtered Write: " + handler);
}
if (handler.isWritingEncryptedData()) {
// data already encrypted; simply return buffer
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " already encrypted: "
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " already encrypted: "
+ buf);
}
handler.scheduleFilterWrite(nextFilter,
writeRequest);
} else if (handler.isHandshakeComplete()) {
// SSL encrypt
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " encrypt: " + buf);
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " encrypt: " + buf);
}
int pos = buf.position();
@@ -515,8 +515,8 @@
ByteBuffer encryptedBuffer = SSLHandler.copy(handler
.getOutNetBuffer());
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " encrypted buf: "
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " encrypted buf: "
+ encryptedBuffer);
}
handler.scheduleFilterWrite(nextFilter,
@@ -524,13 +524,13 @@
encryptedBuffer));
} else {
if (!session.isConnected()) {
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session,
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session,
" Write request on closed session.");
}
} else {
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger
.debug(session,
" Handshaking is not complete yet. Buffering write request.");
}
@@ -634,15 +634,15 @@
return;
}
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " appBuffer: " + handler.getAppBuffer());
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " appBuffer: " + handler.getAppBuffer());
}
// forward read app data
ByteBuffer readBuffer = SSLHandler.copy(handler.getAppBuffer());
handler.getAppBuffer().clear();
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " app data read: " + readBuffer + " ("
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " app data read: " + readBuffer + " ("
+ readBuffer.getHexDump() + ')');
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java Tue Aug 14 02:33:51 2007
@@ -37,7 +37,7 @@
import org.apache.mina.common.IoEventType;
import org.apache.mina.common.IoFilterEvent;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.SessionLog;
+import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.IoFilter.NextFilter;
@@ -175,7 +175,7 @@
try {
sslEngine.closeInbound();
} catch (SSLException e) {
- SessionLog.debug(session,
+ IoSessionLogger.debug(session,
"Unexpected exception from SSLEngine.closeInbound().", e);
}
@@ -184,7 +184,7 @@
outNetBuffer.clear();
} while (sslEngine.wrap(hsBB, outNetBuffer).bytesProduced() > 0);
} catch (SSLException e) {
- SessionLog.debug(session,
+ IoSessionLogger.debug(session,
"Unexpected exception from SSLEngine.wrap().", e);
}
sslEngine.closeOutbound();
@@ -240,8 +240,8 @@
IoFilterEvent scheduledWrite;
while ((scheduledWrite = preHandshakeEventQueue.poll()) != null) {
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " Flushing buffered write request: "
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " Flushing buffered write request: "
+ scheduledWrite.getParameter());
}
parent.filterWrite(scheduledWrite.getNextFilter(), session,
@@ -299,10 +299,10 @@
// We also expand app. buffer (twice the size of in net. buffer)
appBuffer = SSLByteBufferUtil.expandBuffer(appBuffer, inNetBuffer
.capacity() * 2);
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " expanded inNetBuffer:"
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " expanded inNetBuffer:"
+ inNetBuffer);
- SessionLog.debug(session, " expanded appBuffer:" + appBuffer);
+ IoSessionLogger.debug(session, " expanded appBuffer:" + appBuffer);
}
}
@@ -364,15 +364,15 @@
// shouln't need to be larger than twice the source data size?
outNetBuffer = SSLByteBufferUtil.expandBuffer(outNetBuffer, src
.capacity() * 2);
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " expanded outNetBuffer:"
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " expanded outNetBuffer:"
+ outNetBuffer);
}
}
SSLEngineResult result = sslEngine.wrap(src, outNetBuffer);
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " Wrap res:" + result);
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " Wrap res:" + result);
}
if (result.getStatus() == SSLEngineResult.Status.OK) {
@@ -459,19 +459,19 @@
* Perform any handshaking processing.
*/
public void handshake(NextFilter nextFilter) throws SSLException {
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " doHandshake()");
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " doHandshake()");
}
for (;;) {
if (handshakeStatus == SSLEngineResult.HandshakeStatus.FINISHED) {
session.setAttribute(SSLFilter.SSL_SESSION, sslEngine
.getSession());
- if (SessionLog.isDebugEnabled(session)) {
+ if (IoSessionLogger.isDebugEnabled(session)) {
SSLSession sslSession = sslEngine.getSession();
- SessionLog.debug(session,
+ IoSessionLogger.debug(session,
" handshakeStatus=FINISHED");
- SessionLog.debug(session, " sslSession CipherSuite used "
+ IoSessionLogger.debug(session, " sslSession CipherSuite used "
+ sslSession.getCipherSuite());
}
handshakeComplete = true;
@@ -485,15 +485,15 @@
}
break;
} else if (handshakeStatus == SSLEngineResult.HandshakeStatus.NEED_TASK) {
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session,
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session,
" handshakeStatus=NEED_TASK");
}
handshakeStatus = doTasks();
} else if (handshakeStatus == SSLEngineResult.HandshakeStatus.NEED_UNWRAP) {
// we need more data read
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session,
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session,
" handshakeStatus=NEED_UNWRAP");
}
SSLEngineResult.Status status = unwrapHandshake(nextFilter);
@@ -503,23 +503,23 @@
break;
}
} else if (handshakeStatus == SSLEngineResult.HandshakeStatus.NEED_WRAP) {
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session,
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session,
" handshakeStatus=NEED_WRAP");
}
// First make sure that the out buffer is completely empty. Since we
// cannot call wrap with data left on the buffer
if (outNetBuffer.hasRemaining()) {
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger
.debug(session, " Still data in out buffer!");
}
break;
}
outNetBuffer.clear();
SSLEngineResult result = sslEngine.wrap(hsBB, outNetBuffer);
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " Wrap res:" + result);
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " Wrap res:" + result);
}
outNetBuffer.flip();
@@ -548,13 +548,13 @@
WriteFuture writeFuture = null;
try {
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " write outNetBuffer: "
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " write outNetBuffer: "
+ getOutNetBuffer());
}
org.apache.mina.common.ByteBuffer writeBuffer = copy(getOutNetBuffer());
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " session write: " + writeBuffer);
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " session write: " + writeBuffer);
}
//debug("outNetBuffer (after copy): {0}", sslHandler.getOutNetBuffer());
@@ -573,8 +573,8 @@
throw newSSLE;
}
if (getOutNetBuffer().hasRemaining()) {
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " write outNetBuffer2: "
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " write outNetBuffer2: "
+ getOutNetBuffer());
}
org.apache.mina.common.ByteBuffer writeBuffer2 = copy(getOutNetBuffer());
@@ -595,8 +595,8 @@
}
private void unwrap(NextFilter nextFilter) throws SSLException {
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " unwrap()");
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " unwrap()");
}
// Prepare the net data for reading.
@@ -613,8 +613,8 @@
}
private SSLEngineResult.Status unwrapHandshake(NextFilter nextFilter) throws SSLException {
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " unwrapHandshake()");
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " unwrapHandshake()");
}
// Prepare the net data for reading.
@@ -650,7 +650,7 @@
&& res.getStatus() != SSLEngineResult.Status.BUFFER_UNDERFLOW
&& res.getHandshakeStatus() != SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING) {
// Renegotiation required.
- SessionLog.debug(session, " Renegotiating...");
+ IoSessionLogger.debug(session, " Renegotiating...");
handshakeComplete = false;
handshakeStatus = res.getHandshakeStatus();
handshake(nextFilter);
@@ -660,13 +660,13 @@
private SSLEngineResult unwrap0() throws SSLException {
SSLEngineResult res;
do {
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " inNetBuffer: " + inNetBuffer);
- SessionLog.debug(session, " appBuffer: " + appBuffer);
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " inNetBuffer: " + inNetBuffer);
+ IoSessionLogger.debug(session, " appBuffer: " + appBuffer);
}
res = sslEngine.unwrap(inNetBuffer, appBuffer);
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " Unwrap res:" + res);
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " Unwrap res:" + res);
}
} while (res.getStatus() == SSLEngineResult.Status.OK
&& (handshakeComplete && res.getHandshakeStatus() == SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING
@@ -679,8 +679,8 @@
* Do all the outstanding handshake tasks in the current Thread.
*/
private SSLEngineResult.HandshakeStatus doTasks() {
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " doTasks()");
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " doTasks()");
}
/*
@@ -689,13 +689,13 @@
*/
Runnable runnable;
while ((runnable = sslEngine.getDelegatedTask()) != null) {
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " doTask: " + runnable);
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " doTask: " + runnable);
}
runnable.run();
}
- if (SessionLog.isDebugEnabled(session)) {
- SessionLog.debug(session, " doTasks(): "
+ if (IoSessionLogger.isDebugEnabled(session)) {
+ IoSessionLogger.debug(session, " doTasks(): "
+ sslEngine.getHandshakeStatus());
}
return sslEngine.getHandshakeStatus();
Modified: mina/trunk/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java Tue Aug 14 02:33:51 2007
@@ -29,7 +29,7 @@
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.SessionLog;
+import org.apache.mina.common.IoSessionLogger;
/**
* A {@link IoHandler} that adapts asynchronous MINA events to stream I/O.
@@ -155,7 +155,7 @@
if (e != null && in != null) {
in.throwException(e);
} else {
- SessionLog.warn(session, "Unexpected exception.", cause);
+ IoSessionLogger.warn(session, "Unexpected exception.", cause);
session.close();
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java Tue Aug 14 02:33:51 2007
@@ -23,7 +23,7 @@
import java.net.SocketAddress;
import java.util.concurrent.Executor;
-import org.apache.mina.common.DelegatedIoAcceptor;
+import org.apache.mina.common.IoAcceptorWrapper;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoSessionRecycler;
import org.apache.mina.transport.socket.nio.support.DatagramAcceptorDelegate;
@@ -35,7 +35,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public class DatagramAcceptor extends DelegatedIoAcceptor {
+public class DatagramAcceptor extends IoAcceptorWrapper {
/**
* Creates a new instance using a NewThreadExecutor
*/
@@ -54,12 +54,12 @@
@Override
public DatagramSessionConfig getSessionConfig() {
- return ((DatagramAcceptorDelegate) delegate).getSessionConfig();
+ return ((DatagramAcceptorDelegate) acceptor).getSessionConfig();
}
@Override
public InetSocketAddress getLocalAddress() {
- return ((DatagramAcceptorDelegate) delegate).getLocalAddress();
+ return ((DatagramAcceptorDelegate) acceptor).getLocalAddress();
}
// This method is overriden to work around a problem with
@@ -74,7 +74,7 @@
* Returns the {@link IoSessionRecycler} for this service.
*/
public IoSessionRecycler getSessionRecycler() {
- return ((DatagramAcceptorDelegate) delegate).getSessionRecycler();
+ return ((DatagramAcceptorDelegate) acceptor).getSessionRecycler();
}
/**
@@ -83,7 +83,7 @@
* @param sessionRecycler <tt>null</tt> to use the default recycler
*/
public void setSessionRecycler(IoSessionRecycler sessionRecycler) {
- ((DatagramAcceptorDelegate) delegate)
+ ((DatagramAcceptorDelegate) acceptor)
.setSessionRecycler(sessionRecycler);
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java Tue Aug 14 02:33:51 2007
@@ -21,7 +21,7 @@
import java.util.concurrent.Executor;
-import org.apache.mina.common.DelegatedIoConnector;
+import org.apache.mina.common.IoConnectorWrapper;
import org.apache.mina.common.IoConnector;
import org.apache.mina.transport.socket.nio.support.DatagramConnectorDelegate;
import org.apache.mina.util.NewThreadExecutor;
@@ -32,7 +32,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public class DatagramConnector extends DelegatedIoConnector {
+public class DatagramConnector extends IoConnectorWrapper {
/**
* Creates a new instance using a NewThreadExecutor
*/
@@ -51,6 +51,6 @@
@Override
public DatagramSessionConfig getSessionConfig() {
- return ((DatagramConnectorDelegate) delegate).getSessionConfig();
+ return ((DatagramConnectorDelegate) connector).getSessionConfig();
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultDatagramSessionConfig.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultDatagramSessionConfig.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultDatagramSessionConfig.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultDatagramSessionConfig.java Tue Aug 14 02:33:51 2007
@@ -22,7 +22,7 @@
import java.net.DatagramSocket;
import java.net.SocketException;
-import org.apache.mina.common.BaseIoSessionConfig;
+import org.apache.mina.common.AbstractIoSessionConfig;
import org.apache.mina.common.ExceptionMonitor;
/**
@@ -31,7 +31,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev: 439913 $, $Date: 2006-09-04 05:12:43 +0200 (mån, 04 sep 2006) $
*/
-public class DefaultDatagramSessionConfig extends BaseIoSessionConfig implements
+public class DefaultDatagramSessionConfig extends AbstractIoSessionConfig implements
DatagramSessionConfig {
private static boolean SET_RECEIVE_BUFFER_SIZE_AVAILABLE = false;
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultSocketSessionConfig.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultSocketSessionConfig.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultSocketSessionConfig.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DefaultSocketSessionConfig.java Tue Aug 14 02:33:51 2007
@@ -30,7 +30,7 @@
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.mina.common.BaseIoSessionConfig;
+import org.apache.mina.common.AbstractIoSessionConfig;
import org.apache.mina.common.ExceptionMonitor;
/**
@@ -39,7 +39,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public class DefaultSocketSessionConfig extends BaseIoSessionConfig implements
+public class DefaultSocketSessionConfig extends AbstractIoSessionConfig implements
SocketSessionConfig {
private static Map<InetSocketAddress, InetAddress> TEST_ADDRESSES = new LinkedHashMap<InetSocketAddress, InetAddress>();
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java Tue Aug 14 02:33:51 2007
@@ -33,7 +33,7 @@
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor;
-import org.apache.mina.common.BaseIoAcceptor;
+import org.apache.mina.common.AbstractIoAcceptor;
import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoServiceListenerSupport;
@@ -50,7 +50,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev: 389042 $, $Date: 2006-03-27 07:49:41Z $
*/
-public class SocketAcceptor extends BaseIoAcceptor {
+public class SocketAcceptor extends AbstractIoAcceptor {
/**
* @noinspection StaticNonFinalField
*/
@@ -174,7 +174,7 @@
}
/**
- * @see org.apache.mina.common.BaseIoService#getSessionConfig()
+ * @see org.apache.mina.common.AbstractIoService#getSessionConfig()
*/
@Override
public SocketSessionConfig getSessionConfig() {
@@ -182,7 +182,7 @@
}
/**
- * @see org.apache.mina.common.BaseIoAcceptor#getLocalAddress()
+ * @see org.apache.mina.common.AbstractIoAcceptor#getLocalAddress()
*/
@Override
public InetSocketAddress getLocalAddress() {
@@ -193,7 +193,7 @@
// bean property access mechanism.
/**
- * @see org.apache.mina.common.BaseIoAcceptor#setLocalAddress(java.net.SocketAddress)
+ * @see org.apache.mina.common.AbstractIoAcceptor#setLocalAddress(java.net.SocketAddress)
*/
@Override
public void setLocalAddress(SocketAddress localAddress) {
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java Tue Aug 14 02:33:51 2007
@@ -32,7 +32,7 @@
import java.util.concurrent.Executor;
import org.apache.mina.common.AbstractIoFilterChain;
-import org.apache.mina.common.BaseIoConnector;
+import org.apache.mina.common.AbstractIoConnector;
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.DefaultConnectFuture;
import org.apache.mina.common.ExceptionMonitor;
@@ -49,7 +49,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev: 389042 $, $Date: 2006-03-27 07:49:41Z $
*/
-public class SocketConnector extends BaseIoConnector {
+public class SocketConnector extends AbstractIoConnector {
/**
* @noinspection StaticNonFinalField
*/
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java Tue Aug 14 02:33:51 2007
@@ -26,8 +26,8 @@
import java.util.LinkedList;
import java.util.Queue;
-import org.apache.mina.common.BaseIoSession;
-import org.apache.mina.common.BaseIoSessionConfig;
+import org.apache.mina.common.AbstractIoSession;
+import org.apache.mina.common.AbstractIoSessionConfig;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
@@ -44,7 +44,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-class SocketSessionImpl extends BaseIoSession implements SocketSession {
+class SocketSessionImpl extends AbstractIoSession implements SocketSession {
private final IoService service;
private final SocketSessionConfig config = new SessionConfigImpl();
@@ -200,7 +200,7 @@
this.readBufferSize = readBufferSize;
}
- private class SessionConfigImpl extends BaseIoSessionConfig implements
+ private class SessionConfigImpl extends AbstractIoSessionConfig implements
SocketSessionConfig {
public boolean isKeepAlive() {
try {
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java Tue Aug 14 02:33:51 2007
@@ -31,7 +31,7 @@
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor;
-import org.apache.mina.common.BaseIoAcceptor;
+import org.apache.mina.common.AbstractIoAcceptor;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.ExpiringSessionRecycler;
@@ -52,7 +52,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public class DatagramAcceptorDelegate extends BaseIoAcceptor implements
+public class DatagramAcceptorDelegate extends AbstractIoAcceptor implements
IoAcceptor, DatagramService {
private static final IoSessionRecycler DEFAULT_RECYCLER = new ExpiringSessionRecycler();
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java Tue Aug 14 02:33:51 2007
@@ -31,7 +31,7 @@
import java.util.concurrent.Executor;
import org.apache.mina.common.AbstractIoFilterChain;
-import org.apache.mina.common.BaseIoConnector;
+import org.apache.mina.common.AbstractIoConnector;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.DefaultConnectFuture;
@@ -51,7 +51,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public class DatagramConnectorDelegate extends BaseIoConnector implements
+public class DatagramConnectorDelegate extends AbstractIoConnector implements
DatagramService {
private static volatile int nextId = 0;
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java Tue Aug 14 02:33:51 2007
@@ -27,7 +27,7 @@
import java.util.LinkedList;
import java.util.Queue;
-import org.apache.mina.common.BaseIoSession;
+import org.apache.mina.common.AbstractIoSession;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoConnector;
@@ -50,7 +50,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-class DatagramSessionImpl extends BaseIoSession implements DatagramSession {
+class DatagramSessionImpl extends AbstractIoSession implements DatagramSession {
private final IoService service;
private final DatagramSessionConfig config = new SessionConfigImpl();
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/DefaultVmPipeSessionConfig.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/DefaultVmPipeSessionConfig.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/DefaultVmPipeSessionConfig.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/DefaultVmPipeSessionConfig.java Tue Aug 14 02:33:51 2007
@@ -19,7 +19,7 @@
*/
package org.apache.mina.transport.vmpipe;
-import org.apache.mina.common.BaseIoSessionConfig;
+import org.apache.mina.common.AbstractIoSessionConfig;
/**
* A default implementation of {@link VmPipeSessionConfig}.
@@ -27,6 +27,6 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public class DefaultVmPipeSessionConfig extends BaseIoSessionConfig implements
+public class DefaultVmPipeSessionConfig extends AbstractIoSessionConfig implements
VmPipeSessionConfig {
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java Tue Aug 14 02:33:51 2007
@@ -24,7 +24,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.mina.common.BaseIoAcceptor;
+import org.apache.mina.common.AbstractIoAcceptor;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.TransportType;
@@ -37,7 +37,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public class VmPipeAcceptor extends BaseIoAcceptor {
+public class VmPipeAcceptor extends AbstractIoAcceptor {
static final Map<VmPipeAddress, VmPipe> boundHandlers = new HashMap<VmPipeAddress, VmPipe>();
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java Tue Aug 14 02:33:51 2007
@@ -25,7 +25,7 @@
import java.util.Set;
import org.apache.mina.common.AbstractIoFilterChain;
-import org.apache.mina.common.BaseIoConnector;
+import org.apache.mina.common.AbstractIoConnector;
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.DefaultConnectFuture;
import org.apache.mina.common.ExceptionMonitor;
@@ -33,7 +33,7 @@
import org.apache.mina.common.IoFuture;
import org.apache.mina.common.IoFutureListener;
import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.SessionIdleStatusChecker;
+import org.apache.mina.common.IdleStatusChecker;
import org.apache.mina.common.TransportType;
import org.apache.mina.transport.vmpipe.support.VmPipe;
import org.apache.mina.transport.vmpipe.support.VmPipeFilterChain;
@@ -46,7 +46,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public class VmPipeConnector extends BaseIoConnector {
+public class VmPipeConnector extends AbstractIoConnector {
/**
* Creates a new instance.
@@ -98,7 +98,7 @@
localSession.setAttribute(AbstractIoFilterChain.CONNECT_FUTURE,
future);
getListeners().fireSessionCreated(localSession);
- SessionIdleStatusChecker.getInstance().addSession(localSession);
+ IdleStatusChecker.getInstance().addSession(localSession);
} catch (Throwable t) {
future.setException(t);
return future;
@@ -113,7 +113,7 @@
// The following sentences don't throw any exceptions.
entry.getListeners().fireSessionCreated(remoteSession);
- SessionIdleStatusChecker.getInstance().addSession(remoteSession);
+ IdleStatusChecker.getInstance().addSession(remoteSession);
} catch (Throwable t) {
ExceptionMonitor.getInstance().exceptionCaught(t);
remoteSession.close();
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java Tue Aug 14 02:33:51 2007
@@ -24,7 +24,7 @@
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.mina.common.BaseIoSession;
+import org.apache.mina.common.AbstractIoSession;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoService;
@@ -43,7 +43,7 @@
* @author The Apache Directory Project (mina-dev@directory.apache.org)
* @version $Rev$, $Date$
*/
-public class VmPipeSessionImpl extends BaseIoSession implements VmPipeSession {
+public class VmPipeSessionImpl extends AbstractIoSession implements VmPipeSession {
private static final VmPipeSessionConfig CONFIG = new DefaultVmPipeSessionConfig();
private final IoService service;
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java Tue Aug 14 02:33:51 2007
@@ -188,7 +188,7 @@
return buf.toString();
}
- private class TestSession extends BaseIoSession implements IoSession {
+ private class TestSession extends AbstractIoSession implements IoSession {
private final IoHandler handler = new IoHandlerAdapter() {
@Override
public void sessionCreated(IoSession session) {
@@ -377,7 +377,7 @@
private static class IoFilterChainImpl extends AbstractIoFilterChain {
protected IoFilterChainImpl() {
- super(new BaseIoSession() {
+ super(new AbstractIoSession() {
@Override
protected void updateTrafficMask() {
}
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/support/FutureTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/support/FutureTest.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/support/FutureTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/support/FutureTest.java Tue Aug 14 02:33:51 2007
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
-import org.apache.mina.common.BaseIoSession;
+import org.apache.mina.common.AbstractIoSession;
import org.apache.mina.common.DefaultCloseFuture;
import org.apache.mina.common.DefaultConnectFuture;
import org.apache.mina.common.DefaultWriteFuture;
@@ -71,7 +71,7 @@
TestThread thread = new TestThread(future);
thread.start();
- IoSession session = new BaseIoSession() {
+ IoSession session = new AbstractIoSession() {
public IoHandler getHandler() {
return null;
}
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/support/IoServiceListenerSupportTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/support/IoServiceListenerSupportTest.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/support/IoServiceListenerSupportTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/support/IoServiceListenerSupportTest.java Tue Aug 14 02:33:51 2007
@@ -25,7 +25,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.mina.common.BaseIoSession;
+import org.apache.mina.common.AbstractIoSession;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoFilterChain;
@@ -263,7 +263,7 @@
Assert.assertFalse(support.getManagedSessions().contains(session));
}
- private static class TestSession extends BaseIoSession {
+ private static class TestSession extends AbstractIoSession {
private final IoService service;
private final SocketAddress serviceAddress;