Modified: mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/PassThruResolver.java URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/PassThruResolver.java?rev=615488&r1=615487&r2=615488&view=diff ============================================================================== --- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/PassThruResolver.java (original) +++ mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/PassThruResolver.java Sat Jan 26 12:55:05 2008 @@ -19,7 +19,7 @@ */ package org.safehaus.asyncweb.service.resolver; -import org.apache.mina.filter.codec.http.HttpRequest; +import org.apache.asyncweb.codec.HttpRequest; /** * A simple <code>ServiceResolver</code> which passes the full
Modified: mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/ServiceResolver.java URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/ServiceResolver.java?rev=615488&r1=615487&r2=615488&view=diff ============================================================================== --- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/ServiceResolver.java (original) +++ mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/ServiceResolver.java Sat Jan 26 12:55:05 2008 @@ -19,7 +19,7 @@ */ package org.safehaus.asyncweb.service.resolver; -import org.apache.mina.filter.codec.http.HttpRequest; +import org.apache.asyncweb.codec.HttpRequest; /** * Resolves the name of the <code>HttpService</code> to be used to Modified: mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/SimplePrefixResolver.java URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/SimplePrefixResolver.java?rev=615488&r1=615487&r2=615488&view=diff ============================================================================== --- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/SimplePrefixResolver.java (original) +++ mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/resolver/SimplePrefixResolver.java Sat Jan 26 12:55:05 2008 @@ -19,7 +19,7 @@ */ package org.safehaus.asyncweb.service.resolver; -import org.apache.mina.filter.codec.http.HttpRequest; +import org.apache.asyncweb.codec.HttpRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -84,7 +84,7 @@ * @return The resolved service name, or <code>null</code> if * the request is un-resolved */ - public String resolveService(HttpRequest request) { + public String resolveService( HttpRequest request) { if (request.getRequestUri() == null || request.getRequestUri().isAbsolute()) { return null; Modified: mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/CookieIdentifier.java URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/CookieIdentifier.java?rev=615488&r1=615487&r2=615488&view=diff ============================================================================== --- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/CookieIdentifier.java (original) +++ mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/CookieIdentifier.java Sat Jan 26 12:55:05 2008 @@ -19,11 +19,11 @@ */ package org.safehaus.asyncweb.service.session; -import org.apache.mina.filter.codec.http.Cookie; -import org.apache.mina.filter.codec.http.DefaultCookie; -import org.apache.mina.filter.codec.http.HttpRequest; -import org.apache.mina.filter.codec.http.MutableCookie; -import org.apache.mina.filter.codec.http.MutableHttpResponse; +import org.apache.asyncweb.codec.Cookie; +import org.apache.asyncweb.codec.DefaultCookie; +import org.apache.asyncweb.codec.HttpRequest; +import org.apache.asyncweb.codec.MutableCookie; +import org.apache.asyncweb.codec.MutableHttpResponse; /** * A <code>SessionIdentifier</code> which adds and extracts session key @@ -58,7 +58,7 @@ * @param request The request * @return The session key, or null if a session cookie was not located */ - public String getSessionKey(HttpRequest request) { + public String getSessionKey( HttpRequest request) { Cookie sessionCookie = null; for (Cookie c : request.getCookies()) { if (c.getName().equals(cookieId)) { Modified: mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/DefaultSessionAccessor.java URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/DefaultSessionAccessor.java?rev=615488&r1=615487&r2=615488&view=diff ============================================================================== --- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/DefaultSessionAccessor.java (original) +++ mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/DefaultSessionAccessor.java Sat Jan 26 12:55:05 2008 @@ -19,7 +19,7 @@ */ package org.safehaus.asyncweb.service.session; -import org.apache.mina.filter.codec.http.MutableHttpResponse; +import org.apache.asyncweb.codec.MutableHttpResponse; import org.safehaus.asyncweb.service.HttpServiceContext; import org.safehaus.asyncweb.service.HttpSession; import org.slf4j.Logger; Modified: mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionAccessor.java URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionAccessor.java?rev=615488&r1=615487&r2=615488&view=diff ============================================================================== --- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionAccessor.java (original) +++ mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionAccessor.java Sat Jan 26 12:55:05 2008 @@ -19,7 +19,7 @@ */ package org.safehaus.asyncweb.service.session; -import org.apache.mina.filter.codec.http.MutableHttpResponse; +import org.apache.asyncweb.codec.MutableHttpResponse; import org.safehaus.asyncweb.service.HttpServiceContext; import org.safehaus.asyncweb.service.HttpSession; Modified: mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionIdentifier.java URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionIdentifier.java?rev=615488&r1=615487&r2=615488&view=diff ============================================================================== --- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionIdentifier.java (original) +++ mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/session/HttpSessionIdentifier.java Sat Jan 26 12:55:05 2008 @@ -19,8 +19,8 @@ */ package org.safehaus.asyncweb.service.session; -import org.apache.mina.filter.codec.http.HttpRequest; -import org.apache.mina.filter.codec.http.MutableHttpResponse; +import org.apache.asyncweb.codec.HttpRequest; +import org.apache.asyncweb.codec.MutableHttpResponse; /** * A strategy for encoding / decoding session keys information to / from Modified: mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/SingleHttpSessionIoHandler.java URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/SingleHttpSessionIoHandler.java?rev=615488&r1=615487&r2=615488&view=diff ============================================================================== --- mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/SingleHttpSessionIoHandler.java (original) +++ mina/asyncweb/trunk/server/src/main/java/org/safehaus/asyncweb/service/transport/mina/SingleHttpSessionIoHandler.java Sat Jan 26 12:55:05 2008 @@ -31,15 +31,15 @@ import org.apache.mina.common.WriteRequest; import org.apache.mina.filter.codec.ProtocolCodecFilter; import org.apache.mina.filter.codec.ProtocolDecoderException; -import org.apache.mina.filter.codec.http.DefaultHttpRequest; -import org.apache.mina.filter.codec.http.DefaultHttpResponse; -import org.apache.mina.filter.codec.http.HttpCodecFactory; -import org.apache.mina.filter.codec.http.HttpRequest; -import org.apache.mina.filter.codec.http.HttpRequestDecoderException; -import org.apache.mina.filter.codec.http.HttpResponseStatus; -import org.apache.mina.filter.codec.http.HttpVersion; -import org.apache.mina.filter.codec.http.MutableHttpResponse; +import org.apache.asyncweb.codec.HttpRequest; +import org.apache.asyncweb.codec.HttpRequestDecoderException; +import org.apache.asyncweb.codec.HttpResponseStatus; +import org.apache.asyncweb.codec.HttpVersion; +import org.apache.asyncweb.codec.MutableHttpResponse; import org.apache.mina.handler.multiton.SingleSessionIoHandler; +import org.apache.asyncweb.codec.DefaultHttpRequest; +import org.apache.asyncweb.codec.DefaultHttpResponse; +import org.apache.asyncweb.codec.*; import org.safehaus.asyncweb.service.HttpServiceContext; import org.safehaus.asyncweb.service.HttpServiceFilter; import org.safehaus.asyncweb.service.ServiceContainer; @@ -237,7 +237,7 @@ @Override public void messageReceived(NextFilter nextFilter, IoSession session, Object message) throws Exception { - HttpRequest request = (HttpRequest) message; + HttpRequest request = ( HttpRequest ) message; HttpServiceContext context = createContext(request); currentContext = context; nextFilter.messageReceived(session, context); Modified: mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/common/DefaultHttpRequestTest.java URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/common/DefaultHttpRequestTest.java?rev=615488&r1=615487&r2=615488&view=diff ============================================================================== --- mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/common/DefaultHttpRequestTest.java (original) +++ mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/common/DefaultHttpRequestTest.java Sat Jan 26 12:55:05 2008 @@ -22,7 +22,7 @@ import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.mina.filter.codec.http.DefaultHttpRequest; +import org.apache.asyncweb.codec.DefaultHttpRequest; public class DefaultHttpRequestTest extends TestCase { public void testSetParametersFromQueryString() throws Exception { Modified: mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/DummyResolver.java URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/DummyResolver.java?rev=615488&r1=615487&r2=615488&view=diff ============================================================================== --- mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/DummyResolver.java (original) +++ mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/DummyResolver.java Sat Jan 26 12:55:05 2008 @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.mina.filter.codec.http.HttpRequest; +import org.apache.asyncweb.codec.HttpRequest; import org.safehaus.asyncweb.service.resolver.ServiceResolver; /** Modified: mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/ExactMatchURIServiceResolverTest.java URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/ExactMatchURIServiceResolverTest.java?rev=615488&r1=615487&r2=615488&view=diff ============================================================================== --- mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/ExactMatchURIServiceResolverTest.java (original) +++ mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/ExactMatchURIServiceResolverTest.java Sat Jan 26 12:55:05 2008 @@ -24,9 +24,9 @@ import junit.framework.TestCase; -import org.apache.mina.filter.codec.http.DefaultHttpRequest; -import org.apache.mina.filter.codec.http.HttpRequest; -import org.apache.mina.filter.codec.http.MutableHttpRequest; +import org.apache.asyncweb.codec.DefaultHttpRequest; +import org.apache.asyncweb.codec.HttpRequest; +import org.apache.asyncweb.codec.MutableHttpRequest; import org.safehaus.asyncweb.service.resolver.ExactMatchURIServiceResolver; /** Modified: mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/SimplePrefixResolverTest.java URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/SimplePrefixResolverTest.java?rev=615488&r1=615487&r2=615488&view=diff ============================================================================== --- mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/SimplePrefixResolverTest.java (original) +++ mina/asyncweb/trunk/server/src/test/java/org/safehaus/asyncweb/service/filter/resolver/SimplePrefixResolverTest.java Sat Jan 26 12:55:05 2008 @@ -24,9 +24,9 @@ import junit.framework.TestCase; -import org.apache.mina.filter.codec.http.DefaultHttpRequest; -import org.apache.mina.filter.codec.http.HttpRequest; -import org.apache.mina.filter.codec.http.MutableHttpRequest; +import org.apache.asyncweb.codec.DefaultHttpRequest; +import org.apache.asyncweb.codec.HttpRequest; +import org.apache.asyncweb.codec.MutableHttpRequest; import org.safehaus.asyncweb.service.resolver.SimplePrefixResolver; /**
