You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2011/04/09 00:06:21 UTC
svn commit: r1090466 - in /mina/branches/3.0/core/src:
main/java/org/apache/mina/ main/java/org/apache/mina/service/
main/java/org/apache/mina/service/client/
main/java/org/apache/mina/service/server/ main/java/org/apache/mina/socket/
main/java/org/apa...
Author: elecharny
Date: Fri Apr 8 22:06:20 2011
New Revision: 1090466
URL: http://svn.apache.org/viewvc?rev=1090466&view=rev
Log:
Refactored the code to reflect the new names for servers and clients (cf https://cwiki.apache.org/confluence/display/MINA/MINA+3+Service)
Added:
mina/branches/3.0/core/src/main/java/org/apache/mina/IoClient.java
- copied, changed from r1090432, mina/branches/3.0/core/src/main/java/org/apache/mina/IoConnector.java
mina/branches/3.0/core/src/main/java/org/apache/mina/IoServer.java
- copied, changed from r1090432, mina/branches/3.0/core/src/main/java/org/apache/mina/IoAcceptor.java
mina/branches/3.0/core/src/main/java/org/apache/mina/service/client/
mina/branches/3.0/core/src/main/java/org/apache/mina/service/client/AbstractIoClient.java
mina/branches/3.0/core/src/main/java/org/apache/mina/service/server/
mina/branches/3.0/core/src/main/java/org/apache/mina/service/server/AbstractIoServer.java
- copied, changed from r1090432, mina/branches/3.0/core/src/main/java/org/apache/mina/service/AbstractIoAcceptor.java
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/serial/
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/AbstractTcpClient.java
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/AbstractTcpServer.java
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
- copied, changed from r1090432, mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSelectorProcessor.java
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSocketSession.java
- copied, changed from r1090432, mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketSession.java
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/bio/
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/bio/BioTcpClient.java
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/bio/BioTcpServer.java
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/nio/
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/nio/NioTcpClient.java
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/nio/NioTcpServer.java
- copied, changed from r1090432, mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/AbstractUdpClient.java
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/AbstractUdpServer.java
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/bio/
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/bio/BioUdpClient.java
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/bio/BioUdpServer.java
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/nio/
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/nio/NioUdpClient.java
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/nio/NioUdpServer.java
Removed:
mina/branches/3.0/core/src/main/java/org/apache/mina/IoAcceptor.java
mina/branches/3.0/core/src/main/java/org/apache/mina/IoConnector.java
mina/branches/3.0/core/src/main/java/org/apache/mina/service/AbstractIoAcceptor.java
mina/branches/3.0/core/src/main/java/org/apache/mina/socket/
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/
Modified:
mina/branches/3.0/core/src/main/java/org/apache/mina/IoService.java
mina/branches/3.0/core/src/test/java/org/apache/mina/transport/socket/nio/NioAcceptorTest.java
Copied: mina/branches/3.0/core/src/main/java/org/apache/mina/IoClient.java (from r1090432, mina/branches/3.0/core/src/main/java/org/apache/mina/IoConnector.java)
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/IoClient.java?p2=mina/branches/3.0/core/src/main/java/org/apache/mina/IoClient.java&p1=mina/branches/3.0/core/src/main/java/org/apache/mina/IoConnector.java&r1=1090432&r2=1090466&rev=1090466&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/IoConnector.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/IoClient.java Fri Apr 8 22:06:20 2011
@@ -28,7 +28,7 @@ import java.net.SocketAddress;
*
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
-public interface IoConnector extends IoService {
+public interface IoClient extends IoService {
/**
* Returns the connect timeout in milliseconds. The default value is 1
* minute.
Copied: mina/branches/3.0/core/src/main/java/org/apache/mina/IoServer.java (from r1090432, mina/branches/3.0/core/src/main/java/org/apache/mina/IoAcceptor.java)
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/IoServer.java?p2=mina/branches/3.0/core/src/main/java/org/apache/mina/IoServer.java&p1=mina/branches/3.0/core/src/main/java/org/apache/mina/IoAcceptor.java&r1=1090432&r2=1090466&rev=1090466&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/IoAcceptor.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/IoServer.java Fri Apr 8 22:06:20 2011
@@ -28,7 +28,7 @@ import java.util.Set;
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
*
*/
-public interface IoAcceptor extends IoService {
+public interface IoServer extends IoService {
/**
* Returns a {@link Set} of the local addresses which are bound currently.
Modified: mina/branches/3.0/core/src/main/java/org/apache/mina/IoService.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/IoService.java?rev=1090466&r1=1090465&r2=1090466&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/IoService.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/IoService.java Fri Apr 8 22:06:20 2011
@@ -22,7 +22,7 @@ package org.apache.mina;
import java.util.Map;
/**
- * Base interface for all {@link IoAcceptor}s and {@link IoConnector}s
+ * Base interface for all {@link IoServer}s and {@link IoClient}s
* that provide I/O service and manage {@link IoSession}s.
*
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
Added: mina/branches/3.0/core/src/main/java/org/apache/mina/service/client/AbstractIoClient.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/service/client/AbstractIoClient.java?rev=1090466&view=auto
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/service/client/AbstractIoClient.java (added)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/service/client/AbstractIoClient.java Fri Apr 8 22:06:20 2011
@@ -0,0 +1,6 @@
+package org.apache.mina.service.client;
+
+public class AbstractIoClient
+{
+
+}
Copied: mina/branches/3.0/core/src/main/java/org/apache/mina/service/server/AbstractIoServer.java (from r1090432, mina/branches/3.0/core/src/main/java/org/apache/mina/service/AbstractIoAcceptor.java)
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/service/server/AbstractIoServer.java?p2=mina/branches/3.0/core/src/main/java/org/apache/mina/service/server/AbstractIoServer.java&p1=mina/branches/3.0/core/src/main/java/org/apache/mina/service/AbstractIoAcceptor.java&r1=1090432&r2=1090466&rev=1090466&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/service/AbstractIoAcceptor.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/service/server/AbstractIoServer.java Fri Apr 8 22:06:20 2011
@@ -17,15 +17,16 @@
* under the License.
*
*/
-package org.apache.mina.service;
+package org.apache.mina.service.server;
-import org.apache.mina.IoAcceptor;
+import org.apache.mina.IoServer;
+import org.apache.mina.service.AbstractIoService;
/**
- * Base implementation for {@link IoAcceptor}s.
+ * Base implementation for {@link IoServer}s.
*
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
-public abstract class AbstractIoAcceptor extends AbstractIoService implements IoAcceptor {
+public abstract class AbstractIoServer extends AbstractIoService implements IoServer {
}
Added: mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/AbstractTcpClient.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/AbstractTcpClient.java?rev=1090466&view=auto
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/AbstractTcpClient.java (added)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/AbstractTcpClient.java Fri Apr 8 22:06:20 2011
@@ -0,0 +1,7 @@
+package org.apache.mina.transport.tcp;
+
+import org.apache.mina.service.client.AbstractIoClient;
+
+public class AbstractTcpClient extends AbstractIoClient
+{
+}
Added: mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/AbstractTcpServer.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/AbstractTcpServer.java?rev=1090466&view=auto
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/AbstractTcpServer.java (added)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/AbstractTcpServer.java Fri Apr 8 22:06:20 2011
@@ -0,0 +1,43 @@
+package org.apache.mina.transport.tcp;
+
+import java.io.IOException;
+import java.net.SocketAddress;
+import java.util.Set;
+
+import org.apache.mina.service.server.AbstractIoServer;
+
+public class AbstractTcpServer extends AbstractIoServer
+{
+
+ @Override
+ public Set<SocketAddress> getLocalAddresses()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+ @Override
+ public void bind( SocketAddress... localAddress ) throws IOException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ @Override
+ public void unbindAll() throws IOException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ @Override
+ public void unbind( SocketAddress... localAddresses ) throws IOException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Copied: mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java (from r1090432, mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSelectorProcessor.java)
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java?p2=mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java&p1=mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSelectorProcessor.java&r1=1090432&r2=1090466&rev=1090466&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSelectorProcessor.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java Fri Apr 8 22:06:20 2011
@@ -18,7 +18,7 @@
*
*/
-package org.apache.mina.transport.socket.nio;
+package org.apache.mina.transport.tcp;
import java.io.IOException;
import java.net.SocketAddress;
Copied: mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSocketSession.java (from r1090432, mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketSession.java)
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSocketSession.java?p2=mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSocketSession.java&p1=mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketSession.java&r1=1090432&r2=1090466&rev=1090466&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketSession.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSocketSession.java Fri Apr 8 22:06:20 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.transport.socket.nio;
+package org.apache.mina.transport.tcp;
import java.net.SocketAddress;
import java.nio.channels.SocketChannel;
@@ -25,6 +25,7 @@ import java.nio.channels.SocketChannel;
import org.apache.mina.CloseFuture;
import org.apache.mina.IoSessionConfig;
import org.apache.mina.session.AbstractIoSession;
+import org.apache.mina.transport.tcp.nio.NioTcpServer;
/**
*
@@ -34,7 +35,7 @@ import org.apache.mina.session.AbstractI
*/
public class NioSocketSession extends AbstractIoSession {
- NioSocketSession(NioSocketAcceptor service,SocketChannel channel) {
+ NioSocketSession(NioTcpServer service,SocketChannel channel) {
super(service);
}
Added: mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/bio/BioTcpClient.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/bio/BioTcpClient.java?rev=1090466&view=auto
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/bio/BioTcpClient.java (added)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/bio/BioTcpClient.java Fri Apr 8 22:06:20 2011
@@ -0,0 +1,7 @@
+package org.apache.mina.transport.tcp.bio;
+
+import org.apache.mina.transport.tcp.AbstractTcpClient;
+
+public class BioTcpClient extends AbstractTcpClient
+{
+}
Added: mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/bio/BioTcpServer.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/bio/BioTcpServer.java?rev=1090466&view=auto
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/bio/BioTcpServer.java (added)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/bio/BioTcpServer.java Fri Apr 8 22:06:20 2011
@@ -0,0 +1,43 @@
+package org.apache.mina.transport.tcp.bio;
+
+import java.io.IOException;
+import java.net.SocketAddress;
+import java.util.Set;
+
+import org.apache.mina.transport.tcp.AbstractTcpServer;
+
+public class BioTcpServer extends AbstractTcpServer
+{
+
+ @Override
+ public Set<SocketAddress> getLocalAddresses()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+ @Override
+ public void bind( SocketAddress... localAddress ) throws IOException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ @Override
+ public void unbindAll() throws IOException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ @Override
+ public void unbind( SocketAddress... localAddresses ) throws IOException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Added: mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/nio/NioTcpClient.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/nio/NioTcpClient.java?rev=1090466&view=auto
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/nio/NioTcpClient.java (added)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/nio/NioTcpClient.java Fri Apr 8 22:06:20 2011
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.mina.transport.tcp.nio;
+
+import org.apache.mina.transport.tcp.AbstractTcpClient;
+
+/**
+ * TODO
+ *
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a>
+ */
+public class NioTcpClient extends AbstractTcpClient {
+
+}
\ No newline at end of file
Copied: mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/nio/NioTcpServer.java (from r1090432, mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java)
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/nio/NioTcpServer.java?p2=mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/nio/NioTcpServer.java&p1=mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java&r1=1090432&r2=1090466&rev=1090466&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/nio/NioTcpServer.java Fri Apr 8 22:06:20 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.transport.socket.nio;
+package org.apache.mina.transport.tcp.nio;
import java.io.IOException;
import java.net.SocketAddress;
@@ -25,8 +25,9 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import org.apache.mina.service.AbstractIoAcceptor;
import org.apache.mina.service.SelectorStrategy;
+import org.apache.mina.transport.tcp.AbstractTcpServer;
+import org.apache.mina.transport.tcp.NioSelectorProcessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,9 +36,9 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
-public class NioSocketAcceptor extends AbstractIoAcceptor {
+public class NioTcpServer extends AbstractTcpServer {
- static final Logger LOG = LoggerFactory.getLogger(NioSocketAcceptor.class);
+ static final Logger LOG = LoggerFactory.getLogger(NioTcpServer.class);
// list of bound addresses
private Set<SocketAddress> addresses = Collections
@@ -50,7 +51,7 @@ public class NioSocketAcceptor extends A
// the strategy for dispatching servers and client to selector threads.
private SelectorStrategy strategy;
- public NioSocketAcceptor(SelectorStrategy strategy) {
+ public NioTcpServer(SelectorStrategy strategy) {
this.strategy = strategy;
}
Added: mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/AbstractUdpClient.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/AbstractUdpClient.java?rev=1090466&view=auto
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/AbstractUdpClient.java (added)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/AbstractUdpClient.java Fri Apr 8 22:06:20 2011
@@ -0,0 +1,7 @@
+package org.apache.mina.transport.udp;
+
+import org.apache.mina.service.client.AbstractIoClient;
+
+public class AbstractUdpClient extends AbstractIoClient
+{
+}
Added: mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/AbstractUdpServer.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/AbstractUdpServer.java?rev=1090466&view=auto
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/AbstractUdpServer.java (added)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/AbstractUdpServer.java Fri Apr 8 22:06:20 2011
@@ -0,0 +1,43 @@
+package org.apache.mina.transport.udp;
+
+import java.io.IOException;
+import java.net.SocketAddress;
+import java.util.Set;
+
+import org.apache.mina.service.server.AbstractIoServer;
+
+public class AbstractUdpServer extends AbstractIoServer
+{
+
+ @Override
+ public Set<SocketAddress> getLocalAddresses()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+ @Override
+ public void bind( SocketAddress... localAddress ) throws IOException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ @Override
+ public void unbindAll() throws IOException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ @Override
+ public void unbind( SocketAddress... localAddresses ) throws IOException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Added: mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/bio/BioUdpClient.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/bio/BioUdpClient.java?rev=1090466&view=auto
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/bio/BioUdpClient.java (added)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/bio/BioUdpClient.java Fri Apr 8 22:06:20 2011
@@ -0,0 +1,8 @@
+package org.apache.mina.transport.udp.bio;
+
+import org.apache.mina.transport.udp.AbstractUdpClient;
+
+public class BioUdpClient extends AbstractUdpClient
+{
+
+}
Added: mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/bio/BioUdpServer.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/bio/BioUdpServer.java?rev=1090466&view=auto
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/bio/BioUdpServer.java (added)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/bio/BioUdpServer.java Fri Apr 8 22:06:20 2011
@@ -0,0 +1,8 @@
+package org.apache.mina.transport.udp.bio;
+
+import org.apache.mina.transport.udp.AbstractUdpServer;
+
+public class BioUdpServer extends AbstractUdpServer
+{
+
+}
Added: mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/nio/NioUdpClient.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/nio/NioUdpClient.java?rev=1090466&view=auto
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/nio/NioUdpClient.java (added)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/nio/NioUdpClient.java Fri Apr 8 22:06:20 2011
@@ -0,0 +1,8 @@
+package org.apache.mina.transport.udp.nio;
+
+import org.apache.mina.transport.udp.AbstractUdpServer;
+
+public class NioUdpClient extends AbstractUdpServer
+{
+
+}
Added: mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/nio/NioUdpServer.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/nio/NioUdpServer.java?rev=1090466&view=auto
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/nio/NioUdpServer.java (added)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/transport/udp/nio/NioUdpServer.java Fri Apr 8 22:06:20 2011
@@ -0,0 +1,8 @@
+package org.apache.mina.transport.udp.nio;
+
+import org.apache.mina.transport.udp.AbstractUdpServer;
+
+public class NioUdpServer extends AbstractUdpServer
+{
+
+}
Modified: mina/branches/3.0/core/src/test/java/org/apache/mina/transport/socket/nio/NioAcceptorTest.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/test/java/org/apache/mina/transport/socket/nio/NioAcceptorTest.java?rev=1090466&r1=1090465&r2=1090466&view=diff
==============================================================================
--- mina/branches/3.0/core/src/test/java/org/apache/mina/transport/socket/nio/NioAcceptorTest.java (original)
+++ mina/branches/3.0/core/src/test/java/org/apache/mina/transport/socket/nio/NioAcceptorTest.java Fri Apr 8 22:06:20 2011
@@ -28,6 +28,8 @@ import junit.framework.Assert;
import org.apache.mina.service.OneThreadSelectorStrategy;
import org.apache.mina.service.SelectorFactory;
+import org.apache.mina.transport.tcp.NioSelectorProcessor;
+import org.apache.mina.transport.tcp.nio.NioTcpServer;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,7 +51,7 @@ public class NioAcceptorTest {
OneThreadSelectorStrategy strategy = new OneThreadSelectorStrategy(
new SelectorFactory(NioSelectorProcessor.class));
- NioSocketAcceptor acceptor = new NioSocketAcceptor(strategy);
+ NioTcpServer acceptor = new NioTcpServer(strategy);
SocketAddress address = new InetSocketAddress(9999);
try {