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/09/27 10:38:48 UTC
svn commit: r579944 - in /mina/trunk:
core/src/main/java/org/apache/mina/transport/socket/nio/
core/src/test/java/org/apache/mina/filter/logging/
core/src/test/java/org/apache/mina/filter/stream/
core/src/test/java/org/apache/mina/transport/socket/nio/...
Author: trustin
Date: Thu Sep 27 01:38:44 2007
New Revision: 579944
URL: http://svn.apache.org/viewvc?rev=579944&view=rev
Log:
Added 'Nio' prefix to all NIO transport implemenetations
Added:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java
- copied, changed from r579942, 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/NioDatagramConnector.java
- copied, changed from r579942, 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/NioDatagramSession.java
- copied, changed from r579942, mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSessionImpl.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java
- copied, changed from r579942, 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/NioSocketConnector.java
- copied, changed from r579448, 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/NioSocketSession.java
- copied, changed from r579448, mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java
Removed:
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/DatagramSessionImpl.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
Modified:
mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramBindTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConnectorTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramTrafficControlTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketBindTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketConnectorTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketTrafficControlTest.java
mina/trunk/example/src/main/java/org/apache/mina/example/chat/Main.java
mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClient.java
mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/Main.java
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/Server.java
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/stream/Main.java
mina/trunk/example/src/main/java/org/apache/mina/example/netcat/Main.java
mina/trunk/example/src/main/java/org/apache/mina/example/proxy/Main.java
mina/trunk/example/src/main/java/org/apache/mina/example/reverser/Main.java
mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Client.java
mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Server.java
mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java
mina/trunk/example/src/main/java/org/apache/mina/example/udp/client/MemMonClient.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/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java
mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClient.java
Copied: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java (from r579942, 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/NioDatagramAcceptor.java?p2=mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java&p1=mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java&r1=579942&r2=579944&rev=579944&view=diff
==============================================================================
--- 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/NioDatagramAcceptor.java Thu Sep 27 01:38:44 2007
@@ -43,6 +43,7 @@
import org.apache.mina.common.RuntimeIoException;
import org.apache.mina.common.TransportMetadata;
import org.apache.mina.common.WriteRequest;
+import org.apache.mina.transport.socket.DatagramAcceptor;
import org.apache.mina.transport.socket.DatagramSessionConfig;
import org.apache.mina.transport.socket.DefaultDatagramSessionConfig;
import org.apache.mina.util.NamePreservingRunnable;
@@ -54,8 +55,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public class DatagramAcceptor extends AbstractIoAcceptor implements
- org.apache.mina.transport.socket.DatagramAcceptor {
+public class NioDatagramAcceptor extends AbstractIoAcceptor implements DatagramAcceptor {
private static final IoSessionRecycler DEFAULT_RECYCLER = new ExpiringSessionRecycler();
private static volatile int nextId = 0;
@@ -76,21 +76,21 @@
private final Queue<ServiceOperationFuture> cancelQueue = new ConcurrentLinkedQueue<ServiceOperationFuture>();
- private final Queue<DatagramSessionImpl> flushingSessions = new ConcurrentLinkedQueue<DatagramSessionImpl>();
+ private final Queue<NioDatagramSession> flushingSessions = new ConcurrentLinkedQueue<NioDatagramSession>();
private Worker worker;
/**
* Creates a new instance.
*/
- public DatagramAcceptor() {
+ public NioDatagramAcceptor() {
this(new NewThreadExecutor());
}
/**
* Creates a new instance.
*/
- public DatagramAcceptor(Executor executor) {
+ public NioDatagramAcceptor(Executor executor) {
super(new DefaultDatagramSessionConfig());
try {
@@ -113,7 +113,7 @@
}
public TransportMetadata getTransportMetadata() {
- return DatagramSessionImpl.METADATA;
+ return NioDatagramSession.METADATA;
}
@Override
@@ -191,7 +191,7 @@
}
// If a new session needs to be created.
- DatagramSessionImpl datagramSession = new DatagramSessionImpl(
+ NioDatagramSession datagramSession = new NioDatagramSession(
this, ch, processor, remoteAddress);
datagramSession.setSelectionKey(key);
@@ -250,8 +250,8 @@
}
public void flush(IoSession session) {
- if (scheduleFlush((DatagramSessionImpl) session)) {
- Selector selector = DatagramAcceptor.this.selector;
+ if (scheduleFlush((NioDatagramSession) session)) {
+ Selector selector = NioDatagramAcceptor.this.selector;
if (selector != null) {
selector.wakeup();
}
@@ -273,7 +273,7 @@
}
}
- private boolean scheduleFlush(DatagramSessionImpl session) {
+ private boolean scheduleFlush(NioDatagramSession session) {
if (session.setScheduledForFlush(true)) {
flushingSessions.add(session);
return true;
@@ -300,7 +300,7 @@
cancelKeys();
if (selector.keys().isEmpty()) {
- synchronized (DatagramAcceptor.this) {
+ synchronized (NioDatagramAcceptor.this) {
if (selector.keys().isEmpty()
&& registerQueue.isEmpty()
&& cancelQueue.isEmpty()) {
@@ -336,7 +336,7 @@
if (key.isWritable()) {
for (IoSession session : getManagedSessions()) {
- scheduleFlush((DatagramSessionImpl) session);
+ scheduleFlush((NioDatagramSession) session);
}
}
} catch (Throwable t) {
@@ -351,7 +351,7 @@
SocketAddress remoteAddress = channel.receive(readBuf.buf());
if (remoteAddress != null) {
- DatagramSessionImpl session = (DatagramSessionImpl) newSessionWithoutLock(remoteAddress);
+ NioDatagramSession session = (NioDatagramSession) newSessionWithoutLock(remoteAddress);
readBuf.flip();
@@ -366,7 +366,7 @@
private void flushSessions() {
for (; ;) {
- DatagramSessionImpl session = flushingSessions.poll();
+ NioDatagramSession session = flushingSessions.poll();
if (session == null) {
break;
}
@@ -384,7 +384,7 @@
}
}
- private boolean flush(DatagramSessionImpl session) throws IOException {
+ private boolean flush(NioDatagramSession session) throws IOException {
// Clear OP_WRITE
SelectionKey key = session.getSelectionKey();
if (key == null) {
Copied: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramConnector.java (from r579942, 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/NioDatagramConnector.java?p2=mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramConnector.java&p1=mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java&r1=579942&r2=579944&rev=579944&view=diff
==============================================================================
--- 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/NioDatagramConnector.java Thu Sep 27 01:38:44 2007
@@ -32,6 +32,7 @@
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.TransportMetadata;
+import org.apache.mina.transport.socket.DatagramConnector;
import org.apache.mina.transport.socket.DatagramSessionConfig;
import org.apache.mina.transport.socket.DefaultDatagramSessionConfig;
import org.apache.mina.util.NewThreadExecutor;
@@ -42,8 +43,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public class DatagramConnector extends AbstractIoConnector implements
- org.apache.mina.transport.socket.DatagramConnector{
+public class NioDatagramConnector extends AbstractIoConnector implements DatagramConnector{
private static volatile int nextId = 0;
@@ -57,21 +57,21 @@
/**
* Creates a new instance.
*/
- public DatagramConnector() {
+ public NioDatagramConnector() {
this(new NewThreadExecutor());
}
/**
* Creates a new instance.
*/
- public DatagramConnector(Executor executor) {
+ public NioDatagramConnector(Executor executor) {
this(Runtime.getRuntime().availableProcessors() + 1, executor);
}
/**
* Creates a new instance.
*/
- public DatagramConnector(int processorCount, Executor executor) {
+ public NioDatagramConnector(int processorCount, Executor executor) {
super(new DefaultDatagramSessionConfig());
if (processorCount < 1) {
@@ -99,7 +99,7 @@
}
public TransportMetadata getTransportMetadata() {
- return DatagramSessionImpl.METADATA;
+ return NioDatagramSession.METADATA;
}
@Override
@@ -125,7 +125,7 @@
ch.connect(remoteAddress);
NioProcessor processor = nextProcessor();
- session = new DatagramSessionImpl(this, ch, processor);
+ session = new NioDatagramSession(this, ch, processor);
ConnectFuture future = new DefaultConnectFuture();
// DefaultIoFilterChain will notify the connect future.
session.setAttribute(DefaultIoFilterChain.CONNECT_FUTURE, future);
Copied: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramSession.java (from r579942, mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSessionImpl.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramSession.java?p2=mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramSession.java&p1=mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSessionImpl.java&r1=579942&r2=579944&rev=579944&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramSessionImpl.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramSession.java Thu Sep 27 01:38:44 2007
@@ -47,7 +47,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-class DatagramSessionImpl extends NioSession implements DatagramSession {
+class NioDatagramSession extends NioSession implements DatagramSession {
static final TransportMetadata METADATA =
new DefaultTransportMetadata(
@@ -76,7 +76,7 @@
/**
* Creates a new acceptor-side session instance.
*/
- DatagramSessionImpl(IoService service,
+ NioDatagramSession(IoService service,
DatagramChannel ch, IoProcessor processor,
SocketAddress remoteAddress) {
this.service = service;
@@ -93,7 +93,7 @@
/**
* Creates a new connector-side session instance.
*/
- DatagramSessionImpl(IoService service,
+ NioDatagramSession(IoService service,
DatagramChannel ch, IoProcessor processor) {
this(service, ch, processor, ch.socket().getRemoteSocketAddress());
}
Copied: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java (from r579942, 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/NioSocketAcceptor.java?p2=mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java&p1=mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java&r1=579942&r2=579944&rev=579944&view=diff
==============================================================================
--- 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/NioSocketAcceptor.java Thu Sep 27 01:38:44 2007
@@ -40,6 +40,7 @@
import org.apache.mina.common.RuntimeIoException;
import org.apache.mina.common.TransportMetadata;
import org.apache.mina.transport.socket.DefaultSocketSessionConfig;
+import org.apache.mina.transport.socket.SocketAcceptor;
import org.apache.mina.transport.socket.SocketSessionConfig;
import org.apache.mina.util.NamePreservingRunnable;
import org.apache.mina.util.NewThreadExecutor;
@@ -51,8 +52,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev: 389042 $, $Date: 2006-03-27 07:49:41Z $
*/
-public class SocketAcceptor extends AbstractIoAcceptor implements
- org.apache.mina.transport.socket.SocketAcceptor {
+public class NioSocketAcceptor extends AbstractIoAcceptor implements SocketAcceptor {
/**
* @noinspection StaticNonFinalField
@@ -92,7 +92,7 @@
/**
* Create an acceptor with a single processing thread using a NewThreadExecutor
*/
- public SocketAcceptor() {
+ public NioSocketAcceptor() {
this(new NewThreadExecutor());
}
@@ -102,7 +102,7 @@
*
* @param executor Executor to use for launching threads
*/
- public SocketAcceptor(Executor executor) {
+ public NioSocketAcceptor(Executor executor) {
this(Runtime.getRuntime().availableProcessors() + 1, executor);
}
@@ -112,7 +112,7 @@
* @param processorCount Number of processing threads
* @param executor Executor to use for launching threads
*/
- public SocketAcceptor(int processorCount, Executor executor) {
+ public NioSocketAcceptor(int processorCount, Executor executor) {
super(new DefaultSocketSessionConfig());
// The default reuseAddress of an accepted socket should be 'true'.
@@ -171,7 +171,7 @@
}
public TransportMetadata getTransportMetadata() {
- return SocketSessionImpl.METADATA;
+ return NioSocketSession.METADATA;
}
@Override
@@ -284,7 +284,7 @@
*/
private class Worker implements Runnable {
public void run() {
- Thread.currentThread().setName(SocketAcceptor.this.threadName);
+ Thread.currentThread().setName(NioSocketAcceptor.this.threadName);
for (; ;) {
try {
@@ -358,8 +358,8 @@
try {
// Create a new session object. This class extends
// BaseIoSession and is custom for socket-based sessions.
- SocketSessionImpl session = new SocketSessionImpl(
- SocketAcceptor.this, nextProcessor(), ch);
+ NioSocketSession session = new NioSocketSession(
+ NioSocketAcceptor.this, nextProcessor(), ch);
// add the session to the SocketIoProcessor
session.getProcessor().add(session);
Copied: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java (from r579448, 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/NioSocketConnector.java?p2=mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java&p1=mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java&r1=579448&r2=579944&rev=579944&view=diff
==============================================================================
--- 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/NioSocketConnector.java Thu Sep 27 01:38:44 2007
@@ -39,6 +39,7 @@
import org.apache.mina.common.RuntimeIoException;
import org.apache.mina.common.TransportMetadata;
import org.apache.mina.transport.socket.DefaultSocketSessionConfig;
+import org.apache.mina.transport.socket.SocketConnector;
import org.apache.mina.transport.socket.SocketSessionConfig;
import org.apache.mina.util.NamePreservingRunnable;
import org.apache.mina.util.NewThreadExecutor;
@@ -49,8 +50,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev: 389042 $, $Date: 2006-03-27 07:49:41Z $
*/
-public class SocketConnector extends AbstractIoConnector implements
- org.apache.mina.transport.socket.SocketConnector {
+public class NioSocketConnector extends AbstractIoConnector implements SocketConnector {
/**
* @noinspection StaticNonFinalField
@@ -84,7 +84,7 @@
/**
* Create a connector with a single processing thread using a NewThreadExecutor
*/
- public SocketConnector() {
+ public NioSocketConnector() {
this(1, new NewThreadExecutor());
}
@@ -94,7 +94,7 @@
* @param processorCount Number of processing threads
* @param executor Executor to use for launching threads
*/
- public SocketConnector(int processorCount, Executor executor) {
+ public NioSocketConnector(int processorCount, Executor executor) {
super(new DefaultSocketSessionConfig());
if (processorCount < 1) {
throw new IllegalArgumentException(
@@ -128,7 +128,7 @@
}
public TransportMetadata getTransportMetadata() {
- return SocketSessionImpl.METADATA;
+ return NioSocketSession.METADATA;
}
@Override
@@ -288,7 +288,7 @@
}
private void newSession(SocketChannel ch, ConnectFuture connectFuture) {
- SocketSessionImpl session = new SocketSessionImpl(this,
+ NioSocketSession session = new NioSocketSession(this,
nextProcessor(), ch);
// Set the ConnectFuture of the specified session, which will be
@@ -312,7 +312,7 @@
private long lastActive = System.currentTimeMillis();
public void run() {
- Thread.currentThread().setName(SocketConnector.this.threadName);
+ Thread.currentThread().setName(NioSocketConnector.this.threadName);
for (; ;) {
try {
Copied: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketSession.java (from r579448, 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/NioSocketSession.java?p2=mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketSession.java&p1=mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java&r1=579448&r2=579944&rev=579944&view=diff
==============================================================================
--- 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/NioSocketSession.java Thu Sep 27 01:38:44 2007
@@ -46,7 +46,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-class SocketSessionImpl extends NioSession implements SocketSession {
+class NioSocketSession extends NioSession implements SocketSession {
static final TransportMetadata METADATA =
new DefaultTransportMetadata(
@@ -71,7 +71,7 @@
private int readBufferSize = 1024;
- SocketSessionImpl(IoService service, IoProcessor processor, SocketChannel ch) {
+ NioSocketSession(IoService service, IoProcessor processor, SocketChannel ch) {
this.service = service;
this.processor = processor;
this.ch = ch;
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java Thu Sep 27 01:38:44 2007
@@ -30,8 +30,8 @@
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
import org.apache.mina.filter.executor.ExecutorFilter;
import org.apache.mina.filter.statistic.ProfilerTimerFilter;
-import org.apache.mina.transport.socket.nio.SocketAcceptor;
-import org.apache.mina.transport.socket.nio.SocketConnector;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
+import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,7 +48,7 @@
private static final int TIMEOUT = 5000;
private MyAppender appender = new MyAppender();
- private SocketAcceptor acceptor;
+ private NioSocketAcceptor acceptor;
@Override
protected void setUp() throws Exception {
@@ -57,7 +57,7 @@
org.apache.log4j.Logger.getRootLogger().removeAllAppenders();
org.apache.log4j.Logger.getRootLogger().setLevel(Level.DEBUG);
org.apache.log4j.Logger.getRootLogger().addAppender(appender);
- acceptor = new SocketAcceptor();
+ acceptor = new NioSocketAcceptor();
}
@@ -140,7 +140,7 @@
acceptor.bind();
acceptor.setFilterChainBuilder(chain);
// create some clients
- SocketConnector connector = new SocketConnector();
+ NioSocketConnector connector = new NioSocketConnector();
connector.setHandler(new IoHandlerAdapter());
SocketAddress remoteAddressClients[] = new SocketAddress[2];
remoteAddressClients[0] = connectAndWrite(connector,0);
@@ -186,7 +186,7 @@
}
}
- private SocketAddress connectAndWrite(SocketConnector connector, int clientNr) {
+ private SocketAddress connectAndWrite(NioSocketConnector connector, int clientNr) {
ConnectFuture connectFuture = connector.connect(new InetSocketAddress("localhost",PORT));
connectFuture.awaitUninterruptibly(TIMEOUT);
ByteBuffer message = ByteBuffer.allocate(4).putInt(clientNr).flip();
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?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- 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 Thu Sep 27 01:38:44 2007
@@ -43,8 +43,8 @@
import org.apache.mina.common.IoSession;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.WriteRequest;
-import org.apache.mina.transport.socket.nio.SocketAcceptor;
-import org.apache.mina.transport.socket.nio.SocketConnector;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
+import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.apache.mina.util.AvailablePortFinder;
import org.easymock.AbstractMatcher;
import org.easymock.MockControl;
@@ -338,12 +338,12 @@
}
public void testWriteUsingSocketTransport() throws Exception {
- SocketAcceptor acceptor = new SocketAcceptor();
+ NioSocketAcceptor acceptor = new NioSocketAcceptor();
acceptor.setReuseAddress(true);
SocketAddress address = new InetSocketAddress("localhost",
AvailablePortFinder.getNextAvailable());
- SocketConnector connector = new SocketConnector();
+ NioSocketConnector connector = new NioSocketConnector();
FixedRandomInputStream stream = new FixedRandomInputStream(
4 * 1024 * 1024);
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramBindTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramBindTest.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramBindTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramBindTest.java Thu Sep 27 01:38:44 2007
@@ -34,7 +34,7 @@
public class DatagramBindTest extends AbstractBindTest {
public DatagramBindTest() {
- super(new DatagramAcceptor());
+ super(new NioDatagramAcceptor());
}
@Override
@@ -49,6 +49,6 @@
@Override
protected IoConnector newConnector() {
- return new DatagramConnector();
+ return new NioDatagramConnector();
}
}
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConfigTest.java Thu Sep 27 01:38:44 2007
@@ -43,9 +43,9 @@
* @version $Rev$, $Date$
*/
public class DatagramConfigTest extends TestCase {
- private final IoAcceptor acceptor = new DatagramAcceptor();
+ private final IoAcceptor acceptor = new NioDatagramAcceptor();
- private final IoConnector connector = new DatagramConnector();
+ private final IoConnector connector = new NioDatagramConnector();
private String result;
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConnectorTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConnectorTest.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConnectorTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramConnectorTest.java Thu Sep 27 01:38:44 2007
@@ -33,12 +33,12 @@
@Override
protected IoAcceptor createAcceptor() {
- return new DatagramAcceptor();
+ return new NioDatagramAcceptor();
}
@Override
protected IoConnector createConnector() {
- return new DatagramConnector();
+ return new NioDatagramConnector();
}
@Override
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramRecyclerTest.java Thu Sep 27 01:38:44 2007
@@ -39,9 +39,9 @@
* @version $Rev$, $Date$
*/
public class DatagramRecyclerTest extends TestCase {
- private final DatagramAcceptor acceptor = new DatagramAcceptor();
+ private final NioDatagramAcceptor acceptor = new NioDatagramAcceptor();
- private final DatagramConnector connector = new DatagramConnector();
+ private final NioDatagramConnector connector = new NioDatagramConnector();
public DatagramRecyclerTest() {
}
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramTrafficControlTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramTrafficControlTest.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramTrafficControlTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/DatagramTrafficControlTest.java Thu Sep 27 01:38:44 2007
@@ -37,13 +37,13 @@
public class DatagramTrafficControlTest extends AbstractTrafficControlTest {
public DatagramTrafficControlTest() {
- super(new DatagramAcceptor());
+ super(new NioDatagramAcceptor());
}
@Override
protected ConnectFuture connect(int port, IoHandler handler)
throws Exception {
- IoConnector connector = new DatagramConnector();
+ IoConnector connector = new NioDatagramConnector();
connector.setHandler(handler);
return connector.connect(new InetSocketAddress("localhost", port));
}
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketBindTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketBindTest.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketBindTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketBindTest.java Thu Sep 27 01:38:44 2007
@@ -26,7 +26,7 @@
import org.apache.mina.transport.AbstractBindTest;
/**
- * Tests {@link SocketAcceptor} resource leakage.
+ * Tests {@link NioSocketAcceptor} resource leakage.
*
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
@@ -34,7 +34,7 @@
public class SocketBindTest extends AbstractBindTest {
public SocketBindTest() {
- super(new SocketAcceptor());
+ super(new NioSocketAcceptor());
}
@Override
@@ -49,6 +49,6 @@
@Override
protected IoConnector newConnector() {
- return new SocketConnector();
+ return new NioSocketConnector();
}
}
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketConnectorTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketConnectorTest.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketConnectorTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketConnectorTest.java Thu Sep 27 01:38:44 2007
@@ -24,7 +24,7 @@
import org.apache.mina.transport.AbstractConnectorTest;
/**
- * Tests {@link SocketConnector}.
+ * Tests {@link NioSocketConnector}.
*
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
@@ -33,11 +33,11 @@
@Override
protected IoAcceptor createAcceptor() {
- return new SocketAcceptor();
+ return new NioSocketAcceptor();
}
@Override
protected IoConnector createConnector() {
- return new SocketConnector();
+ return new NioSocketConnector();
}
}
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketTrafficControlTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketTrafficControlTest.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketTrafficControlTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/socket/nio/SocketTrafficControlTest.java Thu Sep 27 01:38:44 2007
@@ -37,13 +37,13 @@
public class SocketTrafficControlTest extends AbstractTrafficControlTest {
public SocketTrafficControlTest() {
- super(new SocketAcceptor());
+ super(new NioSocketAcceptor());
}
@Override
protected ConnectFuture connect(int port, IoHandler handler)
throws Exception {
- IoConnector connector = new SocketConnector();
+ IoConnector connector = new NioSocketConnector();
connector.setHandler(handler);
return connector.connect(new InetSocketAddress("localhost", port));
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/chat/Main.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/Main.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/chat/Main.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/chat/Main.java Thu Sep 27 01:38:44 2007
@@ -26,7 +26,7 @@
import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.filter.logging.MdcInjectionFilter;
import org.apache.mina.filter.ssl.SslFilter;
-import org.apache.mina.transport.socket.nio.SocketAcceptor;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import java.net.InetSocketAddress;
@@ -44,7 +44,7 @@
private static final boolean USE_SSL = false;
public static void main(String[] args) throws Exception {
- SocketAcceptor acceptor = new SocketAcceptor();
+ NioSocketAcceptor acceptor = new NioSocketAcceptor();
DefaultIoFilterChainBuilder chain = acceptor.getFilterChain();
MdcInjectionFilter mdcInjectionFilter = new MdcInjectionFilter();
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java Thu Sep 27 01:38:44 2007
@@ -28,7 +28,7 @@
import org.apache.mina.common.IoSession;
import org.apache.mina.example.echoserver.ssl.BogusSslContextFactory;
import org.apache.mina.filter.ssl.SslFilter;
-import org.apache.mina.transport.socket.nio.SocketConnector;
+import org.apache.mina.transport.socket.nio.NioSocketConnector;
/**
* A simple chat client for a given user.
@@ -51,7 +51,7 @@
this.handler = handler;
}
- public boolean connect(SocketConnector connector, SocketAddress address,
+ public boolean connect(NioSocketConnector connector, SocketAddress address,
boolean useSsl) {
if (session != null && session.isConnected()) {
throw new IllegalStateException(
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClient.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClient.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClient.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClient.java Thu Sep 27 01:38:44 2007
@@ -41,7 +41,7 @@
import javax.swing.border.EmptyBorder;
import org.apache.mina.example.chat.client.SwingChatClientHandler.Callback;
-import org.apache.mina.transport.socket.nio.SocketConnector;
+import org.apache.mina.transport.socket.nio.NioSocketConnector;
/**
* Simple chat client based on Swing & MINA that implements the chat protocol.
@@ -72,12 +72,12 @@
private SwingChatClientHandler handler;
- private SocketConnector connector;
+ private NioSocketConnector connector;
public SwingChatClient() {
super("Chat Client based on Apache MINA");
- connector = new SocketConnector();
+ connector = new NioSocketConnector();
loginButton = new JButton(new LoginAction());
loginButton.setText("Connect");
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/Main.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/Main.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/Main.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/Main.java Thu Sep 27 01:38:44 2007
@@ -26,7 +26,7 @@
import org.apache.mina.example.echoserver.ssl.BogusSslContextFactory;
import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.filter.ssl.SslFilter;
-import org.apache.mina.transport.socket.nio.SocketAcceptor;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
/**
* (<b>Entry point</b>) Echo server
@@ -42,7 +42,7 @@
private static final boolean USE_SSL = false;
public static void main(String[] args) throws Exception {
- IoAcceptor acceptor = new SocketAcceptor();
+ IoAcceptor acceptor = new NioSocketAcceptor();
DefaultIoFilterChainBuilder chain = acceptor.getFilterChain();
// Add SSL filter if SSL is enabled.
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/Server.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/Server.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/Server.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/Server.java Thu Sep 27 01:38:44 2007
@@ -23,7 +23,7 @@
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.logging.LoggingFilter;
-import org.apache.mina.transport.socket.nio.SocketAcceptor;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
/**
* (<b>Entry point</b>) HTTP server
@@ -49,7 +49,7 @@
try {
// Create an acceptor
- SocketAcceptor acceptor = new SocketAcceptor();
+ NioSocketAcceptor acceptor = new NioSocketAcceptor();
// Create a service configuration
acceptor.getFilterChain().addLast(
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/stream/Main.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/stream/Main.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/stream/Main.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/stream/Main.java Thu Sep 27 01:38:44 2007
@@ -25,7 +25,7 @@
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.example.echoserver.ssl.BogusSslContextFactory;
import org.apache.mina.filter.ssl.SslFilter;
-import org.apache.mina.transport.socket.nio.SocketAcceptor;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
/**
* (<b>Entry point</b>) HTTP server
@@ -40,7 +40,7 @@
private static final boolean USE_SSL = false;
public static void main(String[] args) throws Exception {
- IoAcceptor acceptor = new SocketAcceptor();
+ IoAcceptor acceptor = new NioSocketAcceptor();
DefaultIoFilterChainBuilder chain = acceptor.getFilterChain();
// Add SSL filter if SSL is enabled.
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/netcat/Main.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/netcat/Main.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/netcat/Main.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/netcat/Main.java Thu Sep 27 01:38:44 2007
@@ -22,7 +22,7 @@
import java.net.InetSocketAddress;
import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.transport.socket.nio.SocketConnector;
+import org.apache.mina.transport.socket.nio.NioSocketConnector;
/**
* (<b>Entry point</b>) NetCat client. NetCat client connects to the specified
@@ -40,7 +40,7 @@
}
// Create TCP/IP connector.
- SocketConnector connector = new SocketConnector();
+ NioSocketConnector connector = new NioSocketConnector();
// Set connect timeout.
connector.setConnectTimeout(30);
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/proxy/Main.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/proxy/Main.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/proxy/Main.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/proxy/Main.java Thu Sep 27 01:38:44 2007
@@ -22,8 +22,8 @@
import java.net.InetSocketAddress;
import org.apache.mina.common.IoConnector;
-import org.apache.mina.transport.socket.nio.SocketAcceptor;
-import org.apache.mina.transport.socket.nio.SocketConnector;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
+import org.apache.mina.transport.socket.nio.NioSocketConnector;
/**
* (<b>Entry point</b>) Demonstrates how to write a very simple tunneling proxy
@@ -50,10 +50,10 @@
}
// Create TCP/IP acceptor.
- SocketAcceptor acceptor = new SocketAcceptor();
+ NioSocketAcceptor acceptor = new NioSocketAcceptor();
// Create TCP/IP connector.
- IoConnector connector = new SocketConnector();
+ IoConnector connector = new NioSocketConnector();
// Set connect timeout.
connector.setConnectTimeout(30);
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/reverser/Main.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/reverser/Main.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/reverser/Main.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/reverser/Main.java Thu Sep 27 01:38:44 2007
@@ -25,7 +25,7 @@
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
import org.apache.mina.filter.logging.LoggingFilter;
-import org.apache.mina.transport.socket.nio.SocketAcceptor;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
/**
* (<b>Entry point</b>) Reverser server which reverses all text lines from
@@ -38,7 +38,7 @@
private static final int PORT = 8080;
public static void main(String[] args) throws Exception {
- SocketAcceptor acceptor = new SocketAcceptor();
+ NioSocketAcceptor acceptor = new NioSocketAcceptor();
// Prepare the configuration
acceptor.getFilterChain().addLast("logger", new LoggingFilter());
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Client.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Client.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Client.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Client.java Thu Sep 27 01:38:44 2007
@@ -28,7 +28,7 @@
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.serialization.ObjectSerializationCodecFactory;
import org.apache.mina.filter.logging.LoggingFilter;
-import org.apache.mina.transport.socket.nio.SocketConnector;
+import org.apache.mina.transport.socket.nio.NioSocketConnector;
/**
* (<strong>Entry Point</strong>) Starts SumUp client.
@@ -58,7 +58,7 @@
values[i] = Integer.parseInt(args[i]);
}
- SocketConnector connector = new SocketConnector();
+ NioSocketConnector connector = new NioSocketConnector();
// Change the worker timeout to 1 second to make the I/O thread quit soon
// when there's no connection to manage.
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Server.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Server.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Server.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Server.java Thu Sep 27 01:38:44 2007
@@ -25,7 +25,7 @@
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.serialization.ObjectSerializationCodecFactory;
import org.apache.mina.filter.logging.LoggingFilter;
-import org.apache.mina.transport.socket.nio.SocketAcceptor;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
/**
* (<strong>Entry Point</strong>) Starts SumUp server.
@@ -40,7 +40,7 @@
private static final boolean USE_CUSTOM_CODEC = true;
public static void main(String[] args) throws Throwable {
- SocketAcceptor acceptor = new SocketAcceptor();
+ NioSocketAcceptor acceptor = new NioSocketAcceptor();
// Prepare the service configuration.
if (USE_CUSTOM_CODEC) {
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java Thu Sep 27 01:38:44 2007
@@ -34,7 +34,7 @@
import org.apache.mina.common.DefaultIoFilterChainBuilder;
import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.transport.socket.DatagramSessionConfig;
-import org.apache.mina.transport.socket.nio.DatagramAcceptor;
+import org.apache.mina.transport.socket.nio.NioDatagramAcceptor;
/**
* The class that will accept and process clients in order to properly
@@ -59,7 +59,7 @@
public MemoryMonitor() throws IOException {
- DatagramAcceptor acceptor = new DatagramAcceptor();
+ NioDatagramAcceptor acceptor = new NioDatagramAcceptor();
acceptor.setLocalAddress(new InetSocketAddress(PORT));
acceptor.setHandler(new MemoryMonitorHandler(this));
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/udp/client/MemMonClient.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/udp/client/MemMonClient.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/udp/client/MemMonClient.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/udp/client/MemMonClient.java Thu Sep 27 01:38:44 2007
@@ -30,7 +30,7 @@
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
import org.apache.mina.example.udp.MemoryMonitor;
-import org.apache.mina.transport.socket.nio.DatagramConnector;
+import org.apache.mina.transport.socket.nio.NioDatagramConnector;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,7 +55,7 @@
log.debug("UDPClient::UDPClient");
log.debug("Created a datagram connector");
- connector = new DatagramConnector();
+ connector = new NioDatagramConnector();
log.debug("Setting the handler");
connector.setHandler(this);
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java Thu Sep 27 01:38:44 2007
@@ -32,8 +32,8 @@
import org.apache.mina.example.echoserver.ssl.BogusSslContextFactory;
import org.apache.mina.filter.ssl.SslFilter;
import org.apache.mina.transport.socket.DatagramSessionConfig;
-import org.apache.mina.transport.socket.nio.DatagramAcceptor;
-import org.apache.mina.transport.socket.nio.SocketAcceptor;
+import org.apache.mina.transport.socket.nio.NioDatagramAcceptor;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
/**
* Tests echo server example.
@@ -84,12 +84,12 @@
.getInstance(true));
boundAddress = null;
- datagramAcceptor = new DatagramAcceptor();
- socketAcceptor = new SocketAcceptor();
+ datagramAcceptor = new NioDatagramAcceptor();
+ socketAcceptor = new NioSocketAcceptor();
((DatagramSessionConfig) datagramAcceptor.getSessionConfig())
.setReuseAddress(true);
- ((SocketAcceptor) socketAcceptor).setReuseAddress(true);
+ ((NioSocketAcceptor) socketAcceptor).setReuseAddress(true);
// Find an availble test port and bind to it.
boolean socketBound = false;
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java Thu Sep 27 01:38:44 2007
@@ -33,8 +33,8 @@
import org.apache.mina.common.WriteFuture;
import org.apache.mina.example.echoserver.ssl.BogusSslContextFactory;
import org.apache.mina.filter.ssl.SslFilter;
-import org.apache.mina.transport.socket.nio.DatagramConnector;
-import org.apache.mina.transport.socket.nio.SocketConnector;
+import org.apache.mina.transport.socket.nio.NioDatagramConnector;
+import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.apache.mina.util.AvailablePortFinder;
/**
@@ -65,14 +65,14 @@
}
public void testTCP() throws Exception {
- IoConnector connector = new SocketConnector();
+ IoConnector connector = new NioSocketConnector();
testConnector(connector);
}
public void testTCPWithSSL() throws Exception {
useSSL = true;
// Create a connector
- IoConnector connector = new SocketConnector();
+ IoConnector connector = new NioSocketConnector();
// Add an SSL filter to connector
connector.getFilterChain().addLast("SSL", connectorSSLFilter);
@@ -80,7 +80,7 @@
}
public void testUDP() throws Exception {
- IoConnector connector = new DatagramConnector();
+ IoConnector connector = new NioDatagramConnector();
testConnector(connector);
}
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java Thu Sep 27 01:38:44 2007
@@ -20,7 +20,7 @@
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
import org.apache.mina.filter.ssl.SslFilter;
-import org.apache.mina.transport.socket.nio.SocketAcceptor;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
public class SslFilterTest extends TestCase {
@@ -31,7 +31,7 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- acceptor = new SocketAcceptor();
+ acceptor = new NioSocketAcceptor();
}
@Override
Modified: mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClient.java
URL: http://svn.apache.org/viewvc/mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClient.java?rev=579944&r1=579943&r2=579944&view=diff
==============================================================================
--- mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClient.java (original)
+++ mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClient.java Thu Sep 27 01:38:44 2007
@@ -32,7 +32,7 @@
import org.apache.mina.filter.codec.http.HttpProtocolCodecFactory;
import org.apache.mina.filter.codec.http.HttpRequestMessage;
import org.apache.mina.filter.ssl.SslFilter;
-import org.apache.mina.transport.socket.nio.SocketConnector;
+import org.apache.mina.transport.socket.nio.NioSocketConnector;
public class AsyncHttpClient {
@@ -58,7 +58,7 @@
}
public void connect() throws Exception {
- SocketConnector connector = new SocketConnector();
+ NioSocketConnector connector = new NioSocketConnector();
connector.setConnectTimeout(connectionTimeout);