Reflected the changes in MINA packages.
git-svn-id: https://svn.apache.org/repos/asf/mina/asyncweb/trunk@671110 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/client/src/main/java/org/apache/ahc/AsyncHttpClient.java b/client/src/main/java/org/apache/ahc/AsyncHttpClient.java
index 4f6a649..100a848 100644
--- a/client/src/main/java/org/apache/ahc/AsyncHttpClient.java
+++ b/client/src/main/java/org/apache/ahc/AsyncHttpClient.java
@@ -39,12 +39,12 @@
import org.apache.ahc.util.MonitoringEvent;
import org.apache.ahc.util.MonitoringListener;
import org.apache.asyncweb.common.HttpMethod;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.DefaultConnectFuture;
-import org.apache.mina.common.IoFutureListener;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.common.future.DefaultConnectFuture;
+import org.apache.mina.common.future.IoFutureListener;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.common.RuntimeIoException;
-import org.apache.mina.common.SimpleIoProcessorPool;
+import org.apache.mina.common.service.SimpleIoProcessorPool;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.executor.ExecutorFilter;
import org.apache.mina.filter.ssl.SslFilter;
diff --git a/client/src/main/java/org/apache/ahc/ConnectionPool.java b/client/src/main/java/org/apache/ahc/ConnectionPool.java
index e14ece5..48235f4 100644
--- a/client/src/main/java/org/apache/ahc/ConnectionPool.java
+++ b/client/src/main/java/org/apache/ahc/ConnectionPool.java
@@ -26,7 +26,7 @@
import java.util.concurrent.ConcurrentMap;
import org.apache.ahc.codec.HttpRequestMessage;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.session.IoSession;
/**
* Facilitates support for connection pooling by storing IoSession instances
diff --git a/client/src/main/java/org/apache/ahc/HttpIoHandler.java b/client/src/main/java/org/apache/ahc/HttpIoHandler.java
index 831e470..b7995de 100644
--- a/client/src/main/java/org/apache/ahc/HttpIoHandler.java
+++ b/client/src/main/java/org/apache/ahc/HttpIoHandler.java
@@ -31,9 +31,9 @@
import org.apache.ahc.util.MonitoringEvent;
import org.apache.ahc.util.NameValuePair;
import org.apache.asyncweb.common.HttpMethod;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.session.IdleStatus;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IoSession;
/**
diff --git a/client/src/main/java/org/apache/ahc/codec/HttpDecoder.java b/client/src/main/java/org/apache/ahc/codec/HttpDecoder.java
index e2ebe1d..b280fce 100644
--- a/client/src/main/java/org/apache/ahc/codec/HttpDecoder.java
+++ b/client/src/main/java/org/apache/ahc/codec/HttpDecoder.java
@@ -28,7 +28,7 @@
import org.apache.asyncweb.common.Cookie;
import org.apache.asyncweb.common.DefaultCookie;
import org.apache.asyncweb.common.MutableCookie;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
/**
* Utility class for helping to decode the HTTP Protocol.
diff --git a/client/src/main/java/org/apache/ahc/codec/HttpProtocolCodecFactory.java b/client/src/main/java/org/apache/ahc/codec/HttpProtocolCodecFactory.java
index 13878f1..42f6358 100644
--- a/client/src/main/java/org/apache/ahc/codec/HttpProtocolCodecFactory.java
+++ b/client/src/main/java/org/apache/ahc/codec/HttpProtocolCodecFactory.java
@@ -22,7 +22,7 @@
import org.apache.mina.filter.codec.ProtocolCodecFactory;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolEncoder;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.session.IoSession;
/**
* A factory for creating {@link HttpRequestEncoder} and {@link HttpResponseDecoder} objects.
diff --git a/client/src/main/java/org/apache/ahc/codec/HttpRequestEncoder.java b/client/src/main/java/org/apache/ahc/codec/HttpRequestEncoder.java
index a2984e0..36e912a 100644
--- a/client/src/main/java/org/apache/ahc/codec/HttpRequestEncoder.java
+++ b/client/src/main/java/org/apache/ahc/codec/HttpRequestEncoder.java
@@ -34,8 +34,8 @@
import org.apache.ahc.util.NameValuePair;
import org.apache.asyncweb.common.Cookie;
import org.apache.asyncweb.common.HttpMethod;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.session.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
diff --git a/client/src/main/java/org/apache/ahc/codec/HttpResponseDecoder.java b/client/src/main/java/org/apache/ahc/codec/HttpResponseDecoder.java
index 15c1c97..84b3e65 100644
--- a/client/src/main/java/org/apache/ahc/codec/HttpResponseDecoder.java
+++ b/client/src/main/java/org/apache/ahc/codec/HttpResponseDecoder.java
@@ -21,8 +21,8 @@
import org.apache.ahc.HttpIoHandler;
import org.apache.ahc.util.NeedMoreDataException;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.session.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
diff --git a/client/src/main/java/org/apache/ahc/proxy/ProxyFilter.java b/client/src/main/java/org/apache/ahc/proxy/ProxyFilter.java
index 4c0d369..5b7abff 100644
--- a/client/src/main/java/org/apache/ahc/proxy/ProxyFilter.java
+++ b/client/src/main/java/org/apache/ahc/proxy/ProxyFilter.java
@@ -5,9 +5,9 @@
import org.apache.ahc.auth.UsernamePasswordCredentials;
import org.apache.ahc.codec.HttpRequestMessage;
import org.apache.ahc.codec.HttpResponseMessage;
-import org.apache.mina.common.IoFilterAdapter;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.WriteRequest;
+import org.apache.mina.common.filterchain.IoFilterAdapter;
+import org.apache.mina.common.session.IoSession;
+import org.apache.mina.common.write.WriteRequest;
import org.apache.mina.filter.ssl.SslFilter;
public class ProxyFilter extends IoFilterAdapter {
diff --git a/client/src/main/java/org/apache/asyncweb/client/AsyncHttpClient.java b/client/src/main/java/org/apache/asyncweb/client/AsyncHttpClient.java
index 588769a..39248ab 100644
--- a/client/src/main/java/org/apache/asyncweb/client/AsyncHttpClient.java
+++ b/client/src/main/java/org/apache/asyncweb/client/AsyncHttpClient.java
@@ -29,8 +29,8 @@
import org.apache.asyncweb.common.HttpCodecFactory;
import org.apache.asyncweb.common.HttpRequest;
import org.apache.asyncweb.common.MutableHttpRequest;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.future.ConnectFuture;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.ssl.SslFilter;
import org.apache.mina.transport.socket.SocketConnector;
diff --git a/client/src/main/java/org/apache/asyncweb/client/HttpIoHandler.java b/client/src/main/java/org/apache/asyncweb/client/HttpIoHandler.java
index 5d46ee0..ecab78a 100644
--- a/client/src/main/java/org/apache/asyncweb/client/HttpIoHandler.java
+++ b/client/src/main/java/org/apache/asyncweb/client/HttpIoHandler.java
@@ -20,8 +20,8 @@
package org.apache.asyncweb.client;
import org.apache.asyncweb.common.HttpResponse;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IoSession;
public class HttpIoHandler extends IoHandlerAdapter {
private AsyncHttpClientCallback callback;
diff --git a/client/src/test/java/org/apache/ahc/ChunkedTest.java b/client/src/test/java/org/apache/ahc/ChunkedTest.java
index eb21109..de4b338 100644
--- a/client/src/test/java/org/apache/ahc/ChunkedTest.java
+++ b/client/src/test/java/org/apache/ahc/ChunkedTest.java
@@ -22,8 +22,8 @@
import junit.framework.TestCase;
import org.apache.ahc.codec.HttpResponseDecoder;
import org.apache.ahc.codec.HttpResponseMessage;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.session.IoSession;
import java.util.Arrays;
diff --git a/client/src/test/java/org/apache/ahc/FakeIoSession.java b/client/src/test/java/org/apache/ahc/FakeIoSession.java
index 879d635..0e404a8 100644
--- a/client/src/test/java/org/apache/ahc/FakeIoSession.java
+++ b/client/src/test/java/org/apache/ahc/FakeIoSession.java
@@ -26,7 +26,21 @@
import java.util.Map;
import java.util.Set;
-import org.apache.mina.common.*;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.file.FileRegion;
+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.DefaultTransportMetadata;
+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.TrafficMask;
+import org.apache.mina.common.session.IoSessionConfig;
+import org.apache.mina.common.write.WriteRequest;
import org.apache.mina.transport.socket.SocketSessionConfig;
public class FakeIoSession implements IoSession {
diff --git a/client/src/test/java/org/apache/asyncweb/client/AsyncHttpClientTest.java b/client/src/test/java/org/apache/asyncweb/client/AsyncHttpClientTest.java
index 9f33c3f..e61b08e 100644
--- a/client/src/test/java/org/apache/asyncweb/client/AsyncHttpClientTest.java
+++ b/client/src/test/java/org/apache/asyncweb/client/AsyncHttpClientTest.java
@@ -29,7 +29,7 @@
import org.apache.asyncweb.common.HttpRequest;
import org.apache.asyncweb.common.HttpResponse;
import org.apache.asyncweb.common.MutableHttpRequest;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
public class AsyncHttpClientTest extends AbstractTest {
diff --git a/client/src/test/java/org/apache/asyncweb/client/ChunkedTest.java b/client/src/test/java/org/apache/asyncweb/client/ChunkedTest.java
index 22a72da..4c0f836 100644
--- a/client/src/test/java/org/apache/asyncweb/client/ChunkedTest.java
+++ b/client/src/test/java/org/apache/asyncweb/client/ChunkedTest.java
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolCodecSession;
import org.apache.asyncweb.common.HttpResponse;
import org.apache.asyncweb.common.HttpResponseDecoder;
diff --git a/common/src/main/java/org/apache/asyncweb/common/ChunkedBodyDecodingState.java b/common/src/main/java/org/apache/asyncweb/common/ChunkedBodyDecodingState.java
index 3663556..9ac7fc4 100644
--- a/common/src/main/java/org/apache/asyncweb/common/ChunkedBodyDecodingState.java
+++ b/common/src/main/java/org/apache/asyncweb/common/ChunkedBodyDecodingState.java
@@ -21,7 +21,7 @@
import java.nio.charset.CharsetDecoder;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.statemachine.ConsumeToDynamicTerminatorDecodingState;
import org.apache.mina.filter.codec.statemachine.CrLfDecodingState;
diff --git a/common/src/main/java/org/apache/asyncweb/common/DefaultHttpMessage.java b/common/src/main/java/org/apache/asyncweb/common/DefaultHttpMessage.java
index cba001e..c42499a 100644
--- a/common/src/main/java/org/apache/asyncweb/common/DefaultHttpMessage.java
+++ b/common/src/main/java/org/apache/asyncweb/common/DefaultHttpMessage.java
@@ -28,7 +28,7 @@
import java.util.TreeMap;
import java.util.TreeSet;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
/**
* A default implementation of {@link MutableHttpMessage}.
diff --git a/common/src/main/java/org/apache/asyncweb/common/DefaultHttpRequest.java b/common/src/main/java/org/apache/asyncweb/common/DefaultHttpRequest.java
index 332ab47..8af1a48 100644
--- a/common/src/main/java/org/apache/asyncweb/common/DefaultHttpRequest.java
+++ b/common/src/main/java/org/apache/asyncweb/common/DefaultHttpRequest.java
@@ -37,13 +37,13 @@
import java.util.StringTokenizer;
import java.util.TimeZone;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
/**
* A default implementation of {@link MutableHttpRequest}.
*
* @author The Apache MINA Project (dev@mina.apache.org)
- * @version $Rev: 615489 $, $Date: 2008-01-26 13:59:06 -0700 (Sat, 26 Jan 2008) $
+ * @version $Rev$, $Date$
*/
public class DefaultHttpRequest extends DefaultHttpMessage implements
MutableHttpRequest {
diff --git a/common/src/main/java/org/apache/asyncweb/common/DefaultHttpResponse.java b/common/src/main/java/org/apache/asyncweb/common/DefaultHttpResponse.java
index 6ed4f77..e40f855 100644
--- a/common/src/main/java/org/apache/asyncweb/common/DefaultHttpResponse.java
+++ b/common/src/main/java/org/apache/asyncweb/common/DefaultHttpResponse.java
@@ -19,7 +19,7 @@
*/
package org.apache.asyncweb.common;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
/**
diff --git a/common/src/main/java/org/apache/asyncweb/common/HttpCodecFactory.java b/common/src/main/java/org/apache/asyncweb/common/HttpCodecFactory.java
index 211d502..f9eb8c7 100644
--- a/common/src/main/java/org/apache/asyncweb/common/HttpCodecFactory.java
+++ b/common/src/main/java/org/apache/asyncweb/common/HttpCodecFactory.java
@@ -20,8 +20,8 @@
package org.apache.asyncweb.common;
-import org.apache.mina.common.IoAcceptor;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.service.IoAcceptor;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFactory;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolEncoder;
diff --git a/common/src/main/java/org/apache/asyncweb/common/HttpCodecUtils.java b/common/src/main/java/org/apache/asyncweb/common/HttpCodecUtils.java
index 448a44f..85ddfa7 100644
--- a/common/src/main/java/org/apache/asyncweb/common/HttpCodecUtils.java
+++ b/common/src/main/java/org/apache/asyncweb/common/HttpCodecUtils.java
@@ -26,7 +26,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/common/src/main/java/org/apache/asyncweb/common/HttpHeaderDecodingState.java b/common/src/main/java/org/apache/asyncweb/common/HttpHeaderDecodingState.java
index 4c7874b..a081cfb 100644
--- a/common/src/main/java/org/apache/asyncweb/common/HttpHeaderDecodingState.java
+++ b/common/src/main/java/org/apache/asyncweb/common/HttpHeaderDecodingState.java
@@ -25,7 +25,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.statemachine.ConsumeToCrLfDecodingState;
import org.apache.mina.filter.codec.statemachine.ConsumeToTerminatorDecodingState;
diff --git a/common/src/main/java/org/apache/asyncweb/common/HttpRequestDecodingStateMachine.java b/common/src/main/java/org/apache/asyncweb/common/HttpRequestDecodingStateMachine.java
index 828e9ff..9bb46c5 100644
--- a/common/src/main/java/org/apache/asyncweb/common/HttpRequestDecodingStateMachine.java
+++ b/common/src/main/java/org/apache/asyncweb/common/HttpRequestDecodingStateMachine.java
@@ -23,7 +23,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.statemachine.CrLfDecodingState;
diff --git a/common/src/main/java/org/apache/asyncweb/common/HttpRequestEncoder.java b/common/src/main/java/org/apache/asyncweb/common/HttpRequestEncoder.java
index d2e4897..eff0a2f 100644
--- a/common/src/main/java/org/apache/asyncweb/common/HttpRequestEncoder.java
+++ b/common/src/main/java/org/apache/asyncweb/common/HttpRequestEncoder.java
@@ -22,8 +22,8 @@
import java.net.URI;
import java.nio.charset.CharsetEncoder;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
diff --git a/common/src/main/java/org/apache/asyncweb/common/HttpRequestLineDecodingState.java b/common/src/main/java/org/apache/asyncweb/common/HttpRequestLineDecodingState.java
index 8f26964..2c5c283 100644
--- a/common/src/main/java/org/apache/asyncweb/common/HttpRequestLineDecodingState.java
+++ b/common/src/main/java/org/apache/asyncweb/common/HttpRequestLineDecodingState.java
@@ -22,7 +22,7 @@
import java.net.URI;
import java.nio.charset.CharsetDecoder;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.statemachine.ConsumeToLinearWhitespaceDecodingState;
import org.apache.mina.filter.codec.statemachine.CrLfDecodingState;
diff --git a/common/src/main/java/org/apache/asyncweb/common/HttpResponse.java b/common/src/main/java/org/apache/asyncweb/common/HttpResponse.java
index c2dc9d0..3cca89f 100644
--- a/common/src/main/java/org/apache/asyncweb/common/HttpResponse.java
+++ b/common/src/main/java/org/apache/asyncweb/common/HttpResponse.java
@@ -22,7 +22,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
/**
* Represents a response to an <code>HttpRequest</code>.
diff --git a/common/src/main/java/org/apache/asyncweb/common/HttpResponseDecodingState.java b/common/src/main/java/org/apache/asyncweb/common/HttpResponseDecodingState.java
index 6328d73..4b04980 100644
--- a/common/src/main/java/org/apache/asyncweb/common/HttpResponseDecodingState.java
+++ b/common/src/main/java/org/apache/asyncweb/common/HttpResponseDecodingState.java
@@ -22,7 +22,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.statemachine.ConsumeToEndOfSessionDecodingState;
@@ -47,7 +47,7 @@
* each new parse.
*
* @author The Apache MINA Project (dev@mina.apache.org)
- * @version $Rev: 615489 $, $Date: 2008-01-26 13:59:06 -0700 (Sat, 26 Jan 2008) $
+ * @version $Rev$, $Date$
*/
abstract class HttpResponseDecodingState extends DecodingStateMachine {
diff --git a/common/src/main/java/org/apache/asyncweb/common/HttpResponseEncoder.java b/common/src/main/java/org/apache/asyncweb/common/HttpResponseEncoder.java
index 8fd504c..9e5f4f8 100644
--- a/common/src/main/java/org/apache/asyncweb/common/HttpResponseEncoder.java
+++ b/common/src/main/java/org/apache/asyncweb/common/HttpResponseEncoder.java
@@ -22,8 +22,8 @@
import java.nio.charset.CharacterCodingException;
import java.nio.charset.CharsetEncoder;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoder;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
diff --git a/common/src/main/java/org/apache/asyncweb/common/HttpResponseLineDecodingState.java b/common/src/main/java/org/apache/asyncweb/common/HttpResponseLineDecodingState.java
index e385a20..692a32b 100644
--- a/common/src/main/java/org/apache/asyncweb/common/HttpResponseLineDecodingState.java
+++ b/common/src/main/java/org/apache/asyncweb/common/HttpResponseLineDecodingState.java
@@ -21,7 +21,7 @@
import java.nio.charset.CharsetDecoder;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.statemachine.ConsumeToCrLfDecodingState;
import org.apache.mina.filter.codec.statemachine.ConsumeToLinearWhitespaceDecodingState;
diff --git a/common/src/main/java/org/apache/asyncweb/common/HttpVersionDecodingState.java b/common/src/main/java/org/apache/asyncweb/common/HttpVersionDecodingState.java
index cf3bc10..a648615 100644
--- a/common/src/main/java/org/apache/asyncweb/common/HttpVersionDecodingState.java
+++ b/common/src/main/java/org/apache/asyncweb/common/HttpVersionDecodingState.java
@@ -22,7 +22,7 @@
import java.nio.charset.CharacterCodingException;
import java.nio.charset.CharsetDecoder;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.statemachine.ConsumeToDynamicTerminatorDecodingState;
diff --git a/common/src/main/java/org/apache/asyncweb/common/MutableHttpMessage.java b/common/src/main/java/org/apache/asyncweb/common/MutableHttpMessage.java
index 6233e7e..b2302a7 100644
--- a/common/src/main/java/org/apache/asyncweb/common/MutableHttpMessage.java
+++ b/common/src/main/java/org/apache/asyncweb/common/MutableHttpMessage.java
@@ -23,7 +23,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
/**
* A mutable {@link HttpMessage}.
diff --git a/common/src/test/java/org/apache/asyncweb/common/integration/TomcatTest.java b/common/src/test/java/org/apache/asyncweb/common/integration/TomcatTest.java
index cbb41c6..79ca2b1 100644
--- a/common/src/test/java/org/apache/asyncweb/common/integration/TomcatTest.java
+++ b/common/src/test/java/org/apache/asyncweb/common/integration/TomcatTest.java
@@ -13,9 +13,9 @@
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.core.StandardHost;
import org.apache.catalina.startup.Embedded;
-import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoHandlerAdapter;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.service.IoConnector;
+import org.apache.mina.common.service.IoHandlerAdapter;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.transport.socket.SocketConnector;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
diff --git a/examples/src/main/java/org/apache/asyncweb/examples/cookie/CookieExample.java b/examples/src/main/java/org/apache/asyncweb/examples/cookie/CookieExample.java
index 53d4d28..4ad0b88 100644
--- a/examples/src/main/java/org/apache/asyncweb/examples/cookie/CookieExample.java
+++ b/examples/src/main/java/org/apache/asyncweb/examples/cookie/CookieExample.java
@@ -23,12 +23,12 @@
import java.io.StringWriter;
import java.nio.charset.Charset;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.asyncweb.common.HttpRequest;
import org.apache.asyncweb.common.MutableCookie;
import org.apache.asyncweb.common.MutableHttpResponse;
import org.apache.asyncweb.common.DefaultCookie;
import org.apache.asyncweb.common.DefaultHttpResponse;
-import org.apache.asyncweb.common.*;
import org.apache.asyncweb.server.HttpService;
import org.apache.asyncweb.server.HttpServiceContext;
diff --git a/examples/src/main/java/org/apache/asyncweb/examples/helloworld/HelloWorldHttpService.java b/examples/src/main/java/org/apache/asyncweb/examples/helloworld/HelloWorldHttpService.java
index 19eb398..7aaafea 100644
--- a/examples/src/main/java/org/apache/asyncweb/examples/helloworld/HelloWorldHttpService.java
+++ b/examples/src/main/java/org/apache/asyncweb/examples/helloworld/HelloWorldHttpService.java
@@ -27,7 +27,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
import org.apache.asyncweb.common.HttpRequest;
import org.apache.asyncweb.common.HttpResponseStatus;
import org.apache.asyncweb.common.MutableHttpResponse;
diff --git a/examples/src/main/java/org/apache/asyncweb/examples/lightweight/HttpProtocolHandler.java b/examples/src/main/java/org/apache/asyncweb/examples/lightweight/HttpProtocolHandler.java
index 11ff7eb..18498dc 100644
--- a/examples/src/main/java/org/apache/asyncweb/examples/lightweight/HttpProtocolHandler.java
+++ b/examples/src/main/java/org/apache/asyncweb/examples/lightweight/HttpProtocolHandler.java
@@ -25,12 +25,12 @@
import java.util.TimerTask;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoBuffer;
-import org.apache.mina.common.IoFutureListener;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.WriteFuture;
+import org.apache.mina.common.session.IdleStatus;
+import org.apache.mina.common.buffer.IoBuffer;
+import org.apache.mina.common.future.IoFutureListener;
+import org.apache.mina.common.service.IoHandler;
+import org.apache.mina.common.session.IoSession;
+import org.apache.mina.common.future.WriteFuture;
import org.apache.asyncweb.common.HttpRequest;
import org.apache.asyncweb.common.HttpResponseStatus;
import org.apache.asyncweb.common.MutableHttpResponse;
diff --git a/examples/src/main/java/org/apache/asyncweb/examples/session/SessionExample.java b/examples/src/main/java/org/apache/asyncweb/examples/session/SessionExample.java
index 0561d4b..4836d3b 100644
--- a/examples/src/main/java/org/apache/asyncweb/examples/session/SessionExample.java
+++ b/examples/src/main/java/org/apache/asyncweb/examples/session/SessionExample.java
@@ -23,7 +23,7 @@
import java.io.StringWriter;
import java.nio.charset.Charset;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
import org.apache.asyncweb.common.DefaultHttpResponse;
import org.apache.asyncweb.common.MutableHttpResponse;
import org.apache.asyncweb.server.HttpService;
diff --git a/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileHttpService.java b/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileHttpService.java
index 41b4910..300a00e 100644
--- a/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileHttpService.java
+++ b/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileHttpService.java
@@ -38,7 +38,7 @@
import org.apache.asyncweb.fileservice.mimetype.MimeMap;
import org.apache.asyncweb.server.HttpService;
import org.apache.asyncweb.server.HttpServiceContext;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/FileLoader.java b/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/FileLoader.java
index 0456980..66e471f 100644
--- a/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/FileLoader.java
+++ b/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/FileLoader.java
@@ -23,7 +23,7 @@
import java.io.File;
import java.io.IOException;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
/**
* Interface for providing IoBuffer to File serving services.
diff --git a/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoader.java b/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoader.java
index 1a70328..73f7ac2 100644
--- a/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoader.java
+++ b/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoader.java
@@ -25,7 +25,7 @@
import java.nio.MappedByteBuffer;
import java.nio.channels.FileChannel;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
/**
* A file loader, mammping files to memory, supposed to be efficient
diff --git a/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoader.java b/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoader.java
index 490a15c..f941e73 100644
--- a/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoader.java
+++ b/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoader.java
@@ -25,7 +25,7 @@
import java.nio.channels.FileChannel;
import java.security.InvalidParameterException;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
/**
* A simple file loader, supposed to be efficient on relativly small
diff --git a/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java b/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java
index c8d9786..0af3b4f 100644
--- a/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java
+++ b/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java
@@ -26,7 +26,7 @@
import java.util.ResourceBundle;
import org.apache.asyncweb.fileservice.mimetype.MimeMap;
import org.apache.asyncweb.server.errorReporting.CSS;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
/**
* A simply directory index page generator, generating page in the error page style.
diff --git a/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DirectoryIndexGenerator.java b/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DirectoryIndexGenerator.java
index 99751d6..2af4c01 100644
--- a/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DirectoryIndexGenerator.java
+++ b/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DirectoryIndexGenerator.java
@@ -21,7 +21,7 @@
import java.io.File;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
/**
* Directory index page generator.
diff --git a/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoaderTest.java b/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoaderTest.java
index 77481b4..8ec295e 100644
--- a/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoaderTest.java
+++ b/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoaderTest.java
@@ -8,7 +8,7 @@
import org.apache.asyncweb.fileservice.fileloader.FileLoader;
import org.apache.asyncweb.fileservice.fileloader.MmapFileLoader;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
import org.junit.Test;
public class MmapFileLoaderTest {
diff --git a/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoaderTest.java b/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoaderTest.java
index d2c1c2f..e69a2b6 100644
--- a/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoaderTest.java
+++ b/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoaderTest.java
@@ -7,7 +7,7 @@
import java.util.Random;
import org.apache.asyncweb.fileservice.fileloader.SimpleFileLoader;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
import org.junit.Test;
public class SimpleFileLoaderTest {
diff --git a/server/src/main/java/org/apache/asyncweb/server/HttpServiceHandler.java b/server/src/main/java/org/apache/asyncweb/server/HttpServiceHandler.java
index 58e00d4..1220ead 100644
--- a/server/src/main/java/org/apache/asyncweb/server/HttpServiceHandler.java
+++ b/server/src/main/java/org/apache/asyncweb/server/HttpServiceHandler.java
@@ -23,7 +23,7 @@
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.mina.common.IoFilter;
+import org.apache.mina.common.filterchain.IoFilter;
import org.apache.asyncweb.common.HttpResponseStatus;
import org.apache.asyncweb.common.MutableHttpResponse;
import org.apache.asyncweb.common.DefaultHttpResponse;
diff --git a/server/src/main/java/org/apache/asyncweb/server/errorReporting/CSS.java b/server/src/main/java/org/apache/asyncweb/server/errorReporting/CSS.java
index d82685a..70a4d1c 100644
--- a/server/src/main/java/org/apache/asyncweb/server/errorReporting/CSS.java
+++ b/server/src/main/java/org/apache/asyncweb/server/errorReporting/CSS.java
@@ -21,7 +21,7 @@
import java.io.UnsupportedEncodingException;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
/**
* Manages the stylesheet info used for generated pages
diff --git a/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java b/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java
index f46886e..7e68885 100644
--- a/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java
+++ b/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java
@@ -23,7 +23,7 @@
import java.text.MessageFormat;
import java.util.ResourceBundle;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
import org.apache.asyncweb.common.MutableHttpResponse;
import org.apache.asyncweb.common.HttpResponseStatus.Category;
import org.apache.asyncweb.common.HttpRequest;
diff --git a/server/src/main/java/org/apache/asyncweb/server/filter/GZipFilter.java b/server/src/main/java/org/apache/asyncweb/server/filter/GZipFilter.java
index c2780e8..c0c67fd 100644
--- a/server/src/main/java/org/apache/asyncweb/server/filter/GZipFilter.java
+++ b/server/src/main/java/org/apache/asyncweb/server/filter/GZipFilter.java
@@ -25,7 +25,7 @@
import org.apache.asyncweb.common.MutableHttpResponse;
import org.apache.asyncweb.server.HttpServiceContext;
import org.apache.asyncweb.server.HttpServiceFilter;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/server/src/main/java/org/apache/asyncweb/server/transport/mina/DefaultHttpIoHandler.java b/server/src/main/java/org/apache/asyncweb/server/transport/mina/DefaultHttpIoHandler.java
index d21fff2..1444e69 100644
--- a/server/src/main/java/org/apache/asyncweb/server/transport/mina/DefaultHttpIoHandler.java
+++ b/server/src/main/java/org/apache/asyncweb/server/transport/mina/DefaultHttpIoHandler.java
@@ -20,7 +20,7 @@
package org.apache.asyncweb.server.transport.mina;
-import org.apache.mina.common.IoSession;
+import org.apache.mina.common.session.IoSession;
import org.apache.mina.handler.multiton.SingleSessionIoHandler;
import org.apache.mina.handler.multiton.SingleSessionIoHandlerDelegate;
import org.apache.mina.handler.multiton.SingleSessionIoHandlerFactory;
diff --git a/server/src/main/java/org/apache/asyncweb/server/transport/mina/HttpIoHandler.java b/server/src/main/java/org/apache/asyncweb/server/transport/mina/HttpIoHandler.java
index 2ac81fe..4f66977 100644
--- a/server/src/main/java/org/apache/asyncweb/server/transport/mina/HttpIoHandler.java
+++ b/server/src/main/java/org/apache/asyncweb/server/transport/mina/HttpIoHandler.java
@@ -20,7 +20,7 @@
package org.apache.asyncweb.server.transport.mina;
-import org.apache.mina.common.IoHandler;
+import org.apache.mina.common.service.IoHandler;
import org.apache.asyncweb.server.ServiceContainer;
diff --git a/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java b/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java
index c33adf5..5927b75 100644
--- a/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java
+++ b/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java
@@ -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.DefaultIoFilterChainBuilder;
-import org.apache.mina.common.IoEventType;
+import org.apache.mina.common.filterchain.DefaultIoFilterChainBuilder;
+import org.apache.mina.common.session.IoEventType;
import org.apache.mina.filter.executor.ExecutorFilter;
import org.apache.mina.filter.executor.OrderedThreadPoolExecutor;
import org.apache.mina.filter.logging.LogLevel;
diff --git a/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java b/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java
index 43fc388..bad012c 100644
--- a/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java
+++ b/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java
@@ -23,13 +23,13 @@
import java.io.IOException;
import java.net.InetSocketAddress;
-import org.apache.mina.common.DefaultWriteRequest;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoFilterAdapter;
-import org.apache.mina.common.IoFutureListener;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.WriteFuture;
-import org.apache.mina.common.WriteRequest;
+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.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.asyncweb.common.HttpRequest;
