Author: jvermillard
Date: Mon May 21 19:10:46 2012
New Revision: 1341157
URL: http://svn.apache.org/viewvc?rev=1341157&view=rev
Log:
Renaming :
Socket => Tcp
Datagram => Udp
Added:
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/DefaultTcpSessionConfig.java
(contents, props changed)
- copied, changed from r1341137,
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/DefaultSocketSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/ProxyTcpSessionConfig.java
(contents, props changed)
- copied, changed from r1341137,
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/ProxySocketSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/TcpSessionConfig.java
(contents, props changed)
- copied, changed from r1341137,
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/SocketSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/transport/udp/UdpSessionConfig.java
(with props)
Removed:
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/DefaultSocketSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/ProxySocketSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/SocketSessionConfig.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/nio/NioTcpServer.java
mina/trunk/core/src/test/java/org/apache/mina/transport/tcp/ProxySocketSessionConfigTest.java
Copied:
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/DefaultTcpSessionConfig.java
(from r1341137,
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/DefaultSocketSessionConfig.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/DefaultTcpSessionConfig.java?p2=mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/DefaultTcpSessionConfig.java&p1=mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/DefaultSocketSessionConfig.java&r1=1341137&r2=1341157&rev=1341157&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/DefaultSocketSessionConfig.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/DefaultTcpSessionConfig.java
Mon May 21 19:10:46 2012
@@ -29,7 +29,7 @@ import org.apache.mina.session.AbstractI
*
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
*/
-public class DefaultSocketSessionConfig extends AbstractIoSessionConfig
implements SocketSessionConfig {
+public class DefaultTcpSessionConfig extends AbstractIoSessionConfig
implements TcpSessionConfig {
/** The SSLContext instance */
private SSLContext sslContext;
Propchange:
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/DefaultTcpSessionConfig.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java?rev=1341157&r1=1341156&r2=1341157&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
Mon May 21 19:10:46 2012
@@ -182,7 +182,7 @@ public class NioSelectorProcessor implem
public void createSession(final IoService service, final Object
clientSocket) throws SSLException {
LOGGER.debug("create session");
final SocketChannel socketChannel = (SocketChannel) clientSocket;
- final SocketSessionConfig config = (SocketSessionConfig)
service.getSessionConfig();
+ final TcpSessionConfig config = (TcpSessionConfig)
service.getSessionConfig();
final NioTcpSession session = new NioTcpSession(service, socketChannel,
this.strategy.getSelectorForNewSession(this));
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java?rev=1341157&r1=1341156&r2=1341157&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java
Mon May 21 19:10:46 2012
@@ -50,7 +50,7 @@ public class NioTcpSession extends Abstr
private SocketChannel channel;
/** the socket configuration */
- private final SocketSessionConfig configuration;
+ private final TcpSessionConfig configuration;
// this session requested to close
private volatile boolean closeRequested = false;
@@ -71,7 +71,7 @@ public class NioTcpSession extends Abstr
NioTcpSession(IoService service, SocketChannel channel, SelectorProcessor
writeProcessor) {
super(service, writeProcessor);
this.channel = channel;
- this.configuration = new ProxySocketSessionConfig(channel.socket());
+ this.configuration = new ProxyTcpSessionConfig(channel.socket());
}
/**
@@ -212,7 +212,7 @@ public class NioTcpSession extends Abstr
* {@inheritDoc}
*/
@Override
- public SocketSessionConfig getConfig() {
+ public TcpSessionConfig getConfig() {
return configuration;
}
Copied:
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/ProxyTcpSessionConfig.java
(from r1341137,
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/ProxySocketSessionConfig.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/ProxyTcpSessionConfig.java?p2=mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/ProxyTcpSessionConfig.java&p1=mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/ProxySocketSessionConfig.java&r1=1341137&r2=1341157&rev=1341157&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/ProxySocketSessionConfig.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/ProxyTcpSessionConfig.java
Mon May 21 19:10:46 2012
@@ -33,13 +33,13 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
*/
-public class ProxySocketSessionConfig implements SocketSessionConfig {
+public class ProxyTcpSessionConfig implements TcpSessionConfig {
- private static final Logger LOG =
LoggerFactory.getLogger(ProxySocketSessionConfig.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(ProxyTcpSessionConfig.class);
private final Socket socket;
- public ProxySocketSessionConfig(Socket socket) {
+ public ProxyTcpSessionConfig(Socket socket) {
this.socket = socket;
}
Propchange:
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/ProxyTcpSessionConfig.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/TcpSessionConfig.java
(from r1341137,
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/SocketSessionConfig.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/TcpSessionConfig.java?p2=mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/TcpSessionConfig.java&p1=mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/SocketSessionConfig.java&r1=1341137&r2=1341157&rev=1341157&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/SocketSessionConfig.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/TcpSessionConfig.java
Mon May 21 19:10:46 2012
@@ -25,11 +25,11 @@ import javax.net.ssl.SSLContext;
import org.apache.mina.api.IoSessionConfig;
/**
- * A {@link IoSessionConfig} for socket based transports.
+ * A {@link IoSessionConfig} for socket based sessions.
*
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
*/
-public interface SocketSessionConfig extends IoSessionConfig {
+public interface TcpSessionConfig extends IoSessionConfig {
/**
* @see Socket#getTcpNoDelay()
*/
Propchange:
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/TcpSessionConfig.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/nio/NioTcpServer.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/nio/NioTcpServer.java?rev=1341157&r1=1341156&r2=1341157&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/nio/NioTcpServer.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/tcp/nio/NioTcpServer.java
Mon May 21 19:10:46 2012
@@ -27,9 +27,9 @@ import java.util.Set;
import org.apache.mina.service.SelectorStrategy;
import org.apache.mina.transport.tcp.AbstractTcpServer;
-import org.apache.mina.transport.tcp.DefaultSocketSessionConfig;
+import org.apache.mina.transport.tcp.DefaultTcpSessionConfig;
import org.apache.mina.transport.tcp.NioSelectorProcessor;
-import org.apache.mina.transport.tcp.SocketSessionConfig;
+import org.apache.mina.transport.tcp.TcpSessionConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,25 +47,25 @@ public class NioTcpServer extends Abstra
// the strategy for dispatching servers and client to selector threads.
private final SelectorStrategy strategy;
- private SocketSessionConfig config;
+ private TcpSessionConfig config;
private boolean reuseAddress = false;
public NioTcpServer(final SelectorStrategy strategy) {
super();
this.strategy = strategy;
- this.config = new DefaultSocketSessionConfig();
+ this.config = new DefaultTcpSessionConfig();
}
/**
* {@inheritDoc}
*/
@Override
- public SocketSessionConfig getSessionConfig() {
+ public TcpSessionConfig getSessionConfig() {
return this.config;
}
- public void setSessionConfig(final SocketSessionConfig config) {
+ public void setSessionConfig(final TcpSessionConfig config) {
this.config = config;
}
Added:
mina/trunk/core/src/main/java/org/apache/mina/transport/udp/UdpSessionConfig.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/udp/UdpSessionConfig.java?rev=1341157&view=auto
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/udp/UdpSessionConfig.java
(added)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/udp/UdpSessionConfig.java
Mon May 21 19:10:46 2012
@@ -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.udp;
+
+import org.apache.mina.api.IoSessionConfig;
+
+/**
+ * A {@link IoSessionConfig} for UDP based sessions.
+ *
+ * @author <a href="http://mina.apache.org";>Apache MINA Project</a>
+ */
+public interface UdpSessionConfig extends IoSessionConfig{
+
+}
Propchange:
mina/trunk/core/src/main/java/org/apache/mina/transport/udp/UdpSessionConfig.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
mina/trunk/core/src/test/java/org/apache/mina/transport/tcp/ProxySocketSessionConfigTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/transport/tcp/ProxySocketSessionConfigTest.java?rev=1341157&r1=1341156&r2=1341157&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/transport/tcp/ProxySocketSessionConfigTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/transport/tcp/ProxySocketSessionConfigTest.java
Mon May 21 19:10:46 2012
@@ -32,20 +32,20 @@ import org.junit.Test;
import org.mockito.Mockito;
/**
- * Unit test for {@link ProxySocketSessionConfig}
+ * Unit test for {@link ProxyTcpSessionConfig}
*
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
*/
public class ProxySocketSessionConfigTest {
- private ProxySocketSessionConfig config;
+ private ProxyTcpSessionConfig config;
private Socket socket;
@Before
public void setup() throws Exception {
socket = Mockito.mock(Socket.class);
- config = new ProxySocketSessionConfig(socket);
+ config = new ProxyTcpSessionConfig(socket);
}
@Test
