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/22 03:14:22 UTC
svn commit: r568350 - in /mina/trunk:
core/src/main/java/org/apache/mina/common/
core/src/main/java/org/apache/mina/filter/logging/
core/src/main/java/org/apache/mina/transport/socket/nio/
core/src/main/java/org/apache/mina/transport/vmpipe/ core/src/t...
Author: trustin
Date: Tue Aug 21 18:14:20 2007
New Revision: 568350
URL: http://svn.apache.org/viewvc?rev=568350&view=rev
Log:
* Renamed IoServiceMetadata to TransportMetadata
* Added IoSession.getTransportMetadata
Added:
mina/trunk/core/src/main/java/org/apache/mina/common/TransportMetadata.java
- copied, changed from r568342, mina/trunk/core/src/main/java/org/apache/mina/common/IoServiceMetadata.java
Removed:
mina/trunk/core/src/main/java/org/apache/mina/common/IoServiceMetadata.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/AbstractIoSession.java
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoServiceMetadata.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/filter/logging/MdcLoggingFilter.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/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
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/VmPipeSessionImpl.java
mina/trunk/core/src/test/java/org/apache/mina/common/FutureTest.java
mina/trunk/core/src/test/java/org/apache/mina/common/IoFilterChainTest.java
mina/trunk/core/src/test/java/org/apache/mina/common/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/handler/chain/ChainedIoHandlerTest.java
mina/trunk/core/src/test/java/org/apache/mina/transport/AbstractTrafficControlTest.java
mina/trunk/core/src/test/java/org/apache/mina/util/DummySession.java
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.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?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- 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 21 18:14:20 2007
@@ -54,11 +54,11 @@
public void setLocalAddress(SocketAddress localAddress) {
if (localAddress != null
- && !getMetadata().getAddressType().isAssignableFrom(
+ && !getTransportMetadata().getAddressType().isAssignableFrom(
localAddress.getClass())) {
throw new IllegalArgumentException("localAddress type: "
+ localAddress.getClass() + " (expected: "
- + getMetadata().getAddressType() + ")");
+ + getTransportMetadata().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?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- 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 21 18:14:20 2007
@@ -62,19 +62,19 @@
throw new NullPointerException("remoteAddress");
}
- if (!getMetadata().getAddressType().isAssignableFrom(
+ if (!getTransportMetadata().getAddressType().isAssignableFrom(
remoteAddress.getClass())) {
throw new IllegalArgumentException("remoteAddress type: "
+ remoteAddress.getClass() + " (expected: "
- + getMetadata().getAddressType() + ")");
+ + getTransportMetadata().getAddressType() + ")");
}
if (localAddress != null
- && !getMetadata().getAddressType().isAssignableFrom(
+ && !getTransportMetadata().getAddressType().isAssignableFrom(
localAddress.getClass())) {
throw new IllegalArgumentException("localAddress type: "
+ localAddress.getClass() + " (expected: "
- + getMetadata().getAddressType() + ")");
+ + getTransportMetadata().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?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- 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 21 18:14:20 2007
@@ -54,11 +54,11 @@
throw new NullPointerException("sessionConfig");
}
- if (!getMetadata().getSessionConfigType().isAssignableFrom(
+ if (!getTransportMetadata().getSessionConfigType().isAssignableFrom(
sessionConfig.getClass())) {
throw new IllegalArgumentException("sessionConfig type: "
+ sessionConfig.getClass() + " (expected: "
- + getMetadata().getSessionConfigType() + ")");
+ + getTransportMetadata().getSessionConfigType() + ")");
}
this.listeners = new IoServiceListenerSupport(this);
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSession.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSession.java?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSession.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoSession.java Tue Aug 21 18:14:20 2007
@@ -505,10 +505,10 @@
return "null";
}
- if (getService().getMetadata() == null) {
+ if (getService().getTransportMetadata() == null) {
return "null";
}
- return getService().getMetadata().getName();
+ return getService().getTransportMetadata().getName();
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoServiceMetadata.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoServiceMetadata.java?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoServiceMetadata.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoServiceMetadata.java Tue Aug 21 18:14:20 2007
@@ -27,12 +27,12 @@
/**
- * A default immutable implementation of {@link IoServiceMetadata}.
+ * A default immutable implementation of {@link TransportMetadata}.
*
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public class DefaultIoServiceMetadata implements IoServiceMetadata {
+public class DefaultIoServiceMetadata implements TransportMetadata {
private final String name;
private final boolean connectionless;
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?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- 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 21 18:14:20 2007
@@ -115,7 +115,7 @@
return acceptor.isBound();
}
- public IoServiceMetadata getMetadata() {
- return acceptor.getMetadata();
+ public TransportMetadata getTransportMetadata() {
+ return acceptor.getTransportMetadata();
}
}
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?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- 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 21 18:14:20 2007
@@ -103,7 +103,7 @@
connector.setHandler(handler);
}
- public IoServiceMetadata getMetadata() {
- return connector.getMetadata();
+ public TransportMetadata getTransportMetadata() {
+ return connector.getTransportMetadata();
}
}
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?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- 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 21 18:14:20 2007
@@ -30,9 +30,9 @@
*/
public interface IoService {
/**
- * Returns the {@link IoServiceMetadata} that this service runs on.
+ * Returns the {@link TransportMetadata} that this service runs on.
*/
- IoServiceMetadata getMetadata();
+ TransportMetadata getTransportMetadata();
/**
* Adds an {@link IoServiceListener} that listens any events related with
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?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- 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 21 18:14:20 2007
@@ -73,6 +73,11 @@
* Returns the filter chain that only affects this session.
*/
IoFilterChain getFilterChain();
+
+ /**
+ * Returns the {@link TransportMetadata} that this session runs on.
+ */
+ TransportMetadata getTransportMetadata();
/**
* Writes the specified <code>message</code> to remote peer. This
Copied: mina/trunk/core/src/main/java/org/apache/mina/common/TransportMetadata.java (from r568342, mina/trunk/core/src/main/java/org/apache/mina/common/IoServiceMetadata.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/TransportMetadata.java?p2=mina/trunk/core/src/main/java/org/apache/mina/common/TransportMetadata.java&p1=mina/trunk/core/src/main/java/org/apache/mina/common/IoServiceMetadata.java&r1=568342&r2=568350&rev=568350&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoServiceMetadata.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/TransportMetadata.java Tue Aug 21 18:14:20 2007
@@ -28,7 +28,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public interface IoServiceMetadata {
+public interface TransportMetadata {
/**
* Returns the name of the service.
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcLoggingFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcLoggingFilter.java?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcLoggingFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcLoggingFilter.java Tue Aug 21 18:14:20 2007
@@ -57,7 +57,7 @@
context.put("IoHandlerClass", session.getHandler().getClass().toString());
context.put("remoteAddress", session.getRemoteAddress().toString());
context.put("localAddress", session.getLocalAddress().toString());
- if (session.getService().getMetadata().getAddressType() == InetSocketAddress.class) {
+ if (session.getTransportMetadata().getAddressType() == InetSocketAddress.class) {
InetSocketAddress remoteAddress = (InetSocketAddress) session.getRemoteAddress();
InetSocketAddress localAddress = (InetSocketAddress) session.getLocalAddress();
context.put("remoteIp", remoteAddress.getAddress().getHostAddress());
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramAcceptor.java?rev=568350&r1=568349&r2=568350&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/DatagramAcceptor.java Tue Aug 21 18:14:20 2007
@@ -37,7 +37,7 @@
import org.apache.mina.common.ExpiringIoSessionRecycler;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoServiceListenerSupport;
-import org.apache.mina.common.IoServiceMetadata;
+import org.apache.mina.common.TransportMetadata;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionRecycler;
import org.apache.mina.common.RuntimeIOException;
@@ -110,7 +110,7 @@
}
}
- public IoServiceMetadata getMetadata() {
+ public TransportMetadata getTransportMetadata() {
return DatagramSessionImpl.METADATA;
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/DatagramConnector.java?rev=568350&r1=568349&r2=568350&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/DatagramConnector.java Tue Aug 21 18:14:20 2007
@@ -37,7 +37,7 @@
import org.apache.mina.common.DefaultConnectFuture;
import org.apache.mina.common.ExceptionMonitor;
import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoServiceMetadata;
+import org.apache.mina.common.TransportMetadata;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.RuntimeIOException;
import org.apache.mina.common.WriteRequest;
@@ -101,7 +101,7 @@
}
}
- public IoServiceMetadata getMetadata() {
+ public TransportMetadata getTransportMetadata() {
return DatagramSessionImpl.METADATA;
}
Modified: 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/DatagramSessionImpl.java?rev=568350&r1=568349&r2=568350&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/DatagramSessionImpl.java Tue Aug 21 18:14:20 2007
@@ -34,7 +34,7 @@
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoService;
-import org.apache.mina.common.IoServiceMetadata;
+import org.apache.mina.common.TransportMetadata;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.RuntimeIOException;
import org.apache.mina.common.WriteFuture;
@@ -48,7 +48,7 @@
*/
class DatagramSessionImpl extends AbstractIoSession implements DatagramSession {
- static final IoServiceMetadata METADATA =
+ static final TransportMetadata METADATA =
new DefaultIoServiceMetadata(
"datagram", true, false,
InetSocketAddress.class,
@@ -137,6 +137,10 @@
public IoHandler getHandler() {
return handler;
+ }
+
+ public TransportMetadata getTransportMetadata() {
+ return METADATA;
}
@Override
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?rev=568350&r1=568349&r2=568350&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/SocketAcceptor.java Tue Aug 21 18:14:20 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.IoServiceMetadata;
+import org.apache.mina.common.TransportMetadata;
import org.apache.mina.util.NamePreservingRunnable;
import org.apache.mina.util.NewThreadExecutor;
@@ -167,9 +167,9 @@
}
/**
- * @see org.apache.mina.common.IoService#getMetadata()
+ * @see org.apache.mina.common.IoService#getTransportMetadata()
*/
- public IoServiceMetadata getMetadata() {
+ public TransportMetadata getTransportMetadata() {
return SocketSessionImpl.METADATA;
}
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?rev=568350&r1=568349&r2=568350&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/SocketConnector.java Tue Aug 21 18:14:20 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.IoServiceMetadata;
+import org.apache.mina.common.TransportMetadata;
import org.apache.mina.util.NamePreservingRunnable;
import org.apache.mina.util.NewThreadExecutor;
@@ -123,7 +123,7 @@
}
}
- public IoServiceMetadata getMetadata() {
+ public TransportMetadata getTransportMetadata() {
return SocketSessionImpl.METADATA;
}
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?rev=568350&r1=568349&r2=568350&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/SocketSessionImpl.java Tue Aug 21 18:14:20 2007
@@ -33,7 +33,7 @@
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoService;
-import org.apache.mina.common.IoServiceMetadata;
+import org.apache.mina.common.TransportMetadata;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.RuntimeIOException;
import org.apache.mina.common.WriteRequest;
@@ -46,7 +46,7 @@
*/
class SocketSessionImpl extends AbstractIoSession implements SocketSession {
- static final IoServiceMetadata METADATA =
+ static final TransportMetadata METADATA =
new DefaultIoServiceMetadata(
"socket", false, true,
InetSocketAddress.class,
@@ -99,6 +99,10 @@
public IoFilterChain getFilterChain() {
return filterChain;
+ }
+
+ public TransportMetadata getTransportMetadata() {
+ return METADATA;
}
SocketChannel getChannel() {
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?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- 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 21 18:14:20 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.IoServiceMetadata;
+import org.apache.mina.common.TransportMetadata;
/**
* Binds the specified {@link IoHandler} to the specified
@@ -46,7 +46,7 @@
super(new DefaultVmPipeSessionConfig());
}
- public IoServiceMetadata getMetadata() {
+ public TransportMetadata getTransportMetadata() {
return VmPipeSessionImpl.METADATA;
}
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?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- 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 21 18:14:20 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.IoServiceMetadata;
+import org.apache.mina.common.TransportMetadata;
/**
* Connects to {@link IoHandler}s which is bound on the specified
@@ -52,7 +52,7 @@
super(new DefaultVmPipeSessionConfig());
}
- public IoServiceMetadata getMetadata() {
+ public TransportMetadata getTransportMetadata() {
return VmPipeSessionImpl.METADATA;
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSessionImpl.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSessionImpl.java?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSessionImpl.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSessionImpl.java Tue Aug 21 18:14:20 2007
@@ -30,7 +30,7 @@
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoServiceListenerSupport;
-import org.apache.mina.common.IoServiceMetadata;
+import org.apache.mina.common.TransportMetadata;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.WriteRequest;
@@ -42,7 +42,7 @@
*/
class VmPipeSessionImpl extends AbstractIoSession implements VmPipeSession {
- static final IoServiceMetadata METADATA =
+ static final TransportMetadata METADATA =
new DefaultIoServiceMetadata(
"vmpipe", false, false,
VmPipeAddress.class,
@@ -126,6 +126,10 @@
public IoHandler getHandler() {
return handler;
+ }
+
+ public TransportMetadata getTransportMetadata() {
+ return METADATA;
}
@Override
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/FutureTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/FutureTest.java?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/FutureTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/FutureTest.java Tue Aug 21 18:14:20 2007
@@ -104,6 +104,10 @@
public int getScheduledWriteBytes() {
return 0;
}
+
+ public TransportMetadata getTransportMetadata() {
+ return null;
+ }
};
future.setSession(session);
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?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- 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 21 18:14:20 2007
@@ -288,6 +288,10 @@
public int getScheduledWriteBytes() {
return 0;
}
+
+ public TransportMetadata getTransportMetadata() {
+ return null;
+ }
}
private class EventOrderTestFilter extends IoFilterAdapter {
@@ -413,6 +417,10 @@
public int getScheduledWriteBytes() {
return 0;
+ }
+
+ public TransportMetadata getTransportMetadata() {
+ return null;
}
});
}
Modified: mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/common/IoServiceListenerSupportTest.java Tue Aug 21 18:14:20 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.IoServiceMetadata;
+import org.apache.mina.common.TransportMetadata;
import org.easymock.MockControl;
/**
@@ -324,13 +324,17 @@
return serviceAddress;
}
- public IoServiceMetadata getTransportType() {
+ public TransportMetadata getTransportType() {
return null;
}
@Override
public String toString() {
return String.valueOf(serviceAddress);
+ }
+
+ public TransportMetadata getTransportMetadata() {
+ 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?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- 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 21 18:14:20 2007
@@ -34,6 +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.TransportMetadata;
/**
* Tests {@link CumulativeProtocolDecoder}.
@@ -222,6 +223,10 @@
public int getScheduledWriteBytes() {
return 0;
+ }
+
+ public TransportMetadata getTransportMetadata() {
+ return null;
}
}
}
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?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- 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 21 18:14:20 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.IoServiceMetadata;
+import org.apache.mina.common.TransportMetadata;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
@@ -137,7 +137,11 @@
return null;
}
- public IoServiceMetadata getTransportType() {
+ public TransportMetadata getTransportType() {
+ return null;
+ }
+
+ public TransportMetadata getTransportMetadata() {
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?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- 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 21 18:14:20 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.IoServiceMetadata;
+import org.apache.mina.common.TransportMetadata;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
/**
@@ -272,7 +272,7 @@
return null;
}
- public IoServiceMetadata getTransportType() {
+ public TransportMetadata getTransportType() {
return null;
}
@@ -299,6 +299,10 @@
public int getScheduledWriteBytes() {
return 0;
+ }
+
+ public TransportMetadata getTransportMetadata() {
+ 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?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- 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 21 18:14:20 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.IoServiceMetadata;
+import org.apache.mina.common.TransportMetadata;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.filter.codec.AbstractProtocolEncoderOutput;
@@ -86,7 +86,7 @@
return null;
}
- public IoServiceMetadata getTransportType() {
+ public TransportMetadata getTransportType() {
return null;
}
@@ -113,6 +113,10 @@
public int getScheduledWriteBytes() {
return 0;
+ }
+
+ public TransportMetadata getTransportMetadata() {
+ 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?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- 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 21 18:14:20 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.IoServiceMetadata;
+import org.apache.mina.common.TransportMetadata;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.IoFilter.NextFilter;
@@ -113,7 +113,7 @@
return null;
}
- public IoServiceMetadata getTransportType() {
+ public TransportMetadata getTransportType() {
return null;
}
@@ -153,6 +153,10 @@
public int getScheduledWriteBytes() {
return 0;
+ }
+
+ public TransportMetadata getTransportMetadata() {
+ 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?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- 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 21 18:14:20 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.IoServiceMetadata;
+import org.apache.mina.common.TransportMetadata;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.IoFilter.NextFilter;
import org.easymock.AbstractMatcher;
@@ -364,7 +364,11 @@
return null;
}
- public IoServiceMetadata getTransportType() {
+ public TransportMetadata getTransportType() {
+ return null;
+ }
+
+ public TransportMetadata getTransportMetadata() {
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?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- 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 21 18:14:20 2007
@@ -30,6 +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.TransportMetadata;
/**
* A test case for {@link ChainedIoHandler}.
@@ -89,6 +90,10 @@
public int getScheduledWriteBytes() {
return 0;
+ }
+
+ public TransportMetadata getTransportMetadata() {
+ return null;
}
}, 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?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- 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 21 18:14:20 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.IoServiceMetadata;
+import org.apache.mina.common.TransportMetadata;
import org.apache.mina.util.AvailablePortFinder;
/**
@@ -44,7 +44,7 @@
protected IoAcceptor acceptor;
- protected IoServiceMetadata transportType;
+ protected TransportMetadata transportType;
public AbstractTrafficControlTest(IoAcceptor acceptor) {
this.acceptor = acceptor;
Modified: mina/trunk/core/src/test/java/org/apache/mina/util/DummySession.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/util/DummySession.java?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/util/DummySession.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/util/DummySession.java Tue Aug 21 18:14:20 2007
@@ -48,7 +48,7 @@
return null;
}
- public IoServiceMetadata getTransportType() {
+ public TransportMetadata getTransportMetadata() {
return null;
}
}
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=568350&r1=568349&r2=568350&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 Tue Aug 21 18:14:20 2007
@@ -178,7 +178,7 @@
writeFuture = session.write(buf);
- if (session.getService().getMetadata().isConnectionless()) {
+ if (session.getService().getTransportMetadata().isConnectionless()) {
// This will align message arrival order in connectionless transport types
waitForResponse(handler, (i + 1) * DATA_SIZE);
}
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?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- 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 21 18:14:20 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.IoServiceMetadata;
+import org.apache.mina.common.TransportMetadata;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -120,7 +120,7 @@
"Serial port not found"));
}
- public IoServiceMetadata getMetadata() {
+ public TransportMetadata getTransportMetadata() {
return SerialSession.METADATA;
}
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?rev=568350&r1=568349&r2=568350&view=diff
==============================================================================
--- 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 21 18:14:20 2007
@@ -39,7 +39,7 @@
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoService;
-import org.apache.mina.common.IoServiceMetadata;
+import org.apache.mina.common.TransportMetadata;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
import org.apache.mina.common.WriteRequest;
@@ -75,7 +75,7 @@
private final Logger log;
- static final IoServiceMetadata METADATA =
+ static final TransportMetadata METADATA =
new DefaultIoServiceMetadata(
"serial", false, true, SerialAddress.class,
SerialSessionConfig.class, ByteBuffer.class);
@@ -106,6 +106,10 @@
public IoHandler getHandler() {
return ioHandler;
+ }
+
+ public TransportMetadata getTransportMetadata() {
+ return METADATA;
}
public SocketAddress getLocalAddress() {