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 [2/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...
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java Tue Aug 14 02:33:51 2007
@@ -26,7 +26,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.ByteBuffer;
import org.apache.mina.common.CloseFuture;
import org.apache.mina.common.IoFilterChain;
@@ -163,7 +163,7 @@
}
}
- private static class IoSessionImpl extends BaseIoSession implements
+ private static class IoSessionImpl extends AbstractIoSession implements
IoSession {
public IoHandler getHandler() {
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java Tue Aug 14 02:33:51 2007
@@ -27,7 +27,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.ByteBuffer;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
@@ -100,7 +100,7 @@
Assert.assertEquals(1, decoderOut.result.size());
}
- private static class MockIoSession extends BaseIoSession {
+ private static class MockIoSession extends AbstractIoSession {
@Override
protected void updateTrafficMask() {
}
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java Tue Aug 14 02:33:51 2007
@@ -28,7 +28,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.ByteBuffer;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
@@ -255,7 +255,7 @@
Assert.assertEquals("STU", out.getMessageQueue().poll());
}
- private static class DummySession extends BaseIoSession {
+ private static class DummySession extends AbstractIoSession {
@Override
protected void updateTrafficMask() {
}
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.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.ByteBuffer;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
@@ -69,7 +69,7 @@
Assert.assertEquals('\n', buf.get());
}
- private static class DummySession extends BaseIoSession {
+ private static class DummySession extends AbstractIoSession {
@Override
protected void updateTrafficMask() {
}
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java Tue Aug 14 02:33:51 2007
@@ -26,7 +26,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.CloseFuture;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoFilterChain;
@@ -88,7 +88,7 @@
}
}
- private static class EventOrderCounter extends BaseIoSession {
+ private static class EventOrderCounter extends AbstractIoSession {
private Integer lastCount = null;
public synchronized void setLastCount(Integer newCount) {
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/reqres/RequestResponseFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/reqres/RequestResponseFilterTest.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/reqres/RequestResponseFilterTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/reqres/RequestResponseFilterTest.java Tue Aug 14 02:33:51 2007
@@ -25,7 +25,7 @@
import java.util.concurrent.ScheduledExecutorService;
import org.apache.mina.common.AbstractIoFilterChain;
-import org.apache.mina.common.BaseIoSession;
+import org.apache.mina.common.AbstractIoSession;
import org.apache.mina.common.DefaultWriteRequest;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
@@ -33,7 +33,7 @@
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.SessionLog;
+import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.IoFilter.NextFilter;
@@ -98,8 +98,8 @@
// Destroy the filter.
filter.onPreRemove(chain, "reqres", nextFilter);
filter.onPostRemove(chain, "reqres", nextFilter);
- session.removeAttribute(SessionLog.LOGGER);
- session.removeAttribute(SessionLog.PREFIX);
+ session.removeAttribute(IoSessionLogger.LOGGER);
+ session.removeAttribute(IoSessionLogger.PREFIX);
Assert.assertTrue(session.getAttributeKeys().isEmpty());
filter.destroy();
filter = null;
@@ -326,7 +326,7 @@
}
}
- private static class DummySession extends BaseIoSession {
+ private static class DummySession extends AbstractIoSession {
@Override
protected void updateTrafficMask() {
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java Tue Aug 14 02:33:51 2007
@@ -32,7 +32,7 @@
import junit.framework.TestCase;
-import org.apache.mina.common.BaseIoSession;
+import org.apache.mina.common.AbstractIoSession;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.DefaultWriteRequest;
import org.apache.mina.common.IdleStatus;
@@ -542,7 +542,7 @@
}
}
- private static class DummySession extends BaseIoSession {
+ private static class DummySession extends AbstractIoSession {
@Override
protected void updateTrafficMask() {
Modified: mina/trunk/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java Tue Aug 14 02:33:51 2007
@@ -24,7 +24,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.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoService;
@@ -50,7 +50,7 @@
chain.addLast("B", new TestCommand(buf, 'B'));
chain.addLast("C", new TestCommand(buf, 'C'));
- new ChainedIoHandler(chain).messageReceived(new BaseIoSession() {
+ new ChainedIoHandler(chain).messageReceived(new AbstractIoSession() {
@Override
protected void updateTrafficMask() {
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java Tue Aug 14 02:33:51 2007
@@ -27,7 +27,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;
/**
* {@link IoHandler} implementation of a simple chat server protocol.
@@ -44,7 +44,7 @@
@Override
public void exceptionCaught(IoSession session, Throwable cause) {
- SessionLog.error(session, "", cause);
+ IoSessionLogger.error(session, "", cause);
// Close connection when unexpected exception is caught.
session.close();
}
@@ -104,12 +104,12 @@
}
break;
default:
- SessionLog.info(session, "Unhandled command: " + command);
+ IoSessionLogger.info(session, "Unhandled command: " + command);
break;
}
} catch (IllegalArgumentException e) {
- SessionLog.debug(session, e.getMessage());
+ IoSessionLogger.debug(session, e.getMessage());
}
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/ServerHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/ServerHandler.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/ServerHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/ServerHandler.java Tue Aug 14 02:33:51 2007
@@ -24,7 +24,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;
/**
* An {@link IoHandler} for HTTP.
@@ -70,13 +70,13 @@
@Override
public void sessionIdle(IoSession session, IdleStatus status) {
- SessionLog.info(session, "Disconnecting the idle.");
+ IoSessionLogger.info(session, "Disconnecting the idle.");
session.close();
}
@Override
public void exceptionCaught(IoSession session, Throwable cause) {
- SessionLog.warn(session, cause);
+ IoSessionLogger.warn(session, cause);
session.close();
}
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java Tue Aug 14 02:33:51 2007
@@ -24,7 +24,7 @@
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.SessionLog;
+import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.TrafficMask;
/**
@@ -62,6 +62,6 @@
wb.flip();
((IoSession) session.getAttachment()).write(wb);
rb.reset();
- SessionLog.info(session, rb.getString(CHARSET.newDecoder()));
+ IoSessionLogger.info(session, rb.getString(CHARSET.newDecoder()));
}
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java Tue Aug 14 02:33:51 2007
@@ -22,7 +22,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;
import org.apache.mina.example.sumup.message.AddMessage;
import org.apache.mina.example.sumup.message.ResultMessage;
@@ -68,13 +68,13 @@
// it is time to disconnect.
if (rm.getSequence() == values.length - 1) {
// print the sum and disconnect.
- SessionLog.info(session, "The sum: " + rm.getValue());
+ IoSessionLogger.info(session, "The sum: " + rm.getValue());
session.close();
finished = true;
}
} else {
// seever returned error code because of overflow, etc.
- SessionLog.warn(session, "Server error, disconnecting...");
+ IoSessionLogger.warn(session, "Server error, disconnecting...");
session.close();
finished = true;
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java Tue Aug 14 02:33:51 2007
@@ -23,7 +23,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;
import org.apache.mina.example.sumup.message.AddMessage;
import org.apache.mina.example.sumup.message.ResultMessage;
@@ -75,7 +75,7 @@
@Override
public void sessionIdle(IoSession session, IdleStatus status) {
- SessionLog.info(session, "Disconnecting the idle.");
+ IoSessionLogger.info(session, "Disconnecting the idle.");
// disconnect an idle client
session.close();
}
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java Tue Aug 14 02:33:51 2007
@@ -28,7 +28,7 @@
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.SessionLog;
+import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.example.echoserver.ssl.BogusSSLContextFactory;
import org.apache.mina.filter.ssl.SSLFilter;
import org.apache.mina.transport.socket.nio.DatagramAcceptor;
@@ -129,7 +129,7 @@
if (session.getFilterChain().contains("SSL")
&& buf.remaining() == 1
&& buf.get() == (byte) '.') {
- SessionLog.info(session, "TLS Reentrance");
+ IoSessionLogger.info(session, "TLS Reentrance");
((SSLFilter) session.getFilterChain().get("SSL"))
.startSSL(session);
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java Tue Aug 14 02:33:51 2007
@@ -29,7 +29,7 @@
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.RuntimeIOException;
-import org.apache.mina.common.SessionLog;
+import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.example.echoserver.ssl.BogusSSLContextFactory;
import org.apache.mina.filter.ssl.SSLFilter;
@@ -193,7 +193,7 @@
//// in SocketIoProcessor if there was a read timeout because
//// we share readBuf.
readBuf.flip();
- SessionLog.info(session, "readBuf: " + readBuf);
+ IoSessionLogger.info(session, "readBuf: " + readBuf);
Assert.assertEquals(DATA_SIZE * COUNT, readBuf.remaining());
ByteBuffer expectedBuf = ByteBuffer.allocate(DATA_SIZE * COUNT);
for (int i = 0; i < COUNT; i++) {
Modified: mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoSessionManager.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoSessionManager.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoSessionManager.java (original)
+++ mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoSessionManager.java Tue Aug 14 02:33:51 2007
@@ -22,7 +22,7 @@
import java.util.Date;
import java.util.List;
-import org.apache.mina.common.BaseIoSession;
+import org.apache.mina.common.AbstractIoSession;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoSession;
@@ -68,11 +68,11 @@
}
public long getReadMessages() {
- return ((BaseIoSession) session).getReadMessages();
+ return ((AbstractIoSession) session).getReadMessages();
}
public long getWrittenMessages() {
- return ((BaseIoSession) session).getWrittenMessages();
+ return ((AbstractIoSession) session).getWrittenMessages();
}
/**
Modified: mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/DefaultSerialSessionConfig.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/DefaultSerialSessionConfig.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/DefaultSerialSessionConfig.java (original)
+++ mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/DefaultSerialSessionConfig.java Tue Aug 14 02:33:51 2007
@@ -19,7 +19,7 @@
*/
package org.apache.mina.transport.serial;
-import org.apache.mina.common.BaseIoSessionConfig;
+import org.apache.mina.common.AbstractIoSessionConfig;
/**
* The default configuration for a serial session {@link SerialSessionConfig}.
@@ -27,7 +27,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev: 529576 $, $Date: 2007-04-17 14:25:07 +0200 (mar., 17 avr. 2007) $
*/
-public class DefaultSerialSessionConfig extends BaseIoSessionConfig implements SerialSessionConfig {
+public class DefaultSerialSessionConfig extends AbstractIoSessionConfig implements SerialSessionConfig {
private int timeout = 2000;
Modified: mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java (original)
+++ mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java Tue Aug 14 02:33:51 2007
@@ -29,7 +29,7 @@
import java.util.Enumeration;
import java.util.TooManyListenersException;
-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.IoConnector;
@@ -44,7 +44,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev: 529576 $, $Date: 2007-04-17 14:25:07 +0200 (mar., 17 avr. 2007) $
*/
-public class SerialConnector extends BaseIoConnector {
+public class SerialConnector extends AbstractIoConnector {
private Logger log;
public SerialConnector() {
Modified: mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java?view=diff&rev=565673&r1=565672&r2=565673
==============================================================================
--- mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java (original)
+++ mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java Tue Aug 14 02:33:51 2007
@@ -31,7 +31,7 @@
import java.util.Queue;
import java.util.TooManyListenersException;
-import org.apache.mina.common.BaseIoSession;
+import org.apache.mina.common.AbstractIoSession;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.DefaultTransportType;
import org.apache.mina.common.ExceptionMonitor;
@@ -40,7 +40,7 @@
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.SessionIdleStatusChecker;
+import org.apache.mina.common.IdleStatusChecker;
import org.apache.mina.common.TransportType;
import org.apache.mina.common.WriteRequest;
import org.slf4j.Logger;
@@ -52,7 +52,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev: 529590 $, $Date: 2007-04-17 15:14:17 +0200 (mar., 17 avr. 2007) $
*/
-public class SerialSession extends BaseIoSession implements
+public class SerialSession extends AbstractIoSession implements
SerialPortEventListener {
private SerialSessionConfig config;
@@ -177,7 +177,7 @@
ReadWorker w = new ReadWorker();
w.start();
port.addEventListener(this);
- SessionIdleStatusChecker.getInstance().addSession(this);
+ IdleStatusChecker.getInstance().addSession(this);
((SerialConnector) getService()).getListeners()
.fireSessionCreated(this);
}