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:40:13 UTC
svn commit: r565676 - in /mina/trunk:
core/src/main/java/org/apache/mina/common/
core/src/main/java/org/apache/mina/transport/socket/nio/
core/src/main/java/org/apache/mina/transport/socket/nio/support/
core/src/main/java/org/apache/mina/transport/vmpi...
Author: trustin
Date: Tue Aug 14 02:39:58 2007
New Revision: 565676
URL: http://svn.apache.org/viewvc?view=rev&rev=565676
Log:
Renamed TransportType to IoServiceMetadata because it stands what it does more precisely
Added:
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoServiceMetadata.java
- copied, changed from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/DefaultTransportType.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoServiceMetadata.java
- copied, changed from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/TransportType.java
Removed:
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultTransportType.java
mina/trunk/core/src/main/java/org/apache/mina/common/TransportType.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoConnector.java
mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoAcceptorWrapper.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoConnectorWrapper.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoService.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoSession.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java
mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java
mina/trunk/core/src/test/java/org/apache/mina/common/support/FutureTest.java
mina/trunk/core/src/test/java/org/apache/mina/common/support/IoServiceListenerSupportTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/CumulativeProtocolDecoderTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/serialization/ObjectSerializationTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/executor/ExecutorFilterRegressionTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/reqres/RequestResponseFilterTest.java
mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java
mina/trunk/core/src/test/java/org/apache/mina/handler/chain/ChainedIoHandlerTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java
mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java
mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java
mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoAcceptor.java Tue Aug 14 02:39:58 2007
@@ -54,11 +54,11 @@
public void setLocalAddress(SocketAddress localAddress) {
if (localAddress != null
- && !getTransportType().getAddressType().isAssignableFrom(
+ && !getMetadata().getAddressType().isAssignableFrom(
localAddress.getClass())) {
throw new IllegalArgumentException("localAddress type: "
+ localAddress.getClass() + " (expected: "
- + getTransportType().getAddressType() + ")");
+ + getMetadata().getAddressType() + ")");
}
synchronized (bindLock) {
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoConnector.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoConnector.java Tue Aug 14 02:39:58 2007
@@ -62,19 +62,19 @@
throw new NullPointerException("remoteAddress");
}
- if (!getTransportType().getAddressType().isAssignableFrom(
+ if (!getMetadata().getAddressType().isAssignableFrom(
remoteAddress.getClass())) {
throw new IllegalArgumentException("remoteAddress type: "
+ remoteAddress.getClass() + " (expected: "
- + getTransportType().getAddressType() + ")");
+ + getMetadata().getAddressType() + ")");
}
if (localAddress != null
- && !getTransportType().getAddressType().isAssignableFrom(
+ && !getMetadata().getAddressType().isAssignableFrom(
localAddress.getClass())) {
throw new IllegalArgumentException("localAddress type: "
+ localAddress.getClass() + " (expected: "
- + getTransportType().getAddressType() + ")");
+ + getMetadata().getAddressType() + ")");
}
if (getHandler() == null) {
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoService.java Tue Aug 14 02:39:58 2007
@@ -54,11 +54,11 @@
throw new NullPointerException("sessionConfig");
}
- if (!getTransportType().getSessionConfigType().isAssignableFrom(
+ if (!getMetadata().getSessionConfigType().isAssignableFrom(
sessionConfig.getClass())) {
throw new IllegalArgumentException("sessionConfig type: "
+ sessionConfig.getClass() + " (expected: "
- + getTransportType().getSessionConfigType() + ")");
+ + getMetadata().getSessionConfigType() + ")");
}
this.listeners = new IoServiceListenerSupport(this);
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoServiceMetadata.java (from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/DefaultTransportType.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoServiceMetadata.java?view=diff&rev=565676&p1=mina/trunk/core/src/main/java/org/apache/mina/common/DefaultTransportType.java&r1=565669&p2=mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoServiceMetadata.java&r2=565676
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/DefaultTransportType.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoServiceMetadata.java Tue Aug 14 02:39:58 2007
@@ -23,12 +23,12 @@
/**
- * A default immutable implementation of {@link TransportType}.
+ * A default immutable implementation of {@link IoServiceMetadata}.
*
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public class DefaultTransportType implements TransportType {
+public class DefaultIoServiceMetadata implements IoServiceMetadata {
private final String name;
@@ -40,7 +40,7 @@
private final Class<? extends IoSessionConfig> sessionConfigType;
- public DefaultTransportType(String name, boolean connectionless,
+ public DefaultIoServiceMetadata(String name, boolean connectionless,
Class<? extends SocketAddress> addressType,
Class<? extends Object> envelopeType,
Class<? extends IoSessionConfig> sessionConfigType) {
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/IoAcceptorWrapper.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoAcceptorWrapper.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoAcceptorWrapper.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoAcceptorWrapper.java Tue Aug 14 02:39:58 2007
@@ -115,7 +115,7 @@
return acceptor.isBound();
}
- public TransportType getTransportType() {
- return acceptor.getTransportType();
+ public IoServiceMetadata getMetadata() {
+ return acceptor.getMetadata();
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/IoConnectorWrapper.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoConnectorWrapper.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoConnectorWrapper.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoConnectorWrapper.java Tue Aug 14 02:39:58 2007
@@ -103,7 +103,7 @@
connector.setHandler(handler);
}
- public TransportType getTransportType() {
- return connector.getTransportType();
+ public IoServiceMetadata getMetadata() {
+ return connector.getMetadata();
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/IoService.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoService.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoService.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoService.java Tue Aug 14 02:39:58 2007
@@ -30,9 +30,9 @@
*/
public interface IoService {
/**
- * Returns the {@link TransportType} that this service runs on.
+ * Returns the {@link IoServiceMetadata} that this service runs on.
*/
- TransportType getTransportType();
+ IoServiceMetadata getMetadata();
/**
* Adds an {@link IoServiceListener} that listens any events related with
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/IoServiceMetadata.java (from r565669, mina/trunk/core/src/main/java/org/apache/mina/common/TransportType.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoServiceMetadata.java?view=diff&rev=565676&p1=mina/trunk/core/src/main/java/org/apache/mina/common/TransportType.java&r1=565669&p2=mina/trunk/core/src/main/java/org/apache/mina/common/IoServiceMetadata.java&r2=565676
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/TransportType.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoServiceMetadata.java Tue Aug 14 02:39:58 2007
@@ -33,26 +33,26 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public interface TransportType {
+public interface IoServiceMetadata {
/**
* A pre-defined transport type for TCP/IP socket transport.
*/
- static TransportType SOCKET = new DefaultTransportType("socket", false,
+ static IoServiceMetadata SOCKET = new DefaultIoServiceMetadata("socket", false,
InetSocketAddress.class, ByteBuffer.class,
SocketSessionConfig.class);
/**
* A pre-defined transport type for UDP/IP datagram transport.
*/
- static TransportType DATAGRAM = new DefaultTransportType("datagram", true,
+ static IoServiceMetadata DATAGRAM = new DefaultIoServiceMetadata("datagram", true,
InetSocketAddress.class, ByteBuffer.class,
DatagramSessionConfig.class);
/**
* A pre-defined transport type for in-VM pipe transport.
*/
- static TransportType VM_PIPE = new DefaultTransportType("vmpipe", false,
+ static IoServiceMetadata VM_PIPE = new DefaultIoServiceMetadata("vmpipe", false,
VmPipeAddress.class, Object.class, VmPipeSessionConfig.class);
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/IoSession.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoSession.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoSession.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoSession.java Tue Aug 14 02:39:58 2007
@@ -211,7 +211,7 @@
/**
* Returns transport type of this session.
*/
- TransportType getTransportType();
+ IoServiceMetadata getTransportType();
/**
* Returns <code>true</code> if this session is connected with remote peer.
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java Tue Aug 14 02:39:58 2007
@@ -39,7 +39,7 @@
import org.apache.mina.common.IoServiceListenerSupport;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.RuntimeIOException;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
import org.apache.mina.util.NamePreservingRunnable;
import org.apache.mina.util.NewThreadExecutor;
@@ -167,10 +167,10 @@
}
/**
- * @see org.apache.mina.common.IoService#getTransportType()
+ * @see org.apache.mina.common.IoService#getMetadata()
*/
- public TransportType getTransportType() {
- return TransportType.SOCKET;
+ public IoServiceMetadata getMetadata() {
+ return IoServiceMetadata.SOCKET;
}
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java Tue Aug 14 02:39:58 2007
@@ -39,7 +39,7 @@
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoServiceListenerSupport;
import org.apache.mina.common.RuntimeIOException;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
import org.apache.mina.util.NamePreservingRunnable;
import org.apache.mina.util.NewThreadExecutor;
@@ -123,8 +123,8 @@
}
}
- public TransportType getTransportType() {
- return TransportType.SOCKET;
+ public IoServiceMetadata getMetadata() {
+ return IoServiceMetadata.SOCKET;
}
@Override
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketSessionImpl.java Tue Aug 14 02:39:58 2007
@@ -35,7 +35,7 @@
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
import org.apache.mina.common.RuntimeIOException;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
import org.apache.mina.common.WriteRequest;
/**
@@ -170,8 +170,8 @@
filterChain.fireFilterWrite(this, writeRequest);
}
- public TransportType getTransportType() {
- return TransportType.SOCKET;
+ public IoServiceMetadata getTransportType() {
+ return IoServiceMetadata.SOCKET;
}
public InetSocketAddress getRemoteAddress() {
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java Tue Aug 14 02:39:58 2007
@@ -40,7 +40,7 @@
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionRecycler;
import org.apache.mina.common.RuntimeIOException;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.transport.socket.nio.DatagramSessionConfig;
import org.apache.mina.transport.socket.nio.DefaultDatagramSessionConfig;
@@ -107,8 +107,8 @@
}
}
- public TransportType getTransportType() {
- return TransportType.DATAGRAM;
+ public IoServiceMetadata getMetadata() {
+ return IoServiceMetadata.DATAGRAM;
}
@Override
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java Tue Aug 14 02:39:58 2007
@@ -39,7 +39,7 @@
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.RuntimeIOException;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.transport.socket.nio.DatagramSessionConfig;
import org.apache.mina.transport.socket.nio.DefaultDatagramSessionConfig;
@@ -99,8 +99,8 @@
}
}
- public TransportType getTransportType() {
- return TransportType.DATAGRAM;
+ public IoServiceMetadata getMetadata() {
+ return IoServiceMetadata.DATAGRAM;
}
@Override
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramSessionImpl.java Tue Aug 14 02:39:58 2007
@@ -37,7 +37,7 @@
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
import org.apache.mina.common.RuntimeIOException;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.transport.socket.nio.DatagramSession;
@@ -217,8 +217,8 @@
return size;
}
- public TransportType getTransportType() {
- return TransportType.DATAGRAM;
+ public IoServiceMetadata getTransportType() {
+ return IoServiceMetadata.DATAGRAM;
}
public InetSocketAddress getRemoteAddress() {
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeAcceptor.java Tue Aug 14 02:39:58 2007
@@ -27,7 +27,7 @@
import org.apache.mina.common.AbstractIoAcceptor;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
import org.apache.mina.transport.vmpipe.support.VmPipe;
/**
@@ -47,8 +47,8 @@
super(new DefaultVmPipeSessionConfig());
}
- public TransportType getTransportType() {
- return TransportType.VM_PIPE;
+ public IoServiceMetadata getMetadata() {
+ return IoServiceMetadata.VM_PIPE;
}
@Override
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java Tue Aug 14 02:39:58 2007
@@ -34,7 +34,7 @@
import org.apache.mina.common.IoFutureListener;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IdleStatusChecker;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
import org.apache.mina.transport.vmpipe.support.VmPipe;
import org.apache.mina.transport.vmpipe.support.VmPipeFilterChain;
import org.apache.mina.transport.vmpipe.support.VmPipeSessionImpl;
@@ -55,8 +55,8 @@
super(new DefaultVmPipeSessionConfig());
}
- public TransportType getTransportType() {
- return TransportType.VM_PIPE;
+ public IoServiceMetadata getMetadata() {
+ return IoServiceMetadata.VM_PIPE;
}
@Override
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/support/VmPipeSessionImpl.java Tue Aug 14 02:39:58 2007
@@ -30,7 +30,7 @@
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoServiceListenerSupport;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.transport.vmpipe.DefaultVmPipeSessionConfig;
import org.apache.mina.transport.vmpipe.VmPipeAddress;
@@ -141,8 +141,8 @@
return 0;
}
- public TransportType getTransportType() {
- return TransportType.VM_PIPE;
+ public IoServiceMetadata getTransportType() {
+ return IoServiceMetadata.VM_PIPE;
}
public VmPipeAddress getRemoteAddress() {
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java Tue Aug 14 02:39:58 2007
@@ -238,8 +238,8 @@
return null;
}
- public TransportType getTransportType() {
- return TransportType.VM_PIPE;
+ public IoServiceMetadata getTransportType() {
+ return IoServiceMetadata.VM_PIPE;
}
public SocketAddress getRemoteAddress() {
@@ -394,7 +394,7 @@
return null;
}
- public TransportType getTransportType() {
+ public IoServiceMetadata getTransportType() {
return null;
}
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/support/FutureTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/support/FutureTest.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/support/FutureTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/support/FutureTest.java Tue Aug 14 02:39:58 2007
@@ -35,7 +35,7 @@
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
/**
* Tests {@link IoFuture} implementations.
@@ -80,7 +80,7 @@
return null;
}
- public TransportType getTransportType() {
+ public IoServiceMetadata getTransportType() {
return null;
}
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/support/IoServiceListenerSupportTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/support/IoServiceListenerSupportTest.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/support/IoServiceListenerSupportTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/support/IoServiceListenerSupportTest.java Tue Aug 14 02:39:58 2007
@@ -34,7 +34,7 @@
import org.apache.mina.common.IoServiceListener;
import org.apache.mina.common.IoServiceListenerSupport;
import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
import org.easymock.MockControl;
/**
@@ -324,7 +324,7 @@
return serviceAddress;
}
- public TransportType getTransportType() {
+ public IoServiceMetadata getTransportType() {
return null;
}
}
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=565676&r1=565675&r2=565676
==============================================================================
--- 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:39:58 2007
@@ -34,7 +34,7 @@
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
/**
* Tests {@link CumulativeProtocolDecoder}.
@@ -183,8 +183,8 @@
return null;
}
- public TransportType getTransportType() {
- return TransportType.SOCKET;
+ public IoServiceMetadata getTransportType() {
+ return IoServiceMetadata.SOCKET;
}
public SocketAddress getRemoteAddress() {
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=565676&r1=565675&r2=565676
==============================================================================
--- 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:39:58 2007
@@ -34,7 +34,7 @@
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
@@ -137,7 +137,7 @@
return null;
}
- public TransportType getTransportType() {
+ public IoServiceMetadata getTransportType() {
return null;
}
}
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=565676&r1=565675&r2=565676
==============================================================================
--- 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:39:58 2007
@@ -35,7 +35,7 @@
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
/**
@@ -272,7 +272,7 @@
return null;
}
- public TransportType getTransportType() {
+ public IoServiceMetadata getTransportType() {
return null;
}
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=565676&r1=565675&r2=565676
==============================================================================
--- 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:39:58 2007
@@ -32,7 +32,7 @@
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.filter.codec.support.SimpleProtocolEncoderOutput;
@@ -86,7 +86,7 @@
return null;
}
- public TransportType getTransportType() {
+ public IoServiceMetadata getTransportType() {
return null;
}
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=565676&r1=565675&r2=565676
==============================================================================
--- 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:39:58 2007
@@ -34,7 +34,7 @@
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.IoFilter.NextFilter;
@@ -113,7 +113,7 @@
return null;
}
- public TransportType getTransportType() {
+ public IoServiceMetadata getTransportType() {
return null;
}
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=565676&r1=565675&r2=565676
==============================================================================
--- 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:39:58 2007
@@ -34,7 +34,7 @@
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
import org.apache.mina.common.IoSessionLogger;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.IoFilter.NextFilter;
import org.easymock.AbstractMatcher;
@@ -364,7 +364,7 @@
return null;
}
- public TransportType getTransportType() {
+ public IoServiceMetadata getTransportType() {
return null;
}
}
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=565676&r1=565675&r2=565676
==============================================================================
--- 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:39:58 2007
@@ -43,7 +43,7 @@
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.IoFilter.NextFilter;
@@ -580,7 +580,7 @@
return null;
}
- public TransportType getTransportType() {
+ public IoServiceMetadata getTransportType() {
return null;
}
}
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=565676&r1=565675&r2=565676
==============================================================================
--- 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:39:58 2007
@@ -30,7 +30,7 @@
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
/**
* A test case for {@link ChainedIoHandler}.
@@ -67,7 +67,7 @@
return null;
}
- public TransportType getTransportType() {
+ public IoServiceMetadata getTransportType() {
return null;
}
Modified: mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java Tue Aug 14 02:39:58 2007
@@ -29,7 +29,7 @@
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
import org.apache.mina.util.AvailablePortFinder;
/**
@@ -44,7 +44,7 @@
protected IoAcceptor acceptor;
- protected TransportType transportType;
+ protected IoServiceMetadata transportType;
public AbstractTrafficControlTest(IoAcceptor acceptor) {
this.acceptor = acceptor;
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java?view=diff&rev=565676&r1=565675&r2=565676
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java Tue Aug 14 02:39:58 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.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
import org.apache.mina.filter.ssl.SSLFilter;
import org.apache.mina.transport.socket.nio.SocketSessionConfig;
import org.slf4j.Logger;
@@ -42,7 +42,7 @@
@Override
public void sessionCreated(IoSession session) {
- if (session.getTransportType() == TransportType.SOCKET) {
+ if (session.getTransportType() == IoServiceMetadata.SOCKET) {
((SocketSessionConfig) session.getConfig())
.setReceiveBufferSize(2048);
}
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=565676&r1=565675&r2=565676
==============================================================================
--- 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:39:58 2007
@@ -34,7 +34,7 @@
import org.apache.mina.common.DefaultConnectFuture;
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoServiceListenerSupport;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -120,7 +120,7 @@
"Serial port not found"));
}
- public TransportType getTransportType() {
+ public IoServiceMetadata getMetadata() {
return SerialSession.serialTransportType;
}
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=565676&r1=565675&r2=565676
==============================================================================
--- 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:39:58 2007
@@ -33,7 +33,7 @@
import org.apache.mina.common.AbstractIoSession;
import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.DefaultTransportType;
+import org.apache.mina.common.DefaultIoServiceMetadata;
import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
@@ -41,7 +41,7 @@
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
import org.apache.mina.common.IdleStatusChecker;
-import org.apache.mina.common.TransportType;
+import org.apache.mina.common.IoServiceMetadata;
import org.apache.mina.common.WriteRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -75,7 +75,7 @@
private final Logger log;
- public static final TransportType serialTransportType = new DefaultTransportType(
+ public static final IoServiceMetadata serialTransportType = new DefaultIoServiceMetadata(
"serial communication", false, SerialAddress.class,
ByteBuffer.class, SerialSessionConfig.class);
@@ -153,7 +153,7 @@
return service;
}
- public TransportType getTransportType() {
+ public IoServiceMetadata getTransportType() {
return serialTransportType;
}
Re: svn commit: r565676 - in /mina/trunk: core/src/main/java/org/apache/mina/common/ core/src/main/java/org/apache/mina/transport/socket/nio/ core/src/main/java/org/apache/mina/transport/socket/nio/support/ core/src/main/java/org/apache/mina/transport/vmpi...
Posted by peter royal <pr...@apache.org>.
On Aug 14, 2007, at 2:40 AM, trustin@apache.org wrote:
> Renamed TransportType to IoServiceMetadata because it stands what
> it does more precisely
This name seems odd to me.. I think of a 'service' as what I'm
providing.. and MINA makes my service available over various
transports (TCP,UDP,in-VM, etc)
I do agree about it being 'Metadata' vs 'Type' though.
How about TransportMetadata?
-pete
--
proyal@apache.org - http://fotap.org/~osi