You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ad...@apache.org on 2011/07/05 20:37:54 UTC
svn commit: r1143164 - in /mina/branches/3.0/core/src:
main/java/org/apache/mina/ main/java/org/apache/mina/api/
main/java/org/apache/mina/filterchain/ main/java/org/apache/mina/service/
main/java/org/apache/mina/service/client/ main/java/org/apache/mi...
Author: adc
Date: Tue Jul 5 18:37:52 2011
New Revision: 1143164
URL: http://svn.apache.org/viewvc?rev=1143164&view=rev
Log:
Created API package
Added:
mina/branches/3.0/core/src/main/java/org/apache/mina/api/
mina/branches/3.0/core/src/main/java/org/apache/mina/api/IdleStatus.java
- copied, changed from r1143111, mina/branches/3.0/core/src/main/java/org/apache/mina/IdleStatus.java
mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoClient.java
- copied, changed from r1143132, mina/branches/3.0/core/src/main/java/org/apache/mina/IoClient.java
mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFilter.java (contents, props changed)
- copied, changed from r1143111, mina/branches/3.0/core/src/main/java/org/apache/mina/IoFilter.java
mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFilterChain.java (contents, props changed)
- copied, changed from r1143111, mina/branches/3.0/core/src/main/java/org/apache/mina/IoFilterChain.java
mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFuture.java
- copied, changed from r1143132, mina/branches/3.0/core/src/main/java/org/apache/mina/IoFuture.java
mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFutureListener.java
- copied, changed from r1143132, mina/branches/3.0/core/src/main/java/org/apache/mina/IoFutureListener.java
mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoServer.java (contents, props changed)
- copied, changed from r1143111, mina/branches/3.0/core/src/main/java/org/apache/mina/IoServer.java
mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoService.java (contents, props changed)
- copied, changed from r1143111, mina/branches/3.0/core/src/main/java/org/apache/mina/IoService.java
mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoServiceListener.java
- copied, changed from r1143111, mina/branches/3.0/core/src/main/java/org/apache/mina/IoServiceListener.java
mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoSession.java
- copied, changed from r1143132, mina/branches/3.0/core/src/main/java/org/apache/mina/IoSession.java
mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoSessionConfig.java (contents, props changed)
- copied, changed from r1143111, mina/branches/3.0/core/src/main/java/org/apache/mina/IoSessionConfig.java
Removed:
mina/branches/3.0/core/src/main/java/org/apache/mina/IdleStatus.java
mina/branches/3.0/core/src/main/java/org/apache/mina/IoClient.java
mina/branches/3.0/core/src/main/java/org/apache/mina/IoFilter.java
mina/branches/3.0/core/src/main/java/org/apache/mina/IoFilterChain.java
mina/branches/3.0/core/src/main/java/org/apache/mina/IoFuture.java
mina/branches/3.0/core/src/main/java/org/apache/mina/IoFutureListener.java
mina/branches/3.0/core/src/main/java/org/apache/mina/IoServer.java
mina/branches/3.0/core/src/main/java/org/apache/mina/IoService.java
mina/branches/3.0/core/src/main/java/org/apache/mina/IoServiceListener.java
mina/branches/3.0/core/src/main/java/org/apache/mina/IoSession.java
mina/branches/3.0/core/src/main/java/org/apache/mina/IoSessionConfig.java
Modified:
mina/branches/3.0/core/src/main/java/org/apache/mina/filterchain/DefaultIoFilterChain.java
mina/branches/3.0/core/src/main/java/org/apache/mina/service/AbstractIoService.java
mina/branches/3.0/core/src/main/java/org/apache/mina/service/IoHandler.java
mina/branches/3.0/core/src/main/java/org/apache/mina/service/OneThreadSelectorStrategy.java
mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorProcessor.java
mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorStrategy.java
mina/branches/3.0/core/src/main/java/org/apache/mina/service/client/AbstractIoClient.java
mina/branches/3.0/core/src/main/java/org/apache/mina/service/server/AbstractIoServer.java
mina/branches/3.0/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
mina/branches/3.0/core/src/main/java/org/apache/mina/session/DefaultWriteQueue.java
mina/branches/3.0/core/src/main/java/org/apache/mina/session/WriteRequest.java
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java
mina/branches/3.0/core/src/test/java/filterchain/DefaultIoFilterChainTest.java
mina/branches/3.0/core/src/test/java/org/apache/mina/session/AbstractIoSessionTest.java
mina/branches/3.0/core/src/test/java/org/apache/mina/transport/socket/nio/NioAcceptorTest.java
Copied: mina/branches/3.0/core/src/main/java/org/apache/mina/api/IdleStatus.java (from r1143111, mina/branches/3.0/core/src/main/java/org/apache/mina/IdleStatus.java)
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/api/IdleStatus.java?p2=mina/branches/3.0/core/src/main/java/org/apache/mina/api/IdleStatus.java&p1=mina/branches/3.0/core/src/main/java/org/apache/mina/IdleStatus.java&r1=1143111&r2=1143164&rev=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/IdleStatus.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/api/IdleStatus.java Tue Jul 5 18:37:52 2011
@@ -17,20 +17,20 @@
* under the License.
*
*/
-package org.apache.mina;
+package org.apache.mina.api;
import java.security.InvalidParameterException;
/**
- * Represents the type of idleness of {@link IoSession}.
- * There are three types of idleness:
+ * Represents the type of idleness of {@link IoSession}.
+ * There are three types of idleness:
* <ul>
- * <li>{@link #READ_IDLE} - No data is coming from the remote peer.</li>
- * <li>{@link #WRITE_IDLE} - Session is not writing any data.</li>
- * <li>{@link #READ_WRITE_IDLE} - Both {@link #READ_IDLE} and {@link #WRITE_IDLE}.</li>
+ * <li>{@link #READ_IDLE} - No data is coming from the remote peer.</li>
+ * <li>{@link #WRITE_IDLE} - Session is not writing any data.</li>
+ * <li>{@link #READ_WRITE_IDLE} - Both {@link #READ_IDLE} and {@link #WRITE_IDLE}.</li>
* </ul>
- * <p>
+ *
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
public enum IdleStatus {
@@ -44,14 +44,14 @@ public enum IdleStatus {
@Override
public String toString() {
switch (this) {
- case READ_IDLE:
- return "read idle";
- case WRITE_IDLE:
- return "write idle";
- case READ_WRITE_IDLE:
- return "both idle";
- default:
- throw new InvalidParameterException("unknown IdleStatus");
+ case READ_IDLE:
+ return "read idle";
+ case WRITE_IDLE:
+ return "write idle";
+ case READ_WRITE_IDLE:
+ return "both idle";
+ default:
+ throw new InvalidParameterException("unknown IdleStatus");
}
}
}
\ No newline at end of file
Copied: mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoClient.java (from r1143132, mina/branches/3.0/core/src/main/java/org/apache/mina/IoClient.java)
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoClient.java?p2=mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoClient.java&p1=mina/branches/3.0/core/src/main/java/org/apache/mina/IoClient.java&r1=1143132&r2=1143164&rev=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/IoClient.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoClient.java Tue Jul 5 18:37:52 2011
@@ -17,15 +17,15 @@
* under the License.
*
*/
-package org.apache.mina;
+package org.apache.mina.api;
import java.net.SocketAddress;
/**
* Connects to endpoint, communicates with the server, and fires events to
* {@link IoHandler}s.
- *
- *
+ *
+ *
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
public interface IoClient extends IoService {
@@ -46,7 +46,7 @@ public interface IoClient extends IoServ
* Connects to the specified remote address.
*
* @param remoteAddress Remote {@link SocketAddress} to connect
- *
+ *
* @return the {@link IoFuture} instance which is completed when the
* connection attempt initiated by this call succeeds or fails.
*/
@@ -59,7 +59,7 @@ public interface IoClient extends IoServ
* @param remoteAddress Remote {@link SocketAddress} to connect
* @param localAddress Local {@link SocketAddress} to use while initiating connection to
* remote {@link SocketAddress}
- *
+ *
* @return the {@link IoFuture} instance which is completed when the
* connection attempt initiated by this call succeeds or fails.
*/
Copied: mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFilter.java (from r1143111, mina/branches/3.0/core/src/main/java/org/apache/mina/IoFilter.java)
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFilter.java?p2=mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFilter.java&p1=mina/branches/3.0/core/src/main/java/org/apache/mina/IoFilter.java&r1=1143111&r2=1143164&rev=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/IoFilter.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFilter.java Tue Jul 5 18:37:52 2011
@@ -18,11 +18,11 @@
*
*/
-package org.apache.mina;
+package org.apache.mina.api;
/**
* Filter are interceptors/processors for incoming data received/sent.
- *
+ *
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
public interface IoFilter {
@@ -33,16 +33,16 @@ public interface IoFilter {
* be called from the same thread that handles I/O of multiple sessions, please implement this method to perform
* tasks that consumes minimal amount of time such as socket parameter and user-defined session attribute
* initialization.
- *
+ *
* @param session {@link IoSession} associated with the invocation
- *
+ *
* @throws Exception Exception If an error occurs while processing
*/
void sessionCreated(IoSession session) throws Exception;
/**
* Invoked when a connection has been opened.
- *
+ *
* @param session {@link IoSession} associated with the invocation
* @throws Exception Exception If an error occurs while processing
*/
@@ -50,7 +50,7 @@ public interface IoFilter {
/**
* Invoked when a connection is closed.
- *
+ *
* @param session {@link IoSession} associated with the invocation
* @throws Exception Exception If an error occurs while processing
*/
@@ -58,7 +58,7 @@ public interface IoFilter {
/**
* Invoked with the related {@link IdleStatus} when a connection becomes idle.
- *
+ *
* @param session {@link IoSession} associated with the invocation
* @throws Exception Exception If an error occurs while processing
*/
@@ -66,7 +66,7 @@ public interface IoFilter {
/**
* Invoked when a message is received.
- *
+ *
* @param session {@link IoSession} associated with the invocation
* @param message the incoming message to process
* @return the message after processing
@@ -76,7 +76,7 @@ public interface IoFilter {
/**
* Invoked when a message is under writing. The filter is supposed to apply the needed transformation.
- *
+ *
* @param session {@link IoSession} associated with the invocation
* @param message the message to process before writing
* @throws Exception Exception If an error occurs while processing
@@ -86,7 +86,7 @@ public interface IoFilter {
/**
* Invoked when an exception occurs while executing the method
- *
+ *
* @param session {@link IoSession} associated with invocation
* @param cause Real {@link Throwable} which broke the normal chain processing
* @throws Exception If an error occurs while processing
Propchange: mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFilter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFilterChain.java (from r1143111, mina/branches/3.0/core/src/main/java/org/apache/mina/IoFilterChain.java)
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFilterChain.java?p2=mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFilterChain.java&p1=mina/branches/3.0/core/src/main/java/org/apache/mina/IoFilterChain.java&r1=1143111&r2=1143164&rev=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/IoFilterChain.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFilterChain.java Tue Jul 5 18:37:52 2011
@@ -18,7 +18,7 @@
*
*/
-package org.apache.mina;
+package org.apache.mina.api;
import java.util.List;
@@ -76,7 +76,7 @@ public interface IoFilterChain {
void addLast(IoFilter ioFilter);
/**
- * Add the specified {@link IoFilter} to the beginning of the chain. The filter is
+ * Add the specified {@link IoFilter} to the beginning of the chain. The filter is
* inserted before all the other filter currently in the chain.
* @param ioFilter
*/
Propchange: mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFilterChain.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFilterChain.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFuture.java (from r1143132, mina/branches/3.0/core/src/main/java/org/apache/mina/IoFuture.java)
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFuture.java?p2=mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFuture.java&p1=mina/branches/3.0/core/src/main/java/org/apache/mina/IoFuture.java&r1=1143132&r2=1143164&rev=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/IoFuture.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFuture.java Tue Jul 5 18:37:52 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.mina;
+package org.apache.mina.api;
import java.util.concurrent.Future;
Copied: mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFutureListener.java (from r1143132, mina/branches/3.0/core/src/main/java/org/apache/mina/IoFutureListener.java)
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFutureListener.java?p2=mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFutureListener.java&p1=mina/branches/3.0/core/src/main/java/org/apache/mina/IoFutureListener.java&r1=1143132&r2=1143164&rev=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/IoFutureListener.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoFutureListener.java Tue Jul 5 18:37:52 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.mina;
+package org.apache.mina.api;
/**
* A listener that asynchronously receives the result of a future computation.
Copied: mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoServer.java (from r1143111, mina/branches/3.0/core/src/main/java/org/apache/mina/IoServer.java)
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoServer.java?p2=mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoServer.java&p1=mina/branches/3.0/core/src/main/java/org/apache/mina/IoServer.java&r1=1143111&r2=1143164&rev=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/IoServer.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoServer.java Tue Jul 5 18:37:52 2011
@@ -17,16 +17,16 @@
* under the License.
*
*/
-package org.apache.mina;
+package org.apache.mina.api;
import java.io.IOException;
import java.net.SocketAddress;
import java.util.Set;
/**
- *
+ *
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
- *
+ *
*/
public interface IoServer extends IoService {
@@ -38,7 +38,7 @@ public interface IoServer extends IoServ
/**
* Binds to the specified local addresses and start to accept incoming
* connections.
- *
+ *
* @throws IOException
* if failed to bind
*/
Propchange: mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoServer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoService.java (from r1143111, mina/branches/3.0/core/src/main/java/org/apache/mina/IoService.java)
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoService.java?p2=mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoService.java&p1=mina/branches/3.0/core/src/main/java/org/apache/mina/IoService.java&r1=1143111&r2=1143164&rev=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/IoService.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoService.java Tue Jul 5 18:37:52 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina;
+package org.apache.mina.api;
import java.util.Map;
@@ -39,7 +39,7 @@ public interface IoService {
* @return the sessions. An empty collection if there's no session.
*/
Map<Long, IoSession> getManagedSessions();
-
+
/**
* Adds an {@link IoServiceListener} that listens any events related with
* this service.
@@ -58,7 +58,7 @@ public interface IoService {
IoHandler getHandler();
/**
- * Sets the handler which will handle all connections managed by this service. The handler
+ * Sets the handler which will handle all connections managed by this service. The handler
* can only be set before the service is started.
*/
void setHandler(IoHandler handler);
Propchange: mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoService.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoServiceListener.java (from r1143111, mina/branches/3.0/core/src/main/java/org/apache/mina/IoServiceListener.java)
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoServiceListener.java?p2=mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoServiceListener.java&p1=mina/branches/3.0/core/src/main/java/org/apache/mina/IoServiceListener.java&r1=1143111&r2=1143164&rev=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/IoServiceListener.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoServiceListener.java Tue Jul 5 18:37:52 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina;
+package org.apache.mina.api;
import java.util.EventListener;
@@ -33,7 +33,7 @@ public interface IoServiceListener exten
* @param service the {@link IoService}
*/
void serviceActivated(IoService service);
-
+
/**
* Invoked when a service is inactivated by an {@link IoService}.
*
Copied: mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoSession.java (from r1143132, mina/branches/3.0/core/src/main/java/org/apache/mina/IoSession.java)
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoSession.java?p2=mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoSession.java&p1=mina/branches/3.0/core/src/main/java/org/apache/mina/IoSession.java&r1=1143132&r2=1143164&rev=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/IoSession.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoSession.java Tue Jul 5 18:37:52 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina;
+package org.apache.mina.api;
import java.net.SocketAddress;
import java.util.Set;
@@ -47,14 +47,14 @@ import org.apache.mina.session.WriteQueu
* be executed simultaneously, and therefore you have to make sure the
* {@link IoFilter} implementations you're using are thread-safe, too.
* </p>
- *
+ *
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
public interface IoSession {
/**
* The unique identifier of this session.
- *
+ *
* @return the session's unique identifier
*/
long getId();
@@ -63,14 +63,14 @@ public interface IoSession {
/**
* Returns the socket address of remote peer.
- *
+ *
* @return the remote socket address
*/
SocketAddress getRemoteAddress();
/**
* Gets the local address of the local peer.
- *
+ *
* @return the socket address of local machine which is associated with this
* session.
*/
@@ -78,7 +78,7 @@ public interface IoSession {
/**
* Gets the service this session is attached to.
- *
+ *
* @return the {@link IoService} which provides {@link IoSession} to this
* session.
*/
@@ -88,14 +88,14 @@ public interface IoSession {
/**
* Tells if the session is currently connected and able to process incoming
* requests and to send outgoing responses.
- *
+ *
* @return <code>true</code> if this session is connected with remote peer.
*/
boolean isConnected();
/**
* Tells if the session is being closed, but is not yet in Closed state.
- *
+ *
* @return <code>true</tt> if and only if this session is being closed
* (but not disconnected yet) or is closed.
*/
@@ -106,7 +106,7 @@ public interface IoSession {
* flushed. This operation is asynchronous. Wait for the returned
* {@link IoFuture} if you want to wait for the session actually closed.
* Once this method has been called, no incoming request will be accepted.
- *
+ *
* @param immediately
* {@code true} to close this session immediately. {@code false}
* to close this session after all queued write requests are
@@ -138,14 +138,14 @@ public interface IoSession {
/**
* Is read operation is suspended for this session.
- *
+ *
* @return <code>true</code> if suspended
*/
boolean isReadSuspended();
/**
* Is write operation is suspended for this session.
- *
+ *
* @return <code>true</code> if suspended
*/
boolean isWriteSuspended();
@@ -154,7 +154,7 @@ public interface IoSession {
/**
* Gets the total number of bytes read for this session since it was
* created.
- *
+ *
* Returns the total number of bytes which were read from this session.
*/
long getReadBytes();
@@ -162,7 +162,7 @@ public interface IoSession {
/**
* Gets the total number of bytes written for this session since it was
* created.
- *
+ *
* @return the total number of bytes which were written to this session.
*/
long getWrittenBytes();
@@ -171,14 +171,14 @@ public interface IoSession {
/**
* Gets the session configuration, it where the idle timeout are set and
* other transport specific configuration.
- *
+ *
* @return the session's configuration
*/
IoSessionConfig getConfig();
/**
* The session's creation time.
- *
+ *
* @return the session's creation time in milliseconds
*/
long getCreationTime();
@@ -186,21 +186,21 @@ public interface IoSession {
/**
* Returns the time in millisecond when I/O occurred lastly (either read or
* write).
- *
+ *
* @return the time of the last read or write done for this session
*/
long getLastIoTime();
/**
* Returns the time in millisecond when the last I/O read occurred.
- *
+ *
* Returns the time in millisecond when read operation occurred lastly.
*/
long getLastReadTime();
/**
* Returns the time in millisecond when the last I/O write occurred.
- *
+ *
* Returns the time in millisecond when write operation occurred lastly.
*/
long getLastWriteTime();
@@ -208,7 +208,7 @@ public interface IoSession {
/* Session context management */
/**
* Returns the value of the user-defined attribute for this session.
- *
+ *
* @param name
* the attribute's name
* @return <tt>null</tt> if there is no attribute with the specified name
@@ -217,7 +217,7 @@ public interface IoSession {
/**
* Sets a user-defined attribute.
- *
+ *
* @param name
* the attribute's name
* @param value
@@ -229,7 +229,7 @@ public interface IoSession {
/**
* Removes a user-defined attribute with the specified name.
- *
+ *
* @param name
* the attribute's name
* @return The old attribute's value. <tt>null</tt> if not found or if the
@@ -239,7 +239,7 @@ public interface IoSession {
/**
* Tells if the session has an attached attribute.
- *
+ *
* @return <tt>true</tt> if this session contains the attribute with the
* specified <tt>name</tt>.
*/
@@ -247,7 +247,7 @@ public interface IoSession {
/**
* Gets the set of attributes stored within the session.
- *
+ *
* @return the set of names of all user-defined attributes.
*/
Set<Object> getAttributeNames();
@@ -256,9 +256,9 @@ public interface IoSession {
/**
* State of a {@link IoSession}
- *
+ *
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
- *
+ *
*/
public enum SessionState {
CREATED, CONNECTED, CLOSING, CLOSED
@@ -269,19 +269,19 @@ public interface IoSession {
* Enqueue a message for writing. This method wont block ! The message will
* by asynchronously processed by the filter chain and wrote to socket by
* the {@link SelectorProcessor}.
- *
+ *
*/
public void write(Object message);
/**
* Same as {@link IoSession#write(Object)}, but provide a
* {@link IoFuture} for tracking the completion of this write.
- *
+ *
* @param message the message to be processed and written
* @return the {@link IoFuture} for tracking this asynchronous operation
*/
public IoFuture<Void> writeWithFuture(Object message);
-
+
/**
* Get the {@link WriteQueue} of this session. The write queue contains the pending writes.
* @return the write queue of this session
Copied: mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoSessionConfig.java (from r1143111, mina/branches/3.0/core/src/main/java/org/apache/mina/IoSessionConfig.java)
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoSessionConfig.java?p2=mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoSessionConfig.java&p1=mina/branches/3.0/core/src/main/java/org/apache/mina/IoSessionConfig.java&r1=1143111&r2=1143164&rev=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/IoSessionConfig.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoSessionConfig.java Tue Jul 5 18:37:52 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina;
+package org.apache.mina.api;
/**
* The configuration of {@link IoSession}.
@@ -28,6 +28,7 @@ public interface IoSessionConfig {
/**
* Returns idle time for the specified type of idleness in milli-seconds.
+ *
* @see IdleStatus
*/
long getIdleTimeInMillis(IdleStatus status);
@@ -35,7 +36,8 @@ public interface IoSessionConfig {
/**
* Set the delay before an {@link IoSession} is considered idle for a given
* operation type (read/write/both) @see IdleStatus
- * @param status the type of idle (read/write/both) timeout to set
+ *
+ * @param status the type of idle (read/write/both) timeout to set
* @param ildeTimeInMilli the timeout in milliseconds
*/
void setIdleTimeInMillis(IdleStatus status, long ildeTimeInMilli);
Propchange: mina/branches/3.0/core/src/main/java/org/apache/mina/api/IoSessionConfig.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: mina/branches/3.0/core/src/main/java/org/apache/mina/filterchain/DefaultIoFilterChain.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/filterchain/DefaultIoFilterChain.java?rev=1143164&r1=1143163&r2=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/filterchain/DefaultIoFilterChain.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/filterchain/DefaultIoFilterChain.java Tue Jul 5 18:37:52 2011
@@ -23,9 +23,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-import org.apache.mina.IoFilter;
-import org.apache.mina.IoFilterChain;
-import org.apache.mina.IoSession;
+import org.apache.mina.api.IoFilter;
+import org.apache.mina.api.IoFilterChain;
+import org.apache.mina.api.IoSession;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/branches/3.0/core/src/main/java/org/apache/mina/service/AbstractIoService.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/service/AbstractIoService.java?rev=1143164&r1=1143163&r2=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/service/AbstractIoService.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/service/AbstractIoService.java Tue Jul 5 18:37:52 2011
@@ -24,9 +24,10 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
-import org.apache.mina.IoService;
-import org.apache.mina.IoServiceListener;
-import org.apache.mina.IoSession;
+import org.apache.mina.api.IoService;
+import org.apache.mina.api.IoServiceListener;
+import org.apache.mina.api.IoSession;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/branches/3.0/core/src/main/java/org/apache/mina/service/IoHandler.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/service/IoHandler.java?rev=1143164&r1=1143163&r2=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/service/IoHandler.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/service/IoHandler.java Tue Jul 5 18:37:52 2011
@@ -21,8 +21,8 @@ package org.apache.mina.service;
import java.io.IOException;
-import org.apache.mina.IdleStatus;
-import org.apache.mina.IoSession;
+import org.apache.mina.api.IdleStatus;
+import org.apache.mina.api.IoSession;
/**
* Handles all I/O events fired by MINA. This is the Interface an application will implement
Modified: mina/branches/3.0/core/src/main/java/org/apache/mina/service/OneThreadSelectorStrategy.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/service/OneThreadSelectorStrategy.java?rev=1143164&r1=1143163&r2=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/service/OneThreadSelectorStrategy.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/service/OneThreadSelectorStrategy.java Tue Jul 5 18:37:52 2011
@@ -22,7 +22,7 @@ package org.apache.mina.service;
import java.io.IOException;
import java.net.SocketAddress;
-import org.apache.mina.IoSession;
+import org.apache.mina.api.IoSession;
/**
Modified: mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorProcessor.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorProcessor.java?rev=1143164&r1=1143163&r2=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorProcessor.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorProcessor.java Tue Jul 5 18:37:52 2011
@@ -23,9 +23,9 @@ package org.apache.mina.service;
import java.io.IOException;
import java.net.SocketAddress;
-import org.apache.mina.IoServer;
-import org.apache.mina.IoService;
-import org.apache.mina.IoSession;
+import org.apache.mina.api.IoServer;
+import org.apache.mina.api.IoService;
+import org.apache.mina.api.IoSession;
/**
* A processor in charge of a group of client session and server sockets.
Modified: mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorStrategy.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorStrategy.java?rev=1143164&r1=1143163&r2=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorStrategy.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorStrategy.java Tue Jul 5 18:37:52 2011
@@ -22,7 +22,7 @@ package org.apache.mina.service;
import java.io.IOException;
import java.net.SocketAddress;
-import org.apache.mina.IoSession;
+import org.apache.mina.api.IoSession;
/**
Modified: mina/branches/3.0/core/src/main/java/org/apache/mina/service/client/AbstractIoClient.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/service/client/AbstractIoClient.java?rev=1143164&r1=1143163&r2=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/service/client/AbstractIoClient.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/service/client/AbstractIoClient.java Tue Jul 5 18:37:52 2011
@@ -22,10 +22,10 @@ package org.apache.mina.service.client;
import java.net.SocketAddress;
import java.util.Map;
-import org.apache.mina.IoClient;
-import org.apache.mina.IoFuture;
-import org.apache.mina.IoServiceListener;
-import org.apache.mina.IoSession;
+import org.apache.mina.api.IoClient;
+import org.apache.mina.api.*;
+import org.apache.mina.api.IoServiceListener;
+import org.apache.mina.api.IoSession;
import org.apache.mina.service.AbstractIoService;
/**
Modified: mina/branches/3.0/core/src/main/java/org/apache/mina/service/server/AbstractIoServer.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/service/server/AbstractIoServer.java?rev=1143164&r1=1143163&r2=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/service/server/AbstractIoServer.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/service/server/AbstractIoServer.java Tue Jul 5 18:37:52 2011
@@ -19,7 +19,7 @@
*/
package org.apache.mina.service.server;
-import org.apache.mina.IoServer;
+import org.apache.mina.api.IoServer;
import org.apache.mina.service.AbstractIoService;
/**
Modified: mina/branches/3.0/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/session/AbstractIoSession.java?rev=1143164&r1=1143163&r2=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/session/AbstractIoSession.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/session/AbstractIoSession.java Tue Jul 5 18:37:52 2011
@@ -25,9 +25,9 @@ import java.util.concurrent.ConcurrentHa
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.mina.IoFuture;
-import org.apache.mina.IoService;
-import org.apache.mina.IoSession;
+import org.apache.mina.api.IoFuture;
+import org.apache.mina.api.IoService;
+import org.apache.mina.api.IoSession;
import org.apache.mina.service.SelectorProcessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -82,8 +82,8 @@ public abstract class AbstractIoSession
private WriteQueue writeQueue = new DefaultWriteQueue();
/**
- * Create an {@link IoSession} with a unique identifier (
- * {@link IoSession#getId()}) and an associated {@link IoService}
+ * Create an {@link org.apache.mina.api.IoSession} with a unique identifier (
+ * {@link org.apache.mina.api.IoSession#getId()}) and an associated {@link IoService}
*
* @param service the service this session is associated with
* @param writeProcessor the processor in charge of processing this session write queue
Modified: mina/branches/3.0/core/src/main/java/org/apache/mina/session/DefaultWriteQueue.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/session/DefaultWriteQueue.java?rev=1143164&r1=1143163&r2=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/session/DefaultWriteQueue.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/session/DefaultWriteQueue.java Tue Jul 5 18:37:52 2011
@@ -21,11 +21,9 @@ package org.apache.mina.session;
import java.util.concurrent.ConcurrentLinkedQueue;
-import org.apache.mina.IoSession;
-
/**
* The default implementation of the WriteRequest queue for storing writes to
- * process in the {@link IoSession}.
+ * process in the {@link org.apache.mina.api.IoSession}.
*
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
*
Modified: mina/branches/3.0/core/src/main/java/org/apache/mina/session/WriteRequest.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/session/WriteRequest.java?rev=1143164&r1=1143163&r2=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/session/WriteRequest.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/session/WriteRequest.java Tue Jul 5 18:37:52 2011
@@ -19,10 +19,8 @@
*/
package org.apache.mina.session;
-import org.apache.mina.IoSession;
-
/**
- * The write request created by the {@link IoSession#write} method, travel around the filter chain and finish as a
+ * The write request created by the {@link org.apache.mina.api.IoSession#write} method, travel around the filter chain and finish as a
* socket write.
*
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
Modified: mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java?rev=1143164&r1=1143163&r2=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioSelectorProcessor.java Tue Jul 5 18:37:52 2011
@@ -36,9 +36,9 @@ import java.util.concurrent.ConcurrentLi
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.mina.IoServer;
-import org.apache.mina.IoService;
-import org.apache.mina.IoSession;
+import org.apache.mina.api.IoServer;
+import org.apache.mina.api.IoService;
+import org.apache.mina.api.IoSession;
import org.apache.mina.service.AbstractIoService;
import org.apache.mina.service.SelectorProcessor;
import org.apache.mina.service.SelectorStrategy;
Modified: mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java?rev=1143164&r1=1143163&r2=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/transport/tcp/NioTcpSession.java Tue Jul 5 18:37:52 2011
@@ -23,8 +23,8 @@ import java.net.InetSocketAddress;
import java.net.Socket;
import java.nio.channels.SocketChannel;
-import org.apache.mina.IoFuture;
-import org.apache.mina.IoSessionConfig;
+import org.apache.mina.api.IoFuture;
+import org.apache.mina.api.IoSessionConfig;
import org.apache.mina.service.SelectorProcessor;
import org.apache.mina.session.AbstractIoSession;
import org.apache.mina.transport.tcp.nio.NioTcpServer;
Modified: mina/branches/3.0/core/src/test/java/filterchain/DefaultIoFilterChainTest.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/test/java/filterchain/DefaultIoFilterChainTest.java?rev=1143164&r1=1143163&r2=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/test/java/filterchain/DefaultIoFilterChainTest.java (original)
+++ mina/branches/3.0/core/src/test/java/filterchain/DefaultIoFilterChainTest.java Tue Jul 5 18:37:52 2011
@@ -25,9 +25,9 @@ import static org.junit.Assert.assertTru
import java.util.List;
-import org.apache.mina.IdleStatus;
-import org.apache.mina.IoFilter;
-import org.apache.mina.IoSession;
+import org.apache.mina.api.IdleStatus;
+import org.apache.mina.api.IoFilter;
+import org.apache.mina.api.IoSession;
import org.apache.mina.filterchain.DefaultIoFilterChain;
import org.junit.Test;
Modified: mina/branches/3.0/core/src/test/java/org/apache/mina/session/AbstractIoSessionTest.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/test/java/org/apache/mina/session/AbstractIoSessionTest.java?rev=1143164&r1=1143163&r2=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/test/java/org/apache/mina/session/AbstractIoSessionTest.java (original)
+++ mina/branches/3.0/core/src/test/java/org/apache/mina/session/AbstractIoSessionTest.java Tue Jul 5 18:37:52 2011
@@ -4,9 +4,10 @@ import java.net.SocketAddress;
import junit.framework.Assert;
-import org.apache.mina.IoFuture;
-import org.apache.mina.IoService;
-import org.apache.mina.IoSessionConfig;
+import org.apache.mina.api.IoFuture;
+import org.apache.mina.api.IoService;
+import org.apache.mina.api.IoSessionConfig;
+
import org.junit.Test;
public class AbstractIoSessionTest {
Modified: mina/branches/3.0/core/src/test/java/org/apache/mina/transport/socket/nio/NioAcceptorTest.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/test/java/org/apache/mina/transport/socket/nio/NioAcceptorTest.java?rev=1143164&r1=1143163&r2=1143164&view=diff
==============================================================================
--- mina/branches/3.0/core/src/test/java/org/apache/mina/transport/socket/nio/NioAcceptorTest.java (original)
+++ mina/branches/3.0/core/src/test/java/org/apache/mina/transport/socket/nio/NioAcceptorTest.java Tue Jul 5 18:37:52 2011
@@ -27,9 +27,9 @@ import java.nio.ByteBuffer;
import junit.framework.Assert;
-import org.apache.mina.IoService;
-import org.apache.mina.IoServiceListener;
-import org.apache.mina.IoSession;
+import org.apache.mina.api.IoService;
+import org.apache.mina.api.IoServiceListener;
+import org.apache.mina.api.IoSession;
import org.apache.mina.service.OneThreadSelectorStrategy;
import org.apache.mina.service.SelectorFactory;
import org.apache.mina.transport.tcp.NioSelectorProcessor;