Author: elecharny
Date: Thu Oct 25 09:59:31 2012
New Revision: 1402077
URL: http://svn.apache.org/viewvc?rev=1402077&view=rev
Log:
Reestablished some methods I removed from some interface : they were
potentially used, so it would have broken the API compatibility.
Modified:
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/DatagramAcceptor.java
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/DatagramConnector.java
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/SocketAcceptor.java
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/SocketConnector.java
Modified:
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/DatagramAcceptor.java
URL:
http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/DatagramAcceptor.java?rev=1402077&r1=1402076&r2=1402077&view=diff
==============================================================================
---
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/DatagramAcceptor.java
(original)
+++
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/DatagramAcceptor.java
Thu Oct 25 09:59:31 2012
@@ -19,6 +19,9 @@
*/
package org.apache.mina.transport.socket;
+import java.net.InetSocketAddress;
+import java.util.Set;
+
import org.apache.mina.core.service.IoAcceptor;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.core.session.IoSessionRecycler;
@@ -30,6 +33,28 @@ import org.apache.mina.core.session.IoSe
*/
public interface DatagramAcceptor extends IoAcceptor {
/**
+ * Returns the local InetSocketAddress which is bound currently. If more
than one
+ * address are bound, only one of them will be returned, but it's not
+ * necessarily the firstly bound address.
+ * This method overrides the {@link IoAcceptor#getLocalAddress()} method.
+ */
+ InetSocketAddress getLocalAddress();
+
+ /**
+ * Returns a {@link Set} of the local InetSocketAddress which are bound
currently.
+ * This method overrides the {@link IoAcceptor#getDefaultLocalAddress()}
method.
+ */
+ InetSocketAddress getDefaultLocalAddress();
+
+ /**
+ * Sets the default local InetSocketAddress to bind when no argument is
specified in
+ * {@link #bind()} method. Please note that the default will not be used
+ * if any local InetSocketAddress is specified.
+ * This method overrides the {@link IoAcceptor#setDefaultLocalAddress()}
method.
+ */
+ void setDefaultLocalAddress(InetSocketAddress localAddress);
+
+ /**
* Returns the {@link IoSessionRecycler} for this service.
*/
IoSessionRecycler getSessionRecycler();
Modified:
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/DatagramConnector.java
URL:
http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/DatagramConnector.java?rev=1402077&r1=1402076&r2=1402077&view=diff
==============================================================================
---
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/DatagramConnector.java
(original)
+++
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/DatagramConnector.java
Thu Oct 25 09:59:31 2012
@@ -19,6 +19,8 @@
*/
package org.apache.mina.transport.socket;
+import java.net.InetSocketAddress;
+
import org.apache.mina.core.service.IoConnector;
/**
@@ -28,8 +30,22 @@ import org.apache.mina.core.service.IoCo
*/
public interface DatagramConnector extends IoConnector {
/**
+ * Returns the default remote InetSocketAddress to connect to when no
argument
+ * is specified in {@link #connect()} method.
+ * This method overrides the {@link IoConnector#getDefaultRemoteAddress()}
method.
+ */
+ InetSocketAddress getDefaultRemoteAddress();
+
+ /**
* Returns the default configuration of the new FatagramSessions created
by
* this connect service.
*/
DatagramSessionConfig getSessionConfig();
+
+ /**
+ * Sets the default remote InetSocketAddress to connect to when no
argument is
+ * specified in {@link #connect()} method.
+ * This method overrides the {@link IoConnector#setDefaultRemoteAddress()}
method.
+ */
+ void setDefaultRemoteAddress(InetSocketAddress remoteAddress);
}
Modified:
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/SocketAcceptor.java
URL:
http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/SocketAcceptor.java?rev=1402077&r1=1402076&r2=1402077&view=diff
==============================================================================
---
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/SocketAcceptor.java
(original)
+++
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/SocketAcceptor.java
Thu Oct 25 09:59:31 2012
@@ -19,7 +19,9 @@
*/
package org.apache.mina.transport.socket;
+import java.net.InetSocketAddress;
import java.net.ServerSocket;
+import java.util.Set;
import org.apache.mina.core.service.IoAcceptor;
@@ -31,6 +33,28 @@ import org.apache.mina.core.service.IoAc
*/
public interface SocketAcceptor extends IoAcceptor {
/**
+ * Returns the local InetSocketAddress which is bound currently. If more
than one
+ * address are bound, only one of them will be returned, but it's not
+ * necessarily the firstly bound address.
+ * This method overrides the {@link IoAcceptor#getLocalAddress()} method.
+ */
+ InetSocketAddress getLocalAddress();
+
+ /**
+ * Returns a {@link Set} of the local InetSocketAddress which are bound
currently.
+ * This method overrides the {@link IoAcceptor#getDefaultLocalAddress()}
method.
+ */
+ InetSocketAddress getDefaultLocalAddress();
+
+ /**
+ * Sets the default local InetSocketAddress to bind when no argument is
specified in
+ * {@link #bind()} method. Please note that the default will not be used
+ * if any local InetSocketAddress is specified.
+ * This method overrides the {@link IoAcceptor#setDefaultLocalAddress()}
method.
+ */
+ void setDefaultLocalAddress(InetSocketAddress localAddress);
+
+ /**
* @see ServerSocket#getReuseAddress()
*/
public boolean isReuseAddress();
Modified:
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/SocketConnector.java
URL:
http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/SocketConnector.java?rev=1402077&r1=1402076&r2=1402077&view=diff
==============================================================================
---
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/SocketConnector.java
(original)
+++
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/socket/SocketConnector.java
Thu Oct 25 09:59:31 2012
@@ -19,6 +19,8 @@
*/
package org.apache.mina.transport.socket;
+import java.net.InetSocketAddress;
+
import org.apache.mina.core.service.IoConnector;
/**
@@ -28,8 +30,22 @@ import org.apache.mina.core.service.IoCo
*/
public interface SocketConnector extends IoConnector {
/**
+ * Returns the default remote InetSocketAddress to connect to when no
argument
+ * is specified in {@link #connect()} method.
+ * This method overrides the {@link IoConnector#getDefaultRemoteAddress()}
method.
+ */
+ InetSocketAddress getDefaultRemoteAddress();
+
+ /**
* Returns the default configuration of the new SocketSessions created by
* this connect service.
*/
SocketSessionConfig getSessionConfig();
+
+ /**
+ * Sets the default remote InetSocketAddress to connect to when no
argument is
+ * specified in {@link #connect()} method.
+ * This method overrides the {@link IoConnector#setDefaultRemoteAddress()}
method.
+ */
+ void setDefaultRemoteAddress(InetSocketAddress remoteAddress);
}
\ No newline at end of file
