You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by jv...@apache.org on 2008/06/26 10:50:11 UTC
svn commit: r671827 [2/6] - in /mina:
asyncweb/trunk/client/src/main/java/org/apache/ahc/
asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/
asyncweb/trunk/client/src/main/java/org/apache/ahc/proxy/
asyncweb/trunk/client/src/main/java/org/apache...
Modified: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/DefaultHttpIoHandler.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/DefaultHttpIoHandler.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/DefaultHttpIoHandler.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/DefaultHttpIoHandler.java Thu Jun 26 01:49:48 2008
@@ -20,7 +20,7 @@
package org.apache.asyncweb.server.transport.mina;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.handler.multiton.SingleSessionIoHandler;
import org.apache.mina.handler.multiton.SingleSessionIoHandlerDelegate;
import org.apache.mina.handler.multiton.SingleSessionIoHandlerFactory;
Modified: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/HttpIoHandler.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/HttpIoHandler.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/HttpIoHandler.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/HttpIoHandler.java Thu Jun 26 01:49:48 2008
@@ -20,7 +20,7 @@
package org.apache.asyncweb.server.transport.mina;
-import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.core.service.IoHandler;
import org.apache.asyncweb.server.ServiceContainer;
Modified: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/LoggingExceptionMonitor.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/LoggingExceptionMonitor.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/LoggingExceptionMonitor.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/LoggingExceptionMonitor.java Thu Jun 26 01:49:48 2008
@@ -19,7 +19,7 @@
*/
package org.apache.asyncweb.server.transport.mina;
-import org.apache.mina.common.ExceptionMonitor;
+import org.apache.mina.core.ExceptionMonitor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java Thu Jun 26 01:49:48 2008
@@ -27,8 +27,8 @@
import org.apache.asyncweb.server.ServiceContainer;
import org.apache.asyncweb.server.Transport;
import org.apache.asyncweb.server.TransportException;
-import org.apache.mina.common.filterchain.DefaultIoFilterChainBuilder;
-import org.apache.mina.common.session.IoEventType;
+import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
+import org.apache.mina.core.session.IoEventType;
import org.apache.mina.filter.executor.ExecutorFilter;
import org.apache.mina.filter.executor.OrderedThreadPoolExecutor;
import org.apache.mina.filter.logging.LogLevel;
Modified: mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java Thu Jun 26 01:49:48 2008
@@ -23,13 +23,13 @@
import java.io.IOException;
import java.net.InetSocketAddress;
-import org.apache.mina.common.write.DefaultWriteRequest;
-import org.apache.mina.common.session.IdleStatus;
-import org.apache.mina.common.filterchain.IoFilterAdapter;
-import org.apache.mina.common.future.IoFutureListener;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.future.WriteFuture;
-import org.apache.mina.common.write.WriteRequest;
+import org.apache.mina.core.write.DefaultWriteRequest;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.filterchain.IoFilterAdapter;
+import org.apache.mina.core.future.IoFutureListener;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.future.WriteFuture;
+import org.apache.mina.core.write.WriteRequest;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.asyncweb.common.HttpRequest;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java Thu Jun 26 01:49:48 2008
@@ -30,7 +30,7 @@
import org.apache.ftpserver.interfaces.ServerFtpStatistics;
import org.apache.ftpserver.listener.Listener;
import org.apache.ftpserver.util.FtpReplyUtil;
-import org.apache.mina.common.session.IdleStatus;
+import org.apache.mina.core.session.IdleStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpHandler.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpHandler.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpHandler.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpHandler.java Thu Jun 26 01:49:48 2008
@@ -26,9 +26,9 @@
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
import org.apache.ftpserver.listener.Listener;
-import org.apache.mina.common.session.IdleStatus;
-import org.apache.mina.common.service.IoHandler;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
public interface FtpHandler {
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_WHO.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_WHO.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_WHO.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_WHO.java Thu Jun 26 01:49:48 2008
@@ -35,7 +35,7 @@
import org.apache.ftpserver.util.DateUtils;
import org.apache.ftpserver.util.FtpReplyUtil;
import org.apache.ftpserver.util.StringUtils;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
/**
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filter/FtpLoggingFilter.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filter/FtpLoggingFilter.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filter/FtpLoggingFilter.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filter/FtpLoggingFilter.java Thu Jun 26 01:49:48 2008
@@ -19,8 +19,8 @@
package org.apache.ftpserver.filter;
-import org.apache.mina.common.session.IoEventType;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoEventType;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.logging.LoggingFilter;
/**
@@ -53,7 +53,7 @@
}
/**
- * @see LoggingFilter#messageReceived(org.apache.mina.common.IoFilter.NextFilter, IoSession, Object)
+ * @see LoggingFilter#messageReceived(org.apache.mina.core.IoFilter.NextFilter, IoSession, Object)
*/
@Override
public void messageReceived(NextFilter nextFilter, IoSession session,
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpIoSession.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpIoSession.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpIoSession.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpIoSession.java Thu Jun 26 01:49:48 2008
@@ -38,18 +38,18 @@
import org.apache.ftpserver.ftplet.Structure;
import org.apache.ftpserver.ftplet.User;
import org.apache.ftpserver.listener.Listener;
-import org.apache.mina.common.filterchain.IoFilterChain;
-import org.apache.mina.common.future.CloseFuture;
-import org.apache.mina.common.future.ReadFuture;
-import org.apache.mina.common.future.WriteFuture;
-import org.apache.mina.common.service.IoHandler;
-import org.apache.mina.common.service.IoService;
-import org.apache.mina.common.service.TransportMetadata;
-import org.apache.mina.common.session.IdleStatus;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.session.IoSessionConfig;
-import org.apache.mina.common.session.TrafficMask;
-import org.apache.mina.common.write.WriteRequest;
+import org.apache.mina.core.filterchain.IoFilterChain;
+import org.apache.mina.core.future.CloseFuture;
+import org.apache.mina.core.future.ReadFuture;
+import org.apache.mina.core.future.WriteFuture;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.core.service.IoService;
+import org.apache.mina.core.service.TransportMetadata;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.session.IoSessionConfig;
+import org.apache.mina.core.session.TrafficMask;
+import org.apache.mina.core.write.WriteRequest;
import org.apache.mina.filter.ssl.SslFilter;
public class FtpIoSession implements IoSession {
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java Thu Jun 26 01:49:48 2008
@@ -25,9 +25,9 @@
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.mina.common.session.IdleStatus;
-import org.apache.mina.common.service.IoHandler;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
public class FtpHandlerAdapter implements IoHandler
{
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpResponseEncoder.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpResponseEncoder.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpResponseEncoder.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpResponseEncoder.java Thu Jun 26 01:49:48 2008
@@ -23,8 +23,8 @@
import java.nio.charset.CharsetEncoder;
import org.apache.ftpserver.ftplet.FtpReply;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
import org.apache.mina.filter.codec.demux.MessageEncoder;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpServerProtocolCodecFactory.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpServerProtocolCodecFactory.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpServerProtocolCodecFactory.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpServerProtocolCodecFactory.java Thu Jun 26 01:49:48 2008
@@ -21,7 +21,7 @@
import java.nio.charset.Charset;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolEncoder;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java?rev=671827&r1=671826&r2=671827&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java Thu Jun 26 01:49:48 2008
@@ -39,8 +39,8 @@
import org.apache.ftpserver.listener.Listener;
import org.apache.ftpserver.ssl.ClientAuth;
import org.apache.ftpserver.ssl.SslConfiguration;
-import org.apache.mina.common.session.IdleStatus;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.executor.ExecutorFilter;
import org.apache.mina.filter.executor.OrderedThreadPoolExecutor;
Copied: mina/trunk/core/src/main/java/org/apache/mina/core/DefaultExceptionMonitor.java (from r671815, mina/trunk/core/src/main/java/org/apache/mina/common/DefaultExceptionMonitor.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/DefaultExceptionMonitor.java?p2=mina/trunk/core/src/main/java/org/apache/mina/core/DefaultExceptionMonitor.java&p1=mina/trunk/core/src/main/java/org/apache/mina/common/DefaultExceptionMonitor.java&r1=671815&r2=671827&rev=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/DefaultExceptionMonitor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/DefaultExceptionMonitor.java Thu Jun 26 01:49:48 2008
@@ -17,9 +17,9 @@
* under the License.
*
*/
-package org.apache.mina.common;
+package org.apache.mina.core;
-import org.apache.mina.common.service.IoService;
+import org.apache.mina.core.service.IoService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: mina/trunk/core/src/main/java/org/apache/mina/core/ExceptionMonitor.java (from r671815, mina/trunk/core/src/main/java/org/apache/mina/common/ExceptionMonitor.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/ExceptionMonitor.java?p2=mina/trunk/core/src/main/java/org/apache/mina/core/ExceptionMonitor.java&p1=mina/trunk/core/src/main/java/org/apache/mina/common/ExceptionMonitor.java&r1=671815&r2=671827&rev=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/ExceptionMonitor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/ExceptionMonitor.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common;
+package org.apache.mina.core;
/**
Copied: mina/trunk/core/src/main/java/org/apache/mina/core/IoUtil.java (from r671815, mina/trunk/core/src/main/java/org/apache/mina/common/IoUtil.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/IoUtil.java?p2=mina/trunk/core/src/main/java/org/apache/mina/core/IoUtil.java&p1=mina/trunk/core/src/main/java/org/apache/mina/common/IoUtil.java&r1=671815&r2=671827&rev=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoUtil.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/IoUtil.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common;
+package org.apache.mina.core;
import java.util.ArrayList;
import java.util.Collection;
@@ -25,10 +25,10 @@
import java.util.List;
import java.util.concurrent.TimeUnit;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.future.IoFuture;
-import org.apache.mina.common.future.WriteFuture;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.future.IoFuture;
+import org.apache.mina.core.future.WriteFuture;
+import org.apache.mina.core.session.IoSession;
/**
* A utility class that provides various convenience methods related with
Copied: mina/trunk/core/src/main/java/org/apache/mina/core/RuntimeIoException.java (from r671815, mina/trunk/core/src/main/java/org/apache/mina/common/RuntimeIoException.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/RuntimeIoException.java?p2=mina/trunk/core/src/main/java/org/apache/mina/core/RuntimeIoException.java&p1=mina/trunk/core/src/main/java/org/apache/mina/common/RuntimeIoException.java&r1=671815&r2=671827&rev=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/RuntimeIoException.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/RuntimeIoException.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common;
+package org.apache.mina.core;
import java.io.IOException;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/buffer/AbstractIoBuffer.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/buffer/AbstractIoBuffer.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/buffer/AbstractIoBuffer.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/buffer/AbstractIoBuffer.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.buffer;
+package org.apache.mina.core.buffer;
import java.io.EOFException;
import java.io.IOException;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/buffer/BufferDataException.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/buffer/BufferDataException.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/buffer/BufferDataException.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/buffer/BufferDataException.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.buffer;
+package org.apache.mina.core.buffer;
/**
* A {@link RuntimeException} which is thrown when the data the {@link IoBuffer}
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/buffer/CachedBufferAllocator.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/buffer/CachedBufferAllocator.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/buffer/CachedBufferAllocator.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/buffer/CachedBufferAllocator.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.buffer;
+package org.apache.mina.core.buffer;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBuffer.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBuffer.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBuffer.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBuffer.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.buffer;
+package org.apache.mina.core.buffer;
import java.io.IOException;
import java.io.InputStream;
@@ -38,7 +38,7 @@
import java.util.EnumSet;
import java.util.Set;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
/**
* A byte buffer used by MINA applications.
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBufferAllocator.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBufferAllocator.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBufferAllocator.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBufferAllocator.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.buffer;
+package org.apache.mina.core.buffer;
import java.nio.ByteBuffer;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBufferHexDumper.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBufferHexDumper.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBufferHexDumper.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBufferHexDumper.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.buffer;
+package org.apache.mina.core.buffer;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBufferWrapper.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBufferWrapper.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBufferWrapper.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/buffer/IoBufferWrapper.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.buffer;
+package org.apache.mina.core.buffer;
import java.io.FilterOutputStream;
import java.io.InputStream;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/buffer/SimpleBufferAllocator.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/buffer/SimpleBufferAllocator.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/buffer/SimpleBufferAllocator.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/buffer/SimpleBufferAllocator.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.buffer;
+package org.apache.mina.core.buffer;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/file/DefaultFileRegion.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/file/DefaultFileRegion.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/file/DefaultFileRegion.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/file/DefaultFileRegion.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.file;
+package org.apache.mina.core.file;
import java.io.IOException;
import java.nio.channels.FileChannel;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/file/FileRegion.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/file/FileRegion.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/file/FileRegion.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/file/FileRegion.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.file;
+package org.apache.mina.core.file;
import java.nio.channels.FileChannel;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.filterchain;
+package org.apache.mina.core.filterchain;
import java.util.ArrayList;
import java.util.HashMap;
@@ -25,16 +25,16 @@
import java.util.List;
import java.util.Map;
-import org.apache.mina.common.session.TrafficMask;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.filterchain.IoFilter.NextFilter;
-import org.apache.mina.common.future.ConnectFuture;
-import org.apache.mina.common.future.IoFuture;
-import org.apache.mina.common.session.AbstractIoSession;
-import org.apache.mina.common.session.AttributeKey;
-import org.apache.mina.common.session.IdleStatus;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.write.WriteRequest;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.filterchain.IoFilter.NextFilter;
+import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.future.IoFuture;
+import org.apache.mina.core.session.AbstractIoSession;
+import org.apache.mina.core.session.AttributeKey;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.session.TrafficMask;
+import org.apache.mina.core.write.WriteRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChainBuilder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChainBuilder.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChainBuilder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChainBuilder.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.filterchain;
+package org.apache.mina.core.filterchain;
import java.util.ArrayList;
import java.util.Collections;
@@ -29,9 +29,9 @@
import java.util.Random;
import java.util.concurrent.CopyOnWriteArrayList;
-import org.apache.mina.common.filterchain.IoFilter.NextFilter;
-import org.apache.mina.common.filterchain.IoFilterChain.Entry;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.filterchain.IoFilter.NextFilter;
+import org.apache.mina.core.filterchain.IoFilterChain.Entry;
+import org.apache.mina.core.session.IoSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java Thu Jun 26 01:49:48 2008
@@ -17,13 +17,13 @@
* under the License.
*
*/
-package org.apache.mina.common.filterchain;
+package org.apache.mina.core.filterchain;
-import org.apache.mina.common.session.TrafficMask;
-import org.apache.mina.common.service.IoHandler;
-import org.apache.mina.common.session.IdleStatus;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.write.WriteRequest;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.session.TrafficMask;
+import org.apache.mina.core.write.WriteRequest;
import org.apache.mina.filter.util.ReferenceCountingFilter;
/**
@@ -55,7 +55,7 @@
* pass through the filter from now.</li>
* <li>{@link #onPostAdd(IoFilterChain, String, NextFilter)} is invoked to notify
* that the filter is added to the chain.</li>
- * <li>The filter is removed from the chain if {@link #onPostAdd(IoFilterChain, String, org.apache.mina.common.filterchain.IoFilter.NextFilter)}
+ * <li>The filter is removed from the chain if {@link #onPostAdd(IoFilterChain, String, org.apache.mina.core.filterchain.IoFilter.NextFilter)}
* threw an exception. {@link #destroy()} is also invoked by
* {@link ReferenceCountingFilter} if the filter is the last filter which
* was added to {@link IoFilterChain}s.</li>
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterAdapter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterAdapter.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterAdapter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterAdapter.java Thu Jun 26 01:49:48 2008
@@ -17,12 +17,12 @@
* under the License.
*
*/
-package org.apache.mina.common.filterchain;
+package org.apache.mina.core.filterchain;
-import org.apache.mina.common.session.TrafficMask;
-import org.apache.mina.common.session.IdleStatus;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.write.WriteRequest;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.session.TrafficMask;
+import org.apache.mina.core.write.WriteRequest;
/**
* An abstract adapter class for {@link IoFilter}. You can extend
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java Thu Jun 26 01:49:48 2008
@@ -17,16 +17,16 @@
* under the License.
*
*/
-package org.apache.mina.common.filterchain;
+package org.apache.mina.core.filterchain;
import java.util.List;
-import org.apache.mina.common.session.TrafficMask;
-import org.apache.mina.common.filterchain.IoFilter.NextFilter;
-import org.apache.mina.common.service.IoHandler;
-import org.apache.mina.common.session.IdleStatus;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.write.WriteRequest;
+import org.apache.mina.core.filterchain.IoFilter.NextFilter;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.session.TrafficMask;
+import org.apache.mina.core.write.WriteRequest;
/**
* A container of {@link IoFilter}s that forwards {@link IoHandler} events
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterChainBuilder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterChainBuilder.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterChainBuilder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterChainBuilder.java Thu Jun 26 01:49:48 2008
@@ -17,9 +17,9 @@
* under the License.
*
*/
-package org.apache.mina.common.filterchain;
+package org.apache.mina.core.filterchain;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
/**
* An interface that builds {@link IoFilterChain} in predefined way
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterEvent.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterEvent.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterEvent.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterEvent.java Thu Jun 26 01:49:48 2008
@@ -17,15 +17,15 @@
* under the License.
*
*/
-package org.apache.mina.common.filterchain;
+package org.apache.mina.core.filterchain;
-import org.apache.mina.common.session.TrafficMask;
-import org.apache.mina.common.filterchain.IoFilter.NextFilter;
-import org.apache.mina.common.session.IdleStatus;
-import org.apache.mina.common.session.IoEvent;
-import org.apache.mina.common.session.IoEventType;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.write.WriteRequest;
+import org.apache.mina.core.filterchain.IoFilter.NextFilter;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoEvent;
+import org.apache.mina.core.session.IoEventType;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.session.TrafficMask;
+import org.apache.mina.core.write.WriteRequest;
/**
* An I/O event or an I/O request that MINA provides for {@link IoFilter}s.
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterLifeCycleException.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterLifeCycleException.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterLifeCycleException.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterLifeCycleException.java Thu Jun 26 01:49:48 2008
@@ -17,12 +17,12 @@
* under the License.
*
*/
-package org.apache.mina.common.filterchain;
+package org.apache.mina.core.filterchain;
/**
* A {@link RuntimeException} which is thrown when {@link IoFilter#init()}
- * or {@link IoFilter#onPostAdd(IoFilterChain, String, org.apache.mina.common.filterchain.IoFilter.NextFilter)}
+ * or {@link IoFilter#onPostAdd(IoFilterChain, String, org.apache.mina.core.filterchain.IoFilter.NextFilter)}
* failed.
*
* @author The Apache MINA Project (dev@mina.apache.org)
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/future/CloseFuture.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/future/CloseFuture.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/future/CloseFuture.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/future/CloseFuture.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.future;
+package org.apache.mina.core.future;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/future/CompositeIoFuture.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/future/CompositeIoFuture.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/future/CompositeIoFuture.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/future/CompositeIoFuture.java Thu Jun 26 01:49:48 2008
@@ -17,11 +17,11 @@
* under the License.
*
*/
-package org.apache.mina.common.future;
+package org.apache.mina.core.future;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.mina.common.IoUtil;
+import org.apache.mina.core.IoUtil;
/**
* An {@link IoFuture} of {@link IoFuture}s. It is useful when you want to
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/future/ConnectFuture.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/future/ConnectFuture.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/future/ConnectFuture.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/future/ConnectFuture.java Thu Jun 26 01:49:48 2008
@@ -17,9 +17,9 @@
* under the License.
*
*/
-package org.apache.mina.common.future;
+package org.apache.mina.core.future;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
/**
* An {@link IoFuture} for asynchronous connect requests.
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultCloseFuture.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultCloseFuture.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultCloseFuture.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultCloseFuture.java Thu Jun 26 01:49:48 2008
@@ -17,9 +17,9 @@
* under the License.
*
*/
-package org.apache.mina.common.future;
+package org.apache.mina.core.future;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultConnectFuture.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultConnectFuture.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultConnectFuture.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultConnectFuture.java Thu Jun 26 01:49:48 2008
@@ -17,10 +17,10 @@
* under the License.
*
*/
-package org.apache.mina.common.future;
+package org.apache.mina.core.future;
-import org.apache.mina.common.RuntimeIoException;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.RuntimeIoException;
+import org.apache.mina.core.session.IoSession;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultIoFuture.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultIoFuture.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultIoFuture.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultIoFuture.java Thu Jun 26 01:49:48 2008
@@ -17,16 +17,16 @@
* under the License.
*
*/
-package org.apache.mina.common.future;
+package org.apache.mina.core.future;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import org.apache.mina.common.ExceptionMonitor;
-import org.apache.mina.common.polling.AbstractPollingIoProcessor;
-import org.apache.mina.common.service.IoProcessor;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.ExceptionMonitor;
+import org.apache.mina.core.polling.AbstractPollingIoProcessor;
+import org.apache.mina.core.service.IoProcessor;
+import org.apache.mina.core.session.IoSession;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultReadFuture.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultReadFuture.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultReadFuture.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultReadFuture.java Thu Jun 26 01:49:48 2008
@@ -17,12 +17,12 @@
* under the License.
*
*/
-package org.apache.mina.common.future;
+package org.apache.mina.core.future;
import java.io.IOException;
-import org.apache.mina.common.RuntimeIoException;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.RuntimeIoException;
+import org.apache.mina.core.session.IoSession;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultWriteFuture.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultWriteFuture.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultWriteFuture.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultWriteFuture.java Thu Jun 26 01:49:48 2008
@@ -17,9 +17,9 @@
* under the License.
*
*/
-package org.apache.mina.common.future;
+package org.apache.mina.core.future;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/future/IoFuture.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/future/IoFuture.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/future/IoFuture.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/future/IoFuture.java Thu Jun 26 01:49:48 2008
@@ -17,11 +17,11 @@
* under the License.
*
*/
-package org.apache.mina.common.future;
+package org.apache.mina.core.future;
import java.util.concurrent.TimeUnit;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
/**
* Represents the completion of an asynchronous I/O operation on an
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/future/IoFutureListener.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/future/IoFutureListener.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/future/IoFutureListener.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/future/IoFutureListener.java Thu Jun 26 01:49:48 2008
@@ -17,11 +17,11 @@
* under the License.
*
*/
-package org.apache.mina.common.future;
+package org.apache.mina.core.future;
import java.util.EventListener;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
/**
* Something interested in being notified when the completion
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/future/ReadFuture.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/future/ReadFuture.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/future/ReadFuture.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/future/ReadFuture.java Thu Jun 26 01:49:48 2008
@@ -17,9 +17,9 @@
* under the License.
*
*/
-package org.apache.mina.common.future;
+package org.apache.mina.core.future;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
/**
* An {@link IoFuture} for {@link IoSession#read() asynchronous read requests}.
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/future/WriteFuture.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/future/WriteFuture.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/future/WriteFuture.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/future/WriteFuture.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.future;
+package org.apache.mina.core.future;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingConnectionlessIoAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingConnectionlessIoAcceptor.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingConnectionlessIoAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingConnectionlessIoAcceptor.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.polling;
+package org.apache.mina.core.polling;
import java.net.SocketAddress;
import java.util.Collections;
@@ -31,22 +31,22 @@
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor;
-import org.apache.mina.common.ExceptionMonitor;
-import org.apache.mina.common.RuntimeIoException;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.future.IoFuture;
-import org.apache.mina.common.service.AbstractIoAcceptor;
-import org.apache.mina.common.service.IoAcceptor;
-import org.apache.mina.common.service.IoProcessor;
-import org.apache.mina.common.service.AbstractIoAcceptor.AcceptorOperationFuture;
-import org.apache.mina.common.session.AbstractIoSession;
-import org.apache.mina.common.session.ExpiringSessionRecycler;
-import org.apache.mina.common.session.IdleStatusChecker;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.session.IoSessionConfig;
-import org.apache.mina.common.session.IoSessionRecycler;
-import org.apache.mina.common.write.WriteRequest;
-import org.apache.mina.common.write.WriteRequestQueue;
+import org.apache.mina.core.ExceptionMonitor;
+import org.apache.mina.core.RuntimeIoException;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.future.IoFuture;
+import org.apache.mina.core.service.AbstractIoAcceptor;
+import org.apache.mina.core.service.IoAcceptor;
+import org.apache.mina.core.service.IoProcessor;
+import org.apache.mina.core.service.AbstractIoAcceptor.AcceptorOperationFuture;
+import org.apache.mina.core.session.AbstractIoSession;
+import org.apache.mina.core.session.ExpiringSessionRecycler;
+import org.apache.mina.core.session.IdleStatusChecker;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.session.IoSessionConfig;
+import org.apache.mina.core.session.IoSessionRecycler;
+import org.apache.mina.core.write.WriteRequest;
+import org.apache.mina.core.write.WriteRequestQueue;
/**
* {@link IoAcceptor} for datagram transport (UDP/IP).
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.polling;
+package org.apache.mina.core.polling;
import java.net.SocketAddress;
import java.util.Collections;
@@ -32,19 +32,19 @@
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
-import org.apache.mina.common.ExceptionMonitor;
-import org.apache.mina.common.RuntimeIoException;
-import org.apache.mina.common.filterchain.IoFilter;
-import org.apache.mina.common.future.IoFuture;
-import org.apache.mina.common.service.AbstractIoAcceptor;
-import org.apache.mina.common.service.IoAcceptor;
-import org.apache.mina.common.service.IoHandler;
-import org.apache.mina.common.service.IoProcessor;
-import org.apache.mina.common.service.SimpleIoProcessorPool;
-import org.apache.mina.common.service.AbstractIoAcceptor.AcceptorOperationFuture;
-import org.apache.mina.common.session.AbstractIoSession;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.session.IoSessionConfig;
+import org.apache.mina.core.ExceptionMonitor;
+import org.apache.mina.core.RuntimeIoException;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.core.future.IoFuture;
+import org.apache.mina.core.service.AbstractIoAcceptor;
+import org.apache.mina.core.service.IoAcceptor;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.core.service.IoProcessor;
+import org.apache.mina.core.service.SimpleIoProcessorPool;
+import org.apache.mina.core.service.AbstractIoAcceptor.AcceptorOperationFuture;
+import org.apache.mina.core.session.AbstractIoSession;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.session.IoSessionConfig;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.polling;
+package org.apache.mina.core.polling;
import java.net.ConnectException;
import java.net.SocketAddress;
@@ -27,21 +27,21 @@
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
-import org.apache.mina.common.ExceptionMonitor;
-import org.apache.mina.common.RuntimeIoException;
-import org.apache.mina.common.filterchain.IoFilter;
-import org.apache.mina.common.future.ConnectFuture;
-import org.apache.mina.common.future.DefaultConnectFuture;
-import org.apache.mina.common.future.IoFuture;
-import org.apache.mina.common.service.AbstractIoConnector;
-import org.apache.mina.common.service.IoConnector;
-import org.apache.mina.common.service.IoHandler;
-import org.apache.mina.common.service.IoProcessor;
-import org.apache.mina.common.service.SimpleIoProcessorPool;
-import org.apache.mina.common.session.AbstractIoSession;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.session.IoSessionConfig;
-import org.apache.mina.common.session.IoSessionInitializer;
+import org.apache.mina.core.ExceptionMonitor;
+import org.apache.mina.core.RuntimeIoException;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.future.DefaultConnectFuture;
+import org.apache.mina.core.future.IoFuture;
+import org.apache.mina.core.service.AbstractIoConnector;
+import org.apache.mina.core.service.IoConnector;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.core.service.IoProcessor;
+import org.apache.mina.core.service.SimpleIoProcessorPool;
+import org.apache.mina.core.session.AbstractIoSession;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.session.IoSessionConfig;
+import org.apache.mina.core.session.IoSessionInitializer;
/**
* TODO Add documentation
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.polling;
+package org.apache.mina.core.polling;
import java.io.IOException;
import java.nio.channels.SelectionKey;
@@ -31,18 +31,18 @@
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.mina.common.ExceptionMonitor;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.file.FileRegion;
-import org.apache.mina.common.future.DefaultIoFuture;
-import org.apache.mina.common.service.AbstractIoService;
-import org.apache.mina.common.service.IoProcessor;
-import org.apache.mina.common.session.AbstractIoSession;
-import org.apache.mina.common.session.IdleStatusChecker;
-import org.apache.mina.common.session.IoSessionConfig;
-import org.apache.mina.common.write.WriteRequest;
-import org.apache.mina.common.write.WriteRequestQueue;
-import org.apache.mina.common.write.WriteToClosedSessionException;
+import org.apache.mina.core.ExceptionMonitor;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.file.FileRegion;
+import org.apache.mina.core.future.DefaultIoFuture;
+import org.apache.mina.core.service.AbstractIoService;
+import org.apache.mina.core.service.IoProcessor;
+import org.apache.mina.core.session.AbstractIoSession;
+import org.apache.mina.core.session.IdleStatusChecker;
+import org.apache.mina.core.session.IoSessionConfig;
+import org.apache.mina.core.write.WriteRequest;
+import org.apache.mina.core.write.WriteRequestQueue;
+import org.apache.mina.core.write.WriteToClosedSessionException;
import org.apache.mina.util.NamePreservingRunnable;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoAcceptor.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoAcceptor.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.service;
+package org.apache.mina.core.service;
import java.io.IOException;
import java.net.SocketAddress;
@@ -30,9 +30,9 @@
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
-import org.apache.mina.common.RuntimeIoException;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.session.IoSessionConfig;
+import org.apache.mina.core.RuntimeIoException;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.session.IoSessionConfig;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoConnector.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoConnector.java Thu Jun 26 01:49:48 2008
@@ -17,19 +17,19 @@
* under the License.
*
*/
-package org.apache.mina.common.service;
+package org.apache.mina.core.service;
import java.net.SocketAddress;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
-import org.apache.mina.common.future.ConnectFuture;
-import org.apache.mina.common.future.IoFuture;
-import org.apache.mina.common.future.IoFutureListener;
-import org.apache.mina.common.session.IdleStatus;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.session.IoSessionConfig;
-import org.apache.mina.common.session.IoSessionInitializer;
+import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.future.IoFuture;
+import org.apache.mina.core.future.IoFutureListener;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.session.IoSessionConfig;
+import org.apache.mina.core.session.IoSessionInitializer;
/**
* A base implementation of {@link IoConnector}.
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoService.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoService.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoService.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoService.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.service;
+package org.apache.mina.core.service;
import java.util.AbstractSet;
import java.util.Iterator;
@@ -31,24 +31,24 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.mina.common.ExceptionMonitor;
-import org.apache.mina.common.IoUtil;
-import org.apache.mina.common.filterchain.DefaultIoFilterChain;
-import org.apache.mina.common.filterchain.DefaultIoFilterChainBuilder;
-import org.apache.mina.common.filterchain.IoFilterChainBuilder;
-import org.apache.mina.common.future.ConnectFuture;
-import org.apache.mina.common.future.DefaultIoFuture;
-import org.apache.mina.common.future.IoFuture;
-import org.apache.mina.common.future.WriteFuture;
-import org.apache.mina.common.session.AbstractIoSession;
-import org.apache.mina.common.session.DefaultIoSessionDataStructureFactory;
-import org.apache.mina.common.session.IdleStatus;
-import org.apache.mina.common.session.IdleStatusChecker;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.session.IoSessionConfig;
-import org.apache.mina.common.session.IoSessionDataStructureFactory;
-import org.apache.mina.common.session.IoSessionInitializationException;
-import org.apache.mina.common.session.IoSessionInitializer;
+import org.apache.mina.core.ExceptionMonitor;
+import org.apache.mina.core.IoUtil;
+import org.apache.mina.core.filterchain.DefaultIoFilterChain;
+import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
+import org.apache.mina.core.filterchain.IoFilterChainBuilder;
+import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.future.DefaultIoFuture;
+import org.apache.mina.core.future.IoFuture;
+import org.apache.mina.core.future.WriteFuture;
+import org.apache.mina.core.session.AbstractIoSession;
+import org.apache.mina.core.session.DefaultIoSessionDataStructureFactory;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IdleStatusChecker;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.session.IoSessionConfig;
+import org.apache.mina.core.session.IoSessionDataStructureFactory;
+import org.apache.mina.core.session.IoSessionInitializationException;
+import org.apache.mina.core.session.IoSessionInitializer;
import org.apache.mina.util.NamePreservingRunnable;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/service/DefaultTransportMetadata.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/service/DefaultTransportMetadata.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/service/DefaultTransportMetadata.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/service/DefaultTransportMetadata.java Thu Jun 26 01:49:48 2008
@@ -17,13 +17,13 @@
* under the License.
*
*/
-package org.apache.mina.common.service;
+package org.apache.mina.core.service;
import java.net.SocketAddress;
import java.util.Collections;
import java.util.Set;
-import org.apache.mina.common.session.IoSessionConfig;
+import org.apache.mina.core.session.IoSessionConfig;
import org.apache.mina.util.IdentityHashSet;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/service/IoAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/service/IoAcceptor.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/service/IoAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/service/IoAcceptor.java Thu Jun 26 01:49:48 2008
@@ -17,14 +17,14 @@
* under the License.
*
*/
-package org.apache.mina.common.service;
+package org.apache.mina.core.service;
import java.io.IOException;
import java.net.SocketAddress;
import java.util.List;
import java.util.Set;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
/**
* Accepts incoming connection, communicates with clients, and fires events to
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/service/IoConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/service/IoConnector.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/service/IoConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/service/IoConnector.java Thu Jun 26 01:49:48 2008
@@ -17,13 +17,13 @@
* under the License.
*
*/
-package org.apache.mina.common.service;
+package org.apache.mina.core.service;
import java.net.SocketAddress;
-import org.apache.mina.common.future.ConnectFuture;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.session.IoSessionInitializer;
+import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.session.IoSessionInitializer;
/**
* Connects to endpoint, communicates with the server, and fires events to
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/service/IoHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/service/IoHandler.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/service/IoHandler.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/service/IoHandler.java Thu Jun 26 01:49:48 2008
@@ -17,12 +17,12 @@
* under the License.
*
*/
-package org.apache.mina.common.service;
+package org.apache.mina.core.service;
import java.io.IOException;
-import org.apache.mina.common.session.IdleStatus;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
/**
* Handles all I/O events fired by MINA.
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/service/IoHandlerAdapter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/service/IoHandlerAdapter.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/service/IoHandlerAdapter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/service/IoHandlerAdapter.java Thu Jun 26 01:49:48 2008
@@ -17,10 +17,10 @@
* under the License.
*
*/
-package org.apache.mina.common.service;
+package org.apache.mina.core.service;
-import org.apache.mina.common.session.IdleStatus;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/service/IoProcessor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/service/IoProcessor.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/service/IoProcessor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/service/IoProcessor.java Thu Jun 26 01:49:48 2008
@@ -17,9 +17,9 @@
* under the License.
*
*/
-package org.apache.mina.common.service;
+package org.apache.mina.core.service;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IoSession;
/**
* An internal interface to represent an 'I/O processor' that performs
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/service/IoService.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/service/IoService.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/service/IoService.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/service/IoService.java Thu Jun 26 01:49:48 2008
@@ -17,21 +17,21 @@
* under the License.
*
*/
-package org.apache.mina.common.service;
+package org.apache.mina.core.service;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
-import org.apache.mina.common.IoUtil;
-import org.apache.mina.common.filterchain.DefaultIoFilterChainBuilder;
-import org.apache.mina.common.filterchain.IoFilterChain;
-import org.apache.mina.common.filterchain.IoFilterChainBuilder;
-import org.apache.mina.common.future.WriteFuture;
-import org.apache.mina.common.session.IdleStatus;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.session.IoSessionConfig;
-import org.apache.mina.common.session.IoSessionDataStructureFactory;
+import org.apache.mina.core.IoUtil;
+import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
+import org.apache.mina.core.filterchain.IoFilterChain;
+import org.apache.mina.core.filterchain.IoFilterChainBuilder;
+import org.apache.mina.core.future.WriteFuture;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.session.IoSessionConfig;
+import org.apache.mina.core.session.IoSessionDataStructureFactory;
/**
* Base interface for all {@link IoAcceptor}s and {@link IoConnector}s
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/service/IoServiceListener.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/service/IoServiceListener.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/service/IoServiceListener.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/service/IoServiceListener.java Thu Jun 26 01:49:48 2008
@@ -17,12 +17,12 @@
* under the License.
*
*/
-package org.apache.mina.common.service;
+package org.apache.mina.core.service;
import java.util.EventListener;
-import org.apache.mina.common.session.IdleStatus;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
/**
* Listens to events related to an {@link IoService}.
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/service/IoServiceListenerSupport.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/service/IoServiceListenerSupport.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/service/IoServiceListenerSupport.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/service/IoServiceListenerSupport.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.service;
+package org.apache.mina.core.service;
import java.util.Collections;
import java.util.List;
@@ -27,11 +27,11 @@
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.mina.common.ExceptionMonitor;
-import org.apache.mina.common.future.IoFuture;
-import org.apache.mina.common.future.IoFutureListener;
-import org.apache.mina.common.session.IdleStatus;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.ExceptionMonitor;
+import org.apache.mina.core.future.IoFuture;
+import org.apache.mina.core.future.IoFutureListener;
+import org.apache.mina.core.session.IdleStatus;
+import org.apache.mina.core.session.IoSession;
/**
* A helper which provides addition and removal of {@link IoServiceListener}s and firing
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/service/SimpleIoProcessorPool.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/service/SimpleIoProcessorPool.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/service/SimpleIoProcessorPool.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/service/SimpleIoProcessorPool.java Thu Jun 26 01:49:48 2008
@@ -17,17 +17,17 @@
* under the License.
*
*/
-package org.apache.mina.common.service;
+package org.apache.mina.core.service;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.mina.common.RuntimeIoException;
-import org.apache.mina.common.session.AbstractIoSession;
-import org.apache.mina.common.session.AttributeKey;
-import org.apache.mina.common.session.IoSession;
+import org.apache.mina.core.RuntimeIoException;
+import org.apache.mina.core.session.AbstractIoSession;
+import org.apache.mina.core.session.AttributeKey;
+import org.apache.mina.core.session.IoSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/service/TransportMetadata.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/service/TransportMetadata.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/service/TransportMetadata.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/service/TransportMetadata.java Thu Jun 26 01:49:48 2008
@@ -17,13 +17,13 @@
* under the License.
*
*/
-package org.apache.mina.common.service;
+package org.apache.mina.core.service;
import java.net.SocketAddress;
import java.util.Set;
-import org.apache.mina.common.session.IoSession;
-import org.apache.mina.common.session.IoSessionConfig;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.core.session.IoSessionConfig;
/**
* Provides meta-information that describes an {@link IoService}.
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.session;
+package org.apache.mina.core.session;
import java.io.File;
import java.io.FileInputStream;
@@ -29,25 +29,25 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.mina.common.ExceptionMonitor;
-import org.apache.mina.common.buffer.IoBuffer;
-import org.apache.mina.common.file.DefaultFileRegion;
-import org.apache.mina.common.future.CloseFuture;
-import org.apache.mina.common.future.DefaultCloseFuture;
-import org.apache.mina.common.future.DefaultReadFuture;
-import org.apache.mina.common.future.DefaultWriteFuture;
-import org.apache.mina.common.future.IoFutureListener;
-import org.apache.mina.common.future.ReadFuture;
-import org.apache.mina.common.future.WriteFuture;
-import org.apache.mina.common.service.AbstractIoService;
-import org.apache.mina.common.service.IoAcceptor;
-import org.apache.mina.common.service.IoProcessor;
-import org.apache.mina.common.service.IoService;
-import org.apache.mina.common.service.TransportMetadata;
-import org.apache.mina.common.write.DefaultWriteRequest;
-import org.apache.mina.common.write.WriteRequest;
-import org.apache.mina.common.write.WriteRequestQueue;
-import org.apache.mina.common.write.WriteToClosedSessionException;
+import org.apache.mina.core.ExceptionMonitor;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.file.DefaultFileRegion;
+import org.apache.mina.core.future.CloseFuture;
+import org.apache.mina.core.future.DefaultCloseFuture;
+import org.apache.mina.core.future.DefaultReadFuture;
+import org.apache.mina.core.future.DefaultWriteFuture;
+import org.apache.mina.core.future.IoFutureListener;
+import org.apache.mina.core.future.ReadFuture;
+import org.apache.mina.core.future.WriteFuture;
+import org.apache.mina.core.service.AbstractIoService;
+import org.apache.mina.core.service.IoAcceptor;
+import org.apache.mina.core.service.IoProcessor;
+import org.apache.mina.core.service.IoService;
+import org.apache.mina.core.service.TransportMetadata;
+import org.apache.mina.core.write.DefaultWriteRequest;
+import org.apache.mina.core.write.WriteRequest;
+import org.apache.mina.core.write.WriteRequestQueue;
+import org.apache.mina.core.write.WriteToClosedSessionException;
import org.apache.mina.util.CircularQueue;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSessionConfig.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSessionConfig.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSessionConfig.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSessionConfig.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.session;
+package org.apache.mina.core.session;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/session/AttributeKey.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/AttributeKey.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/session/AttributeKey.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/session/AttributeKey.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.session;
+package org.apache.mina.core.session;
import java.io.Serializable;
import java.util.Map;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/session/DefaultIoSessionDataStructureFactory.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/DefaultIoSessionDataStructureFactory.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/session/DefaultIoSessionDataStructureFactory.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/session/DefaultIoSessionDataStructureFactory.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.session;
+package org.apache.mina.core.session;
import java.util.Collections;
import java.util.HashMap;
@@ -26,8 +26,8 @@
import java.util.Queue;
import java.util.Set;
-import org.apache.mina.common.write.WriteRequest;
-import org.apache.mina.common.write.WriteRequestQueue;
+import org.apache.mina.core.write.WriteRequest;
+import org.apache.mina.core.write.WriteRequestQueue;
import org.apache.mina.util.CircularQueue;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/session/DummySession.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/DummySession.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/session/DummySession.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/session/DummySession.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.session;
+package org.apache.mina.core.session;
import java.io.IOException;
import java.net.SocketAddress;
@@ -25,20 +25,20 @@
import java.util.Set;
import java.util.concurrent.Executor;
-import org.apache.mina.common.file.FileRegion;
-import org.apache.mina.common.filterchain.DefaultIoFilterChain;
-import org.apache.mina.common.filterchain.IoFilter;
-import org.apache.mina.common.filterchain.IoFilterChain;
-import org.apache.mina.common.future.IoFuture;
-import org.apache.mina.common.service.AbstractIoAcceptor;
-import org.apache.mina.common.service.DefaultTransportMetadata;
-import org.apache.mina.common.service.IoAcceptor;
-import org.apache.mina.common.service.IoHandler;
-import org.apache.mina.common.service.IoHandlerAdapter;
-import org.apache.mina.common.service.IoProcessor;
-import org.apache.mina.common.service.IoService;
-import org.apache.mina.common.service.TransportMetadata;
-import org.apache.mina.common.write.WriteRequest;
+import org.apache.mina.core.file.FileRegion;
+import org.apache.mina.core.filterchain.DefaultIoFilterChain;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.core.filterchain.IoFilterChain;
+import org.apache.mina.core.future.IoFuture;
+import org.apache.mina.core.service.AbstractIoAcceptor;
+import org.apache.mina.core.service.DefaultTransportMetadata;
+import org.apache.mina.core.service.IoAcceptor;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.core.service.IoHandlerAdapter;
+import org.apache.mina.core.service.IoProcessor;
+import org.apache.mina.core.service.IoService;
+import org.apache.mina.core.service.TransportMetadata;
+import org.apache.mina.core.write.WriteRequest;
/**
* A dummy {@link IoSession} for unit-testing or non-network-use of
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/session/ExpiringSessionRecycler.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/ExpiringSessionRecycler.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/session/ExpiringSessionRecycler.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/session/ExpiringSessionRecycler.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.session;
+package org.apache.mina.core.session;
import java.net.SocketAddress;
import java.util.ArrayList;
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/session/IdleStatus.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/IdleStatus.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/session/IdleStatus.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/session/IdleStatus.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.session;
+package org.apache.mina.core.session;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/session/IdleStatusChecker.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/IdleStatusChecker.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/session/IdleStatusChecker.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/session/IdleStatusChecker.java Thu Jun 26 01:49:48 2008
@@ -17,17 +17,17 @@
* under the License.
*
*/
-package org.apache.mina.common.session;
+package org.apache.mina.core.session;
import java.util.Iterator;
import java.util.Set;
-import org.apache.mina.common.future.IoFuture;
-import org.apache.mina.common.future.IoFutureListener;
-import org.apache.mina.common.service.AbstractIoService;
-import org.apache.mina.common.service.IoService;
-import org.apache.mina.common.write.WriteRequest;
-import org.apache.mina.common.write.WriteTimeoutException;
+import org.apache.mina.core.future.IoFuture;
+import org.apache.mina.core.future.IoFutureListener;
+import org.apache.mina.core.service.AbstractIoService;
+import org.apache.mina.core.service.IoService;
+import org.apache.mina.core.write.WriteRequest;
+import org.apache.mina.core.write.WriteTimeoutException;
import org.apache.mina.util.ConcurrentHashSet;
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/session/IoEvent.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/IoEvent.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/session/IoEvent.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/session/IoEvent.java Thu Jun 26 01:49:48 2008
@@ -17,9 +17,9 @@
* under the License.
*
*/
-package org.apache.mina.common.session;
+package org.apache.mina.core.session;
-import org.apache.mina.common.write.WriteRequest;
+import org.apache.mina.core.write.WriteRequest;
/**
* An I/O event or an I/O request that MINA provides.
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/session/IoEventType.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/IoEventType.java?rev=671827&r1=671815&r2=671827&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/session/IoEventType.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/session/IoEventType.java Thu Jun 26 01:49:48 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.common.session;
+package org.apache.mina.core.session;
/**
* An {@link Enum} that represents the type of I/O events and requests.