You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2008/06/17 19:15:31 UTC
svn commit: r668752 - in
/mina/trunk/core/src/main/java/org/apache/mina/transport/socket:
DatagramAcceptor.java DatagramConnector.java DatagramService.java
DefaultSocketSessionConfig.java SocketAcceptor.java SocketConnector.java
SocketService.java
Author: elecharny
Date: Tue Jun 17 10:15:31 2008
New Revision: 668752
URL: http://svn.apache.org/viewvc?rev=668752&view=rev
Log:
o Removed the DatagramService and SocketService interfaces as they are useless. The getSessionConfig method already exists in the IoService interface
o Modified the classes which implemented those two interfaces accordingly
Removed:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DatagramService.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/SocketService.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DatagramAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DatagramConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DefaultSocketSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/SocketAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/SocketConnector.java
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DatagramAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DatagramAcceptor.java?rev=668752&r1=668751&r2=668752&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DatagramAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DatagramAcceptor.java Tue Jun 17 10:15:31 2008
@@ -30,7 +30,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public interface DatagramAcceptor extends DatagramService, IoAcceptor {
+public interface DatagramAcceptor extends IoAcceptor {
InetSocketAddress getLocalAddress();
InetSocketAddress getDefaultLocalAddress();
void setDefaultLocalAddress(InetSocketAddress localAddress);
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DatagramConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DatagramConnector.java?rev=668752&r1=668751&r2=668752&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DatagramConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DatagramConnector.java Tue Jun 17 10:15:31 2008
@@ -29,7 +29,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public interface DatagramConnector extends DatagramService, IoConnector {
+public interface DatagramConnector extends IoConnector {
InetSocketAddress getDefaultRemoteAddress();
void setDefaultRemoteAddress(InetSocketAddress remoteAddress);
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DefaultSocketSessionConfig.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DefaultSocketSessionConfig.java?rev=668752&r1=668751&r2=668752&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DefaultSocketSessionConfig.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DefaultSocketSessionConfig.java Tue Jun 17 10:15:31 2008
@@ -31,6 +31,7 @@
import java.util.Map.Entry;
import org.apache.mina.common.ExceptionMonitor;
+import org.apache.mina.common.IoService;
/**
* A default implementation of {@link SocketSessionConfig}.
@@ -209,7 +210,7 @@
return SET_TRAFFIC_CLASS_AVAILABLE;
}
- private SocketService parent;
+ private IoService parent;
private boolean defaultReuseAddress;
private int defaultReceiveBufferSize = DEFAULT_RECEIVE_BUFFER_SIZE;
@@ -228,7 +229,7 @@
public DefaultSocketSessionConfig() {
}
- public void init(SocketService parent) {
+ public void init(IoService parent) {
this.parent = parent;
if (parent instanceof SocketAcceptor) {
defaultReuseAddress = true;
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/SocketAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/SocketAcceptor.java?rev=668752&r1=668751&r2=668752&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/SocketAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/SocketAcceptor.java Tue Jun 17 10:15:31 2008
@@ -31,7 +31,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public interface SocketAcceptor extends SocketService, IoAcceptor {
+public interface SocketAcceptor extends IoAcceptor {
InetSocketAddress getLocalAddress();
InetSocketAddress getDefaultLocalAddress();
void setDefaultLocalAddress(InetSocketAddress localAddress);
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/SocketConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/SocketConnector.java?rev=668752&r1=668751&r2=668752&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/SocketConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/SocketConnector.java Tue Jun 17 10:15:31 2008
@@ -22,6 +22,7 @@
import java.net.InetSocketAddress;
import org.apache.mina.common.IoConnector;
+import org.apache.mina.common.IoService;
/**
* {@link IoConnector} for socket transport (TCP/IP).
@@ -29,7 +30,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public interface SocketConnector extends SocketService, IoConnector {
+public interface SocketConnector extends IoConnector {
InetSocketAddress getDefaultRemoteAddress();
void setDefaultRemoteAddress(InetSocketAddress remoteAddress);
}
\ No newline at end of file