Author: elecharny
Date: Tue Jun 24 03:01:11 2008
New Revision: 671110
URL: http://svn.apache.org/viewvc?rev=671110&view=rev
Log:
Reflected the changes in MINA packages.
Modified:
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/AsyncHttpClient.java
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/ConnectionPool.java
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/HttpIoHandler.java
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/HttpDecoder.java
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/HttpProtocolCodecFactory.java
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/HttpRequestEncoder.java
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/HttpResponseDecoder.java
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/proxy/ProxyFilter.java
mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/AsyncHttpClient.java
mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/HttpIoHandler.java
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/ChunkedTest.java
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/FakeIoSession.java
mina/asyncweb/trunk/client/src/test/java/org/apache/asyncweb/client/AsyncHttpClientTest.java
mina/asyncweb/trunk/client/src/test/java/org/apache/asyncweb/client/ChunkedTest.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/ChunkedBodyDecodingState.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DefaultHttpMessage.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DefaultHttpRequest.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DefaultHttpResponse.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpCodecFactory.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpCodecUtils.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpHeaderDecodingState.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestDecodingStateMachine.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestEncoder.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestLineDecodingState.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponse.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseDecodingState.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseEncoder.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseLineDecodingState.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpVersionDecodingState.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/MutableHttpMessage.java
mina/asyncweb/trunk/common/src/test/java/org/apache/asyncweb/common/integration/TomcatTest.java
mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/cookie/CookieExample.java
mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/helloworld/HelloWorldHttpService.java
mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/lightweight/HttpProtocolHandler.java
mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/session/SessionExample.java
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileHttpService.java
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/FileLoader.java
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoader.java
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoader.java
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DirectoryIndexGenerator.java
mina/asyncweb/trunk/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoaderTest.java
mina/asyncweb/trunk/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoaderTest.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceHandler.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/CSS.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/filter/GZipFilter.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/DefaultHttpIoHandler.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/HttpIoHandler.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/MinaTransport.java
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java
Modified:
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/AsyncHttpClient.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/AsyncHttpClient.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/AsyncHttpClient.java
(original)
+++
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/AsyncHttpClient.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/ConnectionPool.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
--- mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/ConnectionPool.java
(original)
+++ mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/ConnectionPool.java
Tue Jun 24 03:01:11 2008
@@ -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
Modified:
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/HttpIoHandler.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/HttpIoHandler.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
--- mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/HttpIoHandler.java
(original)
+++ mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/HttpIoHandler.java
Tue Jun 24 03:01:11 2008
@@ -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;
/**
Modified:
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/HttpDecoder.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/HttpDecoder.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/HttpDecoder.java
(original)
+++
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/HttpDecoder.java
Tue Jun 24 03:01:11 2008
@@ -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.
Modified:
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/HttpProtocolCodecFactory.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/HttpProtocolCodecFactory.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/HttpProtocolCodecFactory.java
(original)
+++
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/HttpProtocolCodecFactory.java
Tue Jun 24 03:01:11 2008
@@ -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 [EMAIL PROTECTED] HttpRequestEncoder} and [EMAIL
PROTECTED] HttpResponseDecoder} objects.
Modified:
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/HttpRequestEncoder.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/HttpRequestEncoder.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/HttpRequestEncoder.java
(original)
+++
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/HttpRequestEncoder.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/HttpResponseDecoder.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/HttpResponseDecoder.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/HttpResponseDecoder.java
(original)
+++
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/codec/HttpResponseDecoder.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/proxy/ProxyFilter.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/proxy/ProxyFilter.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/proxy/ProxyFilter.java
(original)
+++
mina/asyncweb/trunk/client/src/main/java/org/apache/ahc/proxy/ProxyFilter.java
Tue Jun 24 03:01:11 2008
@@ -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 {
Modified:
mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/AsyncHttpClient.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/AsyncHttpClient.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/AsyncHttpClient.java
(original)
+++
mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/AsyncHttpClient.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/HttpIoHandler.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/HttpIoHandler.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/HttpIoHandler.java
(original)
+++
mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/HttpIoHandler.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/ChunkedTest.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/ChunkedTest.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
--- mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/ChunkedTest.java
(original)
+++ mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/ChunkedTest.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/FakeIoSession.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/FakeIoSession.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
--- mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/FakeIoSession.java
(original)
+++ mina/asyncweb/trunk/client/src/test/java/org/apache/ahc/FakeIoSession.java
Tue Jun 24 03:01:11 2008
@@ -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 {
Modified:
mina/asyncweb/trunk/client/src/test/java/org/apache/asyncweb/client/AsyncHttpClientTest.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/test/java/org/apache/asyncweb/client/AsyncHttpClientTest.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/client/src/test/java/org/apache/asyncweb/client/AsyncHttpClientTest.java
(original)
+++
mina/asyncweb/trunk/client/src/test/java/org/apache/asyncweb/client/AsyncHttpClientTest.java
Tue Jun 24 03:01:11 2008
@@ -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 {
Modified:
mina/asyncweb/trunk/client/src/test/java/org/apache/asyncweb/client/ChunkedTest.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/test/java/org/apache/asyncweb/client/ChunkedTest.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/client/src/test/java/org/apache/asyncweb/client/ChunkedTest.java
(original)
+++
mina/asyncweb/trunk/client/src/test/java/org/apache/asyncweb/client/ChunkedTest.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/ChunkedBodyDecodingState.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/ChunkedBodyDecodingState.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/ChunkedBodyDecodingState.java
(original)
+++
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/ChunkedBodyDecodingState.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DefaultHttpMessage.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DefaultHttpMessage.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DefaultHttpMessage.java
(original)
+++
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DefaultHttpMessage.java
Tue Jun 24 03:01:11 2008
@@ -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 [EMAIL PROTECTED] MutableHttpMessage}.
Modified:
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DefaultHttpRequest.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DefaultHttpRequest.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DefaultHttpRequest.java
(original)
+++
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DefaultHttpRequest.java
Tue Jun 24 03:01:11 2008
@@ -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 [EMAIL PROTECTED] MutableHttpRequest}.
*
* @author The Apache MINA Project ([EMAIL PROTECTED])
- * @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 {
Modified:
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DefaultHttpResponse.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DefaultHttpResponse.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DefaultHttpResponse.java
(original)
+++
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DefaultHttpResponse.java
Tue Jun 24 03:01:11 2008
@@ -19,7 +19,7 @@
*/
package org.apache.asyncweb.common;
-import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.buffer.IoBuffer;
/**
Modified:
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpCodecFactory.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpCodecFactory.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpCodecFactory.java
(original)
+++
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpCodecFactory.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpCodecUtils.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpCodecUtils.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpCodecUtils.java
(original)
+++
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpCodecUtils.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpHeaderDecodingState.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpHeaderDecodingState.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpHeaderDecodingState.java
(original)
+++
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpHeaderDecodingState.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestDecodingStateMachine.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestDecodingStateMachine.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestDecodingStateMachine.java
(original)
+++
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestDecodingStateMachine.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestEncoder.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestEncoder.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestEncoder.java
(original)
+++
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestEncoder.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestLineDecodingState.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestLineDecodingState.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestLineDecodingState.java
(original)
+++
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestLineDecodingState.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponse.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponse.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponse.java
(original)
+++
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponse.java
Tue Jun 24 03:01:11 2008
@@ -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>.
Modified:
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseDecodingState.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseDecodingState.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseDecodingState.java
(original)
+++
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseDecodingState.java
Tue Jun 24 03:01:11 2008
@@ -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 ([EMAIL PROTECTED])
- * @version $Rev: 615489 $, $Date: 2008-01-26 13:59:06 -0700 (Sat, 26 Jan
2008) $
+ * @version $Rev$, $Date$
*/
abstract class HttpResponseDecodingState extends DecodingStateMachine {
Modified:
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseEncoder.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseEncoder.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseEncoder.java
(original)
+++
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseEncoder.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseLineDecodingState.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseLineDecodingState.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseLineDecodingState.java
(original)
+++
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseLineDecodingState.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpVersionDecodingState.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpVersionDecodingState.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpVersionDecodingState.java
(original)
+++
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpVersionDecodingState.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/MutableHttpMessage.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/MutableHttpMessage.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/MutableHttpMessage.java
(original)
+++
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/MutableHttpMessage.java
Tue Jun 24 03:01:11 2008
@@ -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 [EMAIL PROTECTED] HttpMessage}.
Modified:
mina/asyncweb/trunk/common/src/test/java/org/apache/asyncweb/common/integration/TomcatTest.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/test/java/org/apache/asyncweb/common/integration/TomcatTest.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/common/src/test/java/org/apache/asyncweb/common/integration/TomcatTest.java
(original)
+++
mina/asyncweb/trunk/common/src/test/java/org/apache/asyncweb/common/integration/TomcatTest.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/cookie/CookieExample.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/cookie/CookieExample.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/cookie/CookieExample.java
(original)
+++
mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/cookie/CookieExample.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/helloworld/HelloWorldHttpService.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/helloworld/HelloWorldHttpService.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/helloworld/HelloWorldHttpService.java
(original)
+++
mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/helloworld/HelloWorldHttpService.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/lightweight/HttpProtocolHandler.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/lightweight/HttpProtocolHandler.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/lightweight/HttpProtocolHandler.java
(original)
+++
mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/lightweight/HttpProtocolHandler.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/session/SessionExample.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/session/SessionExample.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/session/SessionExample.java
(original)
+++
mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/session/SessionExample.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileHttpService.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileHttpService.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileHttpService.java
(original)
+++
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileHttpService.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/FileLoader.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/FileLoader.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/FileLoader.java
(original)
+++
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/FileLoader.java
Tue Jun 24 03:01:11 2008
@@ -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.
Modified:
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoader.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoader.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoader.java
(original)
+++
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoader.java
Tue Jun 24 03:01:11 2008
@@ -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
Modified:
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoader.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoader.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoader.java
(original)
+++
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoader.java
Tue Jun 24 03:01:11 2008
@@ -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
Modified:
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java
(original)
+++
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java
Tue Jun 24 03:01:11 2008
@@ -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.
Modified:
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DirectoryIndexGenerator.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DirectoryIndexGenerator.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DirectoryIndexGenerator.java
(original)
+++
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DirectoryIndexGenerator.java
Tue Jun 24 03:01:11 2008
@@ -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.
Modified:
mina/asyncweb/trunk/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoaderTest.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoaderTest.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoaderTest.java
(original)
+++
mina/asyncweb/trunk/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoaderTest.java
Tue Jun 24 03:01:11 2008
@@ -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 {
Modified:
mina/asyncweb/trunk/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoaderTest.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoaderTest.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoaderTest.java
(original)
+++
mina/asyncweb/trunk/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoaderTest.java
Tue Jun 24 03:01:11 2008
@@ -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 {
Modified:
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceHandler.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceHandler.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceHandler.java
(original)
+++
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/HttpServiceHandler.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/CSS.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/CSS.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/CSS.java
(original)
+++
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/CSS.java
Tue Jun 24 03:01:11 2008
@@ -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
Modified:
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java
(original)
+++
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/errorReporting/StandardResponseFormatter.java
Tue Jun 24 03:01:11 2008
@@ -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;
Modified:
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/filter/GZipFilter.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/filter/GZipFilter.java?rev=671110&r1=671109&r2=671110&view=diff
==============================================================================
---
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/filter/GZipFilter.java
(original)
+++
mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/filter/GZipFilter.java
Tue Jun 24 03:01:11 2008
@@ -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;
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=671110&r1=671109&r2=671110&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
Tue Jun 24 03:01:11 2008
@@ -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;
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=671110&r1=671109&r2=671110&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
Tue Jun 24 03:01:11 2008
@@ -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;
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=671110&r1=671109&r2=671110&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
Tue Jun 24 03:01:11 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.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;
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=671110&r1=671109&r2=671110&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
Tue Jun 24 03:01:11 2008
@@ -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;
