You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by jv...@apache.org on 2008/07/03 22:29:00 UTC
svn commit: r673790 - in /mina/asyncweb/trunk:
client/src/main/java/org/apache/asyncweb/client/
client/src/test/java/org/apache/asyncweb/client/
common/src/main/java/org/apache/asyncweb/common/
common/src/main/java/org/apache/asyncweb/common/codec/ com...
Author: jvermillard
Date: Thu Jul 3 13:28:58 2008
New Revision: 673790
URL: http://svn.apache.org/viewvc?rev=673790&view=rev
Log:
Moved all the codec related classes from o.a.asynweb.common to o.a.asynweb.common.codec
Added:
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/ChunkedBodyDecodingState.java
- copied, changed from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/ChunkedBodyDecodingState.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/DateParseException.java
- copied, changed from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DateParseException.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/DateUtil.java
- copied, changed from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DateUtil.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpCodecFactory.java
- copied, changed from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpCodecFactory.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpCodecUtils.java
- copied, changed from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpCodecUtils.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpHeaderDecodingState.java
- copied, changed from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpHeaderDecodingState.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpRequestDecoder.java
- copied, changed from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestDecoder.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpRequestDecoderException.java
- copied, changed from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestDecoderException.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpRequestDecodingStateMachine.java
- copied, changed from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestDecodingStateMachine.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpRequestEncoder.java
- copied, changed from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestEncoder.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpRequestLineDecodingState.java
- copied, changed from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestLineDecodingState.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpResponseDecoder.java
- copied, changed from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseDecoder.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpResponseDecodingState.java
- copied, changed from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseDecodingState.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpResponseEncoder.java
- copied, changed from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseEncoder.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpResponseLineDecodingState.java
- copied, changed from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseLineDecodingState.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpVersionDecodingState.java
- copied, changed from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpVersionDecodingState.java
Removed:
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/ChunkedBodyDecodingState.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DateParseException.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DateUtil.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/HttpRequestDecoder.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestDecoderException.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/HttpResponseDecoder.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
Modified:
mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/AsyncHttpClient.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/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/HttpDateFormat.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpMessage.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequest.java
mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponse.java
mina/asyncweb/trunk/common/src/test/java/org/apache/asyncweb/common/HttpResponseDecoderTest.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/lightweight/Main.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/asyncweb/client/AsyncHttpClient.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/client/src/main/java/org/apache/asyncweb/client/AsyncHttpClient.java?rev=673790&r1=673789&r2=673790&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 Thu Jul 3 13:28:58 2008
@@ -26,9 +26,9 @@
import javax.net.ssl.SSLContext;
-import org.apache.asyncweb.common.HttpCodecFactory;
import org.apache.asyncweb.common.HttpRequest;
import org.apache.asyncweb.common.MutableHttpRequest;
+import org.apache.asyncweb.common.codec.HttpCodecFactory;
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
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=673790&r1=673789&r2=673790&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 Thu Jul 3 13:28:58 2008
@@ -24,7 +24,7 @@
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolCodecSession;
import org.apache.asyncweb.common.HttpResponse;
-import org.apache.asyncweb.common.HttpResponseDecoder;
+import org.apache.asyncweb.common.codec.HttpResponseDecoder;
public class ChunkedTest extends TestCase {
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=673790&r1=673789&r2=673790&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 Thu Jul 3 13:28:58 2008
@@ -28,6 +28,7 @@
import java.util.TreeMap;
import java.util.TreeSet;
+import org.apache.asyncweb.common.codec.HttpCodecUtils;
import org.apache.mina.core.buffer.IoBuffer;
/**
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=673790&r1=673789&r2=673790&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 Thu Jul 3 13:28:58 2008
@@ -37,6 +37,7 @@
import java.util.StringTokenizer;
import java.util.TimeZone;
+import org.apache.asyncweb.common.codec.HttpCodecUtils;
import org.apache.mina.core.buffer.IoBuffer;
/**
Modified: mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpDateFormat.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpDateFormat.java?rev=673790&r1=673789&r2=673790&view=diff
==============================================================================
--- mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpDateFormat.java (original)
+++ mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpDateFormat.java Thu Jul 3 13:28:58 2008
@@ -24,6 +24,8 @@
import java.util.Locale;
import java.util.TimeZone;
+import org.apache.asyncweb.common.codec.HttpCodecUtils;
+
/**
* Utility for generating date strings in the format required by HTTP.
*
Modified: mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpMessage.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpMessage.java?rev=673790&r1=673789&r2=673790&view=diff
==============================================================================
--- mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpMessage.java (original)
+++ mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpMessage.java Thu Jul 3 13:28:58 2008
@@ -24,6 +24,8 @@
import java.util.Map;
import java.util.Set;
+import org.apache.mina.core.buffer.IoBuffer;
+
/**
* Base message type of {@link HttpRequest} and {@link HttpResponse}.
*
@@ -38,7 +40,7 @@
HttpVersion getProtocolVersion();
/**
- * Gets the <tt>Content-Type</tt> header of the request.
+ * Gets the <tt>Content-Type</tt> header of the message.
* @return The content type.
*/
String getContentType();
@@ -78,6 +80,7 @@
/**
* Returns the content of the request body.
+ * @return the data contained in the message in the form of a buffer of bytes
*/
- Object getContent();
+ IoBuffer getContent();
}
\ No newline at end of file
Modified: mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequest.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequest.java?rev=673790&r1=673789&r2=673790&view=diff
==============================================================================
--- mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequest.java (original)
+++ mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequest.java Thu Jul 3 13:28:58 2008
@@ -79,10 +79,10 @@
* Otherwise, the connection is only kept alive if an explicit
* <code>"Connection: keep-alive"</code> header is sent
*
- * @return <code>true</code> iff the connection should remain
+ * @return <code>true</code> if the connection should remain
* open following the handling of this request
*/
- boolean isKeepAlive();
+ boolean isKeepAlive(); // TODO keep it due to extra javadoc ?
/**
* Determines whether this request requires a "100-continue" response.
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=673790&r1=673789&r2=673790&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 Thu Jul 3 13:28:58 2008
@@ -19,10 +19,6 @@
*/
package org.apache.asyncweb.common;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.mina.core.buffer.IoBuffer;
/**
* Represents a response to an <code>HttpRequest</code>.
@@ -33,33 +29,6 @@
public interface HttpResponse extends HttpMessage {
/**
- * Returns the value of the HTTP header with the specified name.
- * If more than one header with the given name is associated with
- * this response, one is selected and returned.
- *
- * @param name The name of the desired header
- * @return The header value - or null if no header is found
- * with the specified name
- */
- String getHeader(String name);
-
- /**
- * Returns <tt>true</tt> if the HTTP header with the specified name exists in this response.
- */
- boolean containsHeader(String name);
-
- /**
- * Returns the {@link Map} of HTTP headers whose key is a {@link String} and whose value
- * is a {@link List} of {@link String}s.
- */
- Map<String, List<String>> getHeaders();
-
- /**
- * Returns the Content-Type header of the response.
- */
- String getContentType();
-
- /**
* Returns the status of this response
*/
HttpResponseStatus getStatus();
@@ -68,9 +37,4 @@
* Returns the reason phrase which is associated with the current status of this response.
*/
String getStatusReasonPhrase();
-
- /**
- * Returns the content of the response body.
- */
- IoBuffer getContent();
}
Copied: mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/ChunkedBodyDecodingState.java (from r673020, 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/codec/ChunkedBodyDecodingState.java?p2=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/ChunkedBodyDecodingState.java&p1=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/ChunkedBodyDecodingState.java&r1=673020&r2=673790&rev=673790&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/codec/ChunkedBodyDecodingState.java Thu Jul 3 13:28:58 2008
@@ -17,10 +17,11 @@
* under the License.
*
*/
-package org.apache.asyncweb.common;
+package org.apache.asyncweb.common.codec;
import java.nio.charset.CharsetDecoder;
+import org.apache.asyncweb.common.HttpResponseStatus;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.statemachine.ConsumeToDynamicTerminatorDecodingState;
@@ -67,7 +68,7 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-abstract class ChunkedBodyDecodingState extends DecodingStateMachine {
+public abstract class ChunkedBodyDecodingState extends DecodingStateMachine {
private final CharsetDecoder asciiDecoder =
HttpCodecUtils.US_ASCII_CHARSET.newDecoder();
Copied: mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/DateParseException.java (from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DateParseException.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/DateParseException.java?p2=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/DateParseException.java&p1=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DateParseException.java&r1=673020&r2=673790&rev=673790&view=diff
==============================================================================
--- mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DateParseException.java (original)
+++ mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/DateParseException.java Thu Jul 3 13:28:58 2008
@@ -17,7 +17,8 @@
* under the License.
*
*/
-package org.apache.asyncweb.common;
+package org.apache.asyncweb.common.codec;
+
/**
* An exception to indicate an error parsing a date string.
Copied: mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/DateUtil.java (from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DateUtil.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/DateUtil.java?p2=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/DateUtil.java&p1=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DateUtil.java&r1=673020&r2=673790&rev=673790&view=diff
==============================================================================
--- mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/DateUtil.java (original)
+++ mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/DateUtil.java Thu Jul 3 13:28:58 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.asyncweb.common;
+package org.apache.asyncweb.common.codec;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -28,6 +28,7 @@
import java.util.Locale;
import java.util.TimeZone;
+
/**
* A utility class for parsing and formatting HTTP dates as used in cookies and
* other headers. This class handles dates as defined by RFC 2616 section
@@ -36,7 +37,7 @@
* @author Christopher Brown
* @author Michael Becke
*/
-final class DateUtil {
+final public class DateUtil {
/**
* Date format pattern used to parse HTTP date headers in RFC 1123 format.
Copied: mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpCodecFactory.java (from r673020, 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/codec/HttpCodecFactory.java?p2=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpCodecFactory.java&p1=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpCodecFactory.java&r1=673020&r2=673790&rev=673790&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/codec/HttpCodecFactory.java Thu Jul 3 13:28:58 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.asyncweb.common;
+package org.apache.asyncweb.common.codec;
import org.apache.mina.core.service.IoAcceptor;
Copied: mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpCodecUtils.java (from r673020, 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/codec/HttpCodecUtils.java?p2=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpCodecUtils.java&p1=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpCodecUtils.java&r1=673020&r2=673790&rev=673790&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/codec/HttpCodecUtils.java Thu Jul 3 13:28:58 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.asyncweb.common;
+package org.apache.asyncweb.common.codec;
import java.io.UnsupportedEncodingException;
import java.nio.charset.CharacterCodingException;
@@ -26,6 +26,9 @@
import java.util.List;
import java.util.Map;
+import org.apache.asyncweb.common.HttpMessage;
+import org.apache.asyncweb.common.HttpResponseStatus;
+import org.apache.asyncweb.common.HttpResponseStatus.Category;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.slf4j.Logger;
@@ -35,15 +38,15 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-class HttpCodecUtils {
+public class HttpCodecUtils {
- static final String DEFAULT_CHARSET_NAME = "UTF-8";
- static final Charset DEFAULT_CHARSET =
+ public static final String DEFAULT_CHARSET_NAME = "UTF-8";
+ public static final Charset DEFAULT_CHARSET =
Charset.forName(DEFAULT_CHARSET_NAME);
- static final String US_ASCII_CHARSET_NAME = "US-ASCII";
- static final Charset US_ASCII_CHARSET =
+ public static final String US_ASCII_CHARSET_NAME = "US-ASCII";
+ public static final Charset US_ASCII_CHARSET =
Charset.forName(US_ASCII_CHARSET_NAME);
- static final String DEFAULT_TIME_ZONE_NAME = "GMT";
+ public static final String DEFAULT_TIME_ZONE_NAME = "GMT";
/**
* Bytes making up a <code>CR LF</code>
@@ -108,7 +111,7 @@
* @return <code>true</code> iff the character is an HTTP field
* separator
*/
- static boolean isHttpSeparator(byte b) {
+ public static boolean isHttpSeparator(byte b) {
return HTTP_SEPARATORS[b];
}
@@ -120,7 +123,7 @@
* @return <code>true</code> iff the character is an HTTP control
* character
*/
- static boolean isHttpControl(byte b) {
+ public static boolean isHttpControl(byte b) {
return HTTP_CONTROLS[b];
}
@@ -232,7 +235,7 @@
* @param buffer The buffer to write to
*/
static void encodeBody(HttpMessage message, IoBuffer buffer) {
- IoBuffer content = (IoBuffer) message.getContent();
+ IoBuffer content = message.getContent();
buffer.put(content);
}
Copied: mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpHeaderDecodingState.java (from r673020, 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/codec/HttpHeaderDecodingState.java?p2=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpHeaderDecodingState.java&p1=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpHeaderDecodingState.java&r1=673020&r2=673790&rev=673790&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/codec/HttpHeaderDecodingState.java Thu Jul 3 13:28:58 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.asyncweb.common;
+package org.apache.asyncweb.common.codec;
import java.nio.charset.CharsetDecoder;
import java.util.ArrayList;
Copied: mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpRequestDecoder.java (from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestDecoder.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpRequestDecoder.java?p2=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpRequestDecoder.java&p1=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestDecoder.java&r1=673020&r2=673790&rev=673790&view=diff
==============================================================================
--- mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestDecoder.java (original)
+++ mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpRequestDecoder.java Thu Jul 3 13:28:58 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.asyncweb.common;
+package org.apache.asyncweb.common.codec;
import java.util.List;
Copied: mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpRequestDecoderException.java (from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestDecoderException.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpRequestDecoderException.java?p2=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpRequestDecoderException.java&p1=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestDecoderException.java&r1=673020&r2=673790&rev=673790&view=diff
==============================================================================
--- mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestDecoderException.java (original)
+++ mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpRequestDecoderException.java Thu Jul 3 13:28:58 2008
@@ -17,8 +17,9 @@
* under the License.
*
*/
-package org.apache.asyncweb.common;
+package org.apache.asyncweb.common.codec;
+import org.apache.asyncweb.common.HttpResponseStatus;
import org.apache.mina.filter.codec.ProtocolDecoderException;
/**
Copied: mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpRequestDecodingStateMachine.java (from r673020, 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/codec/HttpRequestDecodingStateMachine.java?p2=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpRequestDecodingStateMachine.java&p1=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestDecodingStateMachine.java&r1=673020&r2=673790&rev=673790&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/codec/HttpRequestDecodingStateMachine.java Thu Jul 3 13:28:58 2008
@@ -17,12 +17,19 @@
* under the License.
*
*/
-package org.apache.asyncweb.common;
+package org.apache.asyncweb.common.codec;
import java.net.URI;
import java.util.List;
import java.util.Map;
+import org.apache.asyncweb.common.DefaultHttpRequest;
+import org.apache.asyncweb.common.HttpHeaderConstants;
+import org.apache.asyncweb.common.HttpMethod;
+import org.apache.asyncweb.common.HttpRequest;
+import org.apache.asyncweb.common.HttpResponseStatus;
+import org.apache.asyncweb.common.HttpVersion;
+import org.apache.asyncweb.common.MutableHttpRequest;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
Copied: mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpRequestEncoder.java (from r673020, 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/codec/HttpRequestEncoder.java?p2=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpRequestEncoder.java&p1=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestEncoder.java&r1=673020&r2=673790&rev=673790&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/codec/HttpRequestEncoder.java Thu Jul 3 13:28:58 2008
@@ -17,11 +17,13 @@
* under the License.
*
*/
-package org.apache.asyncweb.common;
+package org.apache.asyncweb.common.codec;
import java.net.URI;
import java.nio.charset.CharsetEncoder;
+import org.apache.asyncweb.common.HttpRequest;
+import org.apache.asyncweb.common.MutableHttpRequest;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
Copied: mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpRequestLineDecodingState.java (from r673020, 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/codec/HttpRequestLineDecodingState.java?p2=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpRequestLineDecodingState.java&p1=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpRequestLineDecodingState.java&r1=673020&r2=673790&rev=673790&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/codec/HttpRequestLineDecodingState.java Thu Jul 3 13:28:58 2008
@@ -17,11 +17,14 @@
* under the License.
*
*/
-package org.apache.asyncweb.common;
+package org.apache.asyncweb.common.codec;
import java.net.URI;
import java.nio.charset.CharsetDecoder;
+import org.apache.asyncweb.common.HttpMethod;
+import org.apache.asyncweb.common.HttpResponseStatus;
+import org.apache.asyncweb.common.HttpVersion;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.statemachine.ConsumeToLinearWhitespaceDecodingState;
Copied: mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpResponseDecoder.java (from r673020, mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseDecoder.java)
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpResponseDecoder.java?p2=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpResponseDecoder.java&p1=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseDecoder.java&r1=673020&r2=673790&rev=673790&view=diff
==============================================================================
--- mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseDecoder.java (original)
+++ mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpResponseDecoder.java Thu Jul 3 13:28:58 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.asyncweb.common;
+package org.apache.asyncweb.common.codec;
import java.util.List;
Copied: mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpResponseDecodingState.java (from r673020, 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/codec/HttpResponseDecodingState.java?p2=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpResponseDecodingState.java&p1=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseDecodingState.java&r1=673020&r2=673790&rev=673790&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/codec/HttpResponseDecodingState.java Thu Jul 3 13:28:58 2008
@@ -17,11 +17,20 @@
* under the License.
*
*/
-package org.apache.asyncweb.common;
+package org.apache.asyncweb.common.codec;
import java.util.List;
import java.util.Map;
+import org.apache.asyncweb.common.Cookie;
+import org.apache.asyncweb.common.DefaultCookie;
+import org.apache.asyncweb.common.DefaultHttpResponse;
+import org.apache.asyncweb.common.HttpHeaderConstants;
+import org.apache.asyncweb.common.HttpResponse;
+import org.apache.asyncweb.common.HttpResponseStatus;
+import org.apache.asyncweb.common.HttpVersion;
+import org.apache.asyncweb.common.MutableCookie;
+import org.apache.asyncweb.common.MutableHttpResponse;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
Copied: mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpResponseEncoder.java (from r673020, 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/codec/HttpResponseEncoder.java?p2=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpResponseEncoder.java&p1=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseEncoder.java&r1=673020&r2=673790&rev=673790&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/codec/HttpResponseEncoder.java Thu Jul 3 13:28:58 2008
@@ -17,11 +17,13 @@
* under the License.
*
*/
-package org.apache.asyncweb.common;
+package org.apache.asyncweb.common.codec;
import java.nio.charset.CharacterCodingException;
import java.nio.charset.CharsetEncoder;
+import org.apache.asyncweb.common.HttpResponse;
+import org.apache.asyncweb.common.HttpResponseStatus;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoder;
Copied: mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpResponseLineDecodingState.java (from r673020, 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/codec/HttpResponseLineDecodingState.java?p2=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpResponseLineDecodingState.java&p1=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpResponseLineDecodingState.java&r1=673020&r2=673790&rev=673790&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/codec/HttpResponseLineDecodingState.java Thu Jul 3 13:28:58 2008
@@ -17,10 +17,11 @@
* under the License.
*
*/
-package org.apache.asyncweb.common;
+package org.apache.asyncweb.common.codec;
import java.nio.charset.CharsetDecoder;
+import org.apache.asyncweb.common.HttpVersion;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.statemachine.ConsumeToCrLfDecodingState;
Copied: mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpVersionDecodingState.java (from r673020, 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/codec/HttpVersionDecodingState.java?p2=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/codec/HttpVersionDecodingState.java&p1=mina/asyncweb/trunk/common/src/main/java/org/apache/asyncweb/common/HttpVersionDecodingState.java&r1=673020&r2=673790&rev=673790&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/codec/HttpVersionDecodingState.java Thu Jul 3 13:28:58 2008
@@ -17,11 +17,13 @@
* under the License.
*
*/
-package org.apache.asyncweb.common;
+package org.apache.asyncweb.common.codec;
import java.nio.charset.CharacterCodingException;
import java.nio.charset.CharsetDecoder;
+import org.apache.asyncweb.common.HttpResponseStatus;
+import org.apache.asyncweb.common.HttpVersion;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
Modified: mina/asyncweb/trunk/common/src/test/java/org/apache/asyncweb/common/HttpResponseDecoderTest.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/common/src/test/java/org/apache/asyncweb/common/HttpResponseDecoderTest.java?rev=673790&r1=673789&r2=673790&view=diff
==============================================================================
--- mina/asyncweb/trunk/common/src/test/java/org/apache/asyncweb/common/HttpResponseDecoderTest.java (original)
+++ mina/asyncweb/trunk/common/src/test/java/org/apache/asyncweb/common/HttpResponseDecoderTest.java Thu Jul 3 13:28:58 2008
@@ -19,6 +19,7 @@
*/
package org.apache.asyncweb.common;
+import org.apache.asyncweb.common.codec.HttpResponseDecoder;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.filter.codec.ProtocolCodecSession;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
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=673790&r1=673789&r2=673790&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 Thu Jul 3 13:28:58 2008
@@ -6,7 +6,7 @@
import junit.framework.TestCase;
-import org.apache.asyncweb.common.HttpCodecFactory;
+import org.apache.asyncweb.common.codec.HttpCodecFactory;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
import org.apache.catalina.connector.Connector;
Modified: mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/lightweight/Main.java
URL: http://svn.apache.org/viewvc/mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/lightweight/Main.java?rev=673790&r1=673789&r2=673790&view=diff
==============================================================================
--- mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/lightweight/Main.java (original)
+++ mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/lightweight/Main.java Thu Jul 3 13:28:58 2008
@@ -22,7 +22,7 @@
import java.net.InetSocketAddress;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
-import org.apache.asyncweb.common.HttpCodecFactory;
+import org.apache.asyncweb.common.codec.HttpCodecFactory;
import org.apache.asyncweb.examples.lightweight.HttpProtocolHandler;
import org.apache.mina.transport.socket.SocketAcceptor;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
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=673790&r1=673789&r2=673790&view=diff
==============================================================================
--- mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java (original)
+++ mina/asyncweb/trunk/server/src/main/java/org/apache/asyncweb/server/transport/mina/SingleHttpSessionIoHandler.java Thu Jul 3 13:28:58 2008
@@ -33,14 +33,13 @@
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.asyncweb.common.HttpRequest;
-import org.apache.asyncweb.common.HttpRequestDecoderException;
import org.apache.asyncweb.common.HttpResponseStatus;
import org.apache.asyncweb.common.HttpVersion;
import org.apache.asyncweb.common.MutableHttpResponse;
import org.apache.mina.handler.multiton.SingleSessionIoHandler;
-import org.apache.asyncweb.common.DefaultHttpRequest;
-import org.apache.asyncweb.common.DefaultHttpResponse;
import org.apache.asyncweb.common.*;
+import org.apache.asyncweb.common.codec.HttpCodecFactory;
+import org.apache.asyncweb.common.codec.HttpRequestDecoderException;
import org.apache.asyncweb.server.ServiceContainer;
import org.apache.asyncweb.server.context.AbstractHttpServiceContext;
import org.apache.asyncweb.server.pipeline.RequestPipeline;