Author: trustin
Date: Tue Nov 6 03:48:00 2007
New Revision: 592391
URL: http://svn.apache.org/viewvc?rev=592391&view=rev
Log:
Imported common statemachine codec classes into
org.apache.mina.filter.codec.statemachine from AsyncWeb
Added:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/CRLFDecodingState.java
- copied, changed from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/CRLFDecodingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToCRLFDecodingState.java
- copied, changed from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/ConsumeToCRLFDecodingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDynamicTerminatorDecodingState.java
- copied, changed from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/ConsumeToDynamicTerminatorDecodingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToLinearWhitespaceDecodingState.java
- copied, changed from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/ConsumeToLinearWhitespaceDecodingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToTerminatorDecodingState.java
- copied, changed from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/ConsumeToTerminatorDecodingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingState.java
- copied, changed from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/DecodingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateMachine.java
- copied, changed from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/DecodingStateMachine.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/FixedLengthDecodingState.java
- copied, changed from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/FixedLengthDecodingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/LinearWhitespaceSkippingState.java
- copied, changed from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/LinearWhitespaceSkippingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SkippingState.java
- copied, changed from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/SkippingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/StateMachineProtocolDecoder.java
- copied, changed from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/StateMachineProtocolDecoder.java
Removed:
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/CRLFDecodingState.java
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/
Modified:
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/HttpServerCodecFactory.java
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/ChunkedBodyDecodingState.java
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/HttpHeaderDecodingState.java
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/HttpRequestDecodingState.java
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/HttpRequestLineDecodingState.java
Modified:
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/HttpServerCodecFactory.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/HttpServerCodecFactory.java?rev=592391&r1=592390&r2=592391&view=diff
==============================================================================
---
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/HttpServerCodecFactory.java
(original)
+++
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/HttpServerCodecFactory.java
Tue Nov 6 03:48:00 2007
@@ -25,9 +25,9 @@
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.ProtocolEncoder;
+import org.apache.mina.filter.codec.statemachine.DecodingState;
+import org.apache.mina.filter.codec.statemachine.StateMachineProtocolDecoder;
import org.safehaus.asyncweb.codec.decoder.HttpRequestDecodingState;
-import org.safehaus.asyncweb.codec.decoder.support.DecodingState;
-import org.safehaus.asyncweb.codec.decoder.support.StateMachineProtocolDecoder;
import org.safehaus.asyncweb.codec.encoder.OneShotHttpResponseEncoder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/ChunkedBodyDecodingState.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/ChunkedBodyDecodingState.java?rev=592391&r1=592390&r2=592391&view=diff
==============================================================================
---
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/ChunkedBodyDecodingState.java
(original)
+++
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/ChunkedBodyDecodingState.java
Tue Nov 6 03:48:00 2007
@@ -24,12 +24,13 @@
import org.apache.mina.common.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+import org.apache.mina.filter.codec.statemachine.CRLFDecodingState;
+import
org.apache.mina.filter.codec.statemachine.ConsumeToDynamicTerminatorDecodingState;
+import org.apache.mina.filter.codec.statemachine.DecodingState;
+import org.apache.mina.filter.codec.statemachine.DecodingStateMachine;
+import org.apache.mina.filter.codec.statemachine.FixedLengthDecodingState;
+import org.apache.mina.filter.codec.statemachine.SkippingState;
import org.safehaus.asyncweb.codec.HttpCodecUtils;
-import
org.safehaus.asyncweb.codec.decoder.support.ConsumeToDynamicTerminatorDecodingState;
-import org.safehaus.asyncweb.codec.decoder.support.DecodingState;
-import org.safehaus.asyncweb.codec.decoder.support.DecodingStateMachine;
-import org.safehaus.asyncweb.codec.decoder.support.FixedLengthDecodingState;
-import org.safehaus.asyncweb.codec.decoder.support.SkippingState;
import org.safehaus.asyncweb.common.HttpResponseStatus;
/**
Modified:
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/HttpHeaderDecodingState.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/HttpHeaderDecodingState.java?rev=592391&r1=592390&r2=592391&view=diff
==============================================================================
---
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/HttpHeaderDecodingState.java
(original)
+++
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/HttpHeaderDecodingState.java
Tue Nov 6 03:48:00 2007
@@ -28,11 +28,12 @@
import org.apache.mina.common.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
-import org.safehaus.asyncweb.codec.decoder.support.ConsumeToCRLFDecodingState;
-import
org.safehaus.asyncweb.codec.decoder.support.ConsumeToTerminatorDecodingState;
-import org.safehaus.asyncweb.codec.decoder.support.DecodingState;
-import org.safehaus.asyncweb.codec.decoder.support.DecodingStateMachine;
-import
org.safehaus.asyncweb.codec.decoder.support.LinearWhitespaceSkippingState;
+import org.apache.mina.filter.codec.statemachine.CRLFDecodingState;
+import org.apache.mina.filter.codec.statemachine.ConsumeToCRLFDecodingState;
+import
org.apache.mina.filter.codec.statemachine.ConsumeToTerminatorDecodingState;
+import org.apache.mina.filter.codec.statemachine.DecodingState;
+import org.apache.mina.filter.codec.statemachine.DecodingStateMachine;
+import org.apache.mina.filter.codec.statemachine.LinearWhitespaceSkippingState;
/**
* Decodes the Headers of HTTP requests.
Modified:
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/HttpRequestDecodingState.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/HttpRequestDecodingState.java?rev=592391&r1=592390&r2=592391&view=diff
==============================================================================
---
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/HttpRequestDecodingState.java
(original)
+++
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/HttpRequestDecodingState.java
Tue Nov 6 03:48:00 2007
@@ -26,10 +26,11 @@
import org.apache.mina.common.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+import org.apache.mina.filter.codec.statemachine.CRLFDecodingState;
+import org.apache.mina.filter.codec.statemachine.DecodingState;
+import org.apache.mina.filter.codec.statemachine.DecodingStateMachine;
+import org.apache.mina.filter.codec.statemachine.FixedLengthDecodingState;
import org.safehaus.asyncweb.codec.HttpCodecUtils;
-import org.safehaus.asyncweb.codec.decoder.support.DecodingState;
-import org.safehaus.asyncweb.codec.decoder.support.DecodingStateMachine;
-import org.safehaus.asyncweb.codec.decoder.support.FixedLengthDecodingState;
import org.safehaus.asyncweb.common.DefaultHttpRequest;
import org.safehaus.asyncweb.common.HttpMethod;
import org.safehaus.asyncweb.common.HttpRequest;
Modified:
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/HttpRequestLineDecodingState.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/HttpRequestLineDecodingState.java?rev=592391&r1=592390&r2=592391&view=diff
==============================================================================
---
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/HttpRequestLineDecodingState.java
(original)
+++
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/HttpRequestLineDecodingState.java
Tue Nov 6 03:48:00 2007
@@ -25,12 +25,13 @@
import org.apache.mina.common.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+import org.apache.mina.filter.codec.statemachine.CRLFDecodingState;
+import
org.apache.mina.filter.codec.statemachine.ConsumeToDynamicTerminatorDecodingState;
+import
org.apache.mina.filter.codec.statemachine.ConsumeToLinearWhitespaceDecodingState;
+import org.apache.mina.filter.codec.statemachine.DecodingState;
+import org.apache.mina.filter.codec.statemachine.DecodingStateMachine;
+import org.apache.mina.filter.codec.statemachine.LinearWhitespaceSkippingState;
import org.safehaus.asyncweb.codec.HttpCodecUtils;
-import
org.safehaus.asyncweb.codec.decoder.support.ConsumeToDynamicTerminatorDecodingState;
-import
org.safehaus.asyncweb.codec.decoder.support.ConsumeToLinearWhitespaceDecodingState;
-import org.safehaus.asyncweb.codec.decoder.support.DecodingState;
-import org.safehaus.asyncweb.codec.decoder.support.DecodingStateMachine;
-import
org.safehaus.asyncweb.codec.decoder.support.LinearWhitespaceSkippingState;
import org.safehaus.asyncweb.common.HttpMethod;
import org.safehaus.asyncweb.common.HttpResponseStatus;
import org.safehaus.asyncweb.common.HttpVersion;
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/CRLFDecodingState.java
(from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/CRLFDecodingState.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/CRLFDecodingState.java?p2=mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/CRLFDecodingState.java&p1=mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/CRLFDecodingState.java&r1=592337&r2=592391&rev=592391&view=diff
==============================================================================
---
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/CRLFDecodingState.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/CRLFDecodingState.java
Tue Nov 6 03:48:00 2007
@@ -17,12 +17,11 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.codec.decoder;
+package org.apache.mina.filter.codec.statemachine;
import org.apache.mina.common.IoBuffer;
+import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
-import org.safehaus.asyncweb.codec.HttpCodecUtils;
-import org.safehaus.asyncweb.codec.decoder.support.DecodingState;
/**
* Decodes a single <code>CRLF</code>.
@@ -33,11 +32,19 @@
* Note that if we find a CR but do not find a following LF, we raise
* an error.
*
- * @author irvingd
- * @author trustin
+ * @author The Apache MINA Project ([EMAIL PROTECTED])
* @version $Rev$, $Date$
*/
public abstract class CRLFDecodingState implements DecodingState {
+ /**
+ * Carriage return character
+ */
+ private static final byte CR = 13;
+
+ /**
+ * Line feed character
+ */
+ private static final byte LF = 10;
private boolean hasCR;
@@ -48,10 +55,10 @@
while (in.hasRemaining()) {
byte b = in.get();
if (!hasCR) {
- if (b == HttpCodecUtils.CR) {
+ if (b == CR) {
hasCR = true;
} else {
- if (b == HttpCodecUtils.LF) {
+ if (b == LF) {
found = true;
} else {
in.position(in.position() - 1);
@@ -61,14 +68,13 @@
break;
}
} else {
- if (b == HttpCodecUtils.LF) {
+ if (b == LF) {
found = true;
finished = true;
break;
} else {
- HttpCodecUtils
- .throwDecoderException("Expected LF after CR but
was: "
- + b);
+ throw new ProtocolDecoderException(
+ "Expected LF after CR but was: " + (b & 0xff));
}
}
}
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToCRLFDecodingState.java
(from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/ConsumeToCRLFDecodingState.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToCRLFDecodingState.java?p2=mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToCRLFDecodingState.java&p1=mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/ConsumeToCRLFDecodingState.java&r1=592337&r2=592391&rev=592391&view=diff
==============================================================================
---
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/ConsumeToCRLFDecodingState.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToCRLFDecodingState.java
Tue Nov 6 03:48:00 2007
@@ -17,15 +17,18 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.codec.decoder.support;
+package org.apache.mina.filter.codec.statemachine;
import org.apache.mina.common.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
/**
-* A decoder which writes all read bytes in to a known <code>Bytes</code>
-* context until a <code>CRLF</code> has been encountered
-*/
+ * A decoder which writes all read bytes in to a known <code>Bytes</code>
+ * context until a <code>CRLF</code> has been encountered
+ *
+ * @author The Apache MINA Project ([EMAIL PROTECTED])
+ * @version $Rev$, $Date$
+ */
public abstract class ConsumeToCRLFDecodingState implements DecodingState {
/**
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDynamicTerminatorDecodingState.java
(from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/ConsumeToDynamicTerminatorDecodingState.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDynamicTerminatorDecodingState.java?p2=mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDynamicTerminatorDecodingState.java&p1=mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/ConsumeToDynamicTerminatorDecodingState.java&r1=592337&r2=592391&rev=592391&view=diff
==============================================================================
---
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/ConsumeToDynamicTerminatorDecodingState.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDynamicTerminatorDecodingState.java
Tue Nov 6 03:48:00 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.codec.decoder.support;
+package org.apache.mina.filter.codec.statemachine;
import org.apache.mina.common.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
@@ -26,8 +26,7 @@
* Consumes until a fixed (ASCII) character is reached.
* The terminator is skipped.
*
- * @author irvingd
- * @author trustin
+ * @author The Apache MINA Project ([EMAIL PROTECTED])
* @version $Rev$, $Date$
*/
public abstract class ConsumeToDynamicTerminatorDecodingState implements
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToLinearWhitespaceDecodingState.java
(from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/ConsumeToLinearWhitespaceDecodingState.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToLinearWhitespaceDecodingState.java?p2=mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToLinearWhitespaceDecodingState.java&p1=mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/ConsumeToLinearWhitespaceDecodingState.java&r1=592337&r2=592391&rev=592391&view=diff
==============================================================================
---
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/ConsumeToLinearWhitespaceDecodingState.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToLinearWhitespaceDecodingState.java
Tue Nov 6 03:48:00 2007
@@ -17,8 +17,13 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.codec.decoder.support;
+package org.apache.mina.filter.codec.statemachine;
+/**
+ *
+ * @author The Apache MINA Project ([EMAIL PROTECTED])
+ * @version $Rev$, $Date$
+ */
public abstract class ConsumeToLinearWhitespaceDecodingState extends
ConsumeToDynamicTerminatorDecodingState {
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToTerminatorDecodingState.java
(from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/ConsumeToTerminatorDecodingState.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToTerminatorDecodingState.java?p2=mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToTerminatorDecodingState.java&p1=mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/ConsumeToTerminatorDecodingState.java&r1=592337&r2=592391&rev=592391&view=diff
==============================================================================
---
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/ConsumeToTerminatorDecodingState.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToTerminatorDecodingState.java
Tue Nov 6 03:48:00 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.codec.decoder.support;
+package org.apache.mina.filter.codec.statemachine;
import org.apache.mina.common.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
@@ -26,8 +26,7 @@
* Consumes until a fixed (ASCII) character is reached.
* The terminator is skipped.
*
- * @author irvingd
- * @author trustin
+ * @author The Apache MINA Project ([EMAIL PROTECTED])
* @version $Rev$, $Date$
*/
public abstract class ConsumeToTerminatorDecodingState implements
DecodingState {
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingState.java
(from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/DecodingState.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingState.java?p2=mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingState.java&p1=mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/DecodingState.java&r1=592337&r2=592391&rev=592391&view=diff
==============================================================================
---
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/DecodingState.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingState.java
Tue Nov 6 03:48:00 2007
@@ -17,11 +17,16 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.codec.decoder.support;
+package org.apache.mina.filter.codec.statemachine;
import org.apache.mina.common.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+/**
+ *
+ * @author The Apache MINA Project ([EMAIL PROTECTED])
+ * @version $Rev$, $Date$
+ */
public interface DecodingState {
// TODO Find out the best way to provide init/destroy.
DecodingState decode(IoBuffer in, ProtocolDecoderOutput out)
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateMachine.java
(from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/DecodingStateMachine.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateMachine.java?p2=mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateMachine.java&p1=mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/DecodingStateMachine.java&r1=592337&r2=592391&rev=592391&view=diff
==============================================================================
---
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/DecodingStateMachine.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateMachine.java
Tue Nov 6 03:48:00 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.codec.decoder.support;
+package org.apache.mina.filter.codec.statemachine;
import java.util.ArrayList;
import java.util.List;
@@ -27,6 +27,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ *
+ * @author The Apache MINA Project ([EMAIL PROTECTED])
+ * @version $Rev$, $Date$
+ */
public abstract class DecodingStateMachine implements DecodingState {
private final Logger log = LoggerFactory
.getLogger(DecodingStateMachine.class);
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/FixedLengthDecodingState.java
(from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/FixedLengthDecodingState.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/FixedLengthDecodingState.java?p2=mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/FixedLengthDecodingState.java&p1=mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/FixedLengthDecodingState.java&r1=592337&r2=592391&rev=592391&view=diff
==============================================================================
---
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/FixedLengthDecodingState.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/FixedLengthDecodingState.java
Tue Nov 6 03:48:00 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.codec.decoder.support;
+package org.apache.mina.filter.codec.statemachine;
import org.apache.mina.common.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
@@ -26,8 +26,7 @@
* A [EMAIL PROTECTED] DecodingState} which consumes all received bytes until
a configured
* number of read bytes has been reached.
*
- * @author irvingd
- * @author trustin
+ * @author The Apache MINA Project ([EMAIL PROTECTED])
* @version $Rev$, $Date$
*/
public abstract class FixedLengthDecodingState implements DecodingState {
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/LinearWhitespaceSkippingState.java
(from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/LinearWhitespaceSkippingState.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/LinearWhitespaceSkippingState.java?p2=mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/LinearWhitespaceSkippingState.java&p1=mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/LinearWhitespaceSkippingState.java&r1=592337&r2=592391&rev=592391&view=diff
==============================================================================
---
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/LinearWhitespaceSkippingState.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/LinearWhitespaceSkippingState.java
Tue Nov 6 03:48:00 2007
@@ -17,8 +17,13 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.codec.decoder.support;
+package org.apache.mina.filter.codec.statemachine;
+/**
+ *
+ * @author The Apache MINA Project ([EMAIL PROTECTED])
+ * @version $Rev$, $Date$
+ */
public abstract class LinearWhitespaceSkippingState extends SkippingState {
@Override
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SkippingState.java
(from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/SkippingState.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SkippingState.java?p2=mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SkippingState.java&p1=mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/SkippingState.java&r1=592337&r2=592391&rev=592391&view=diff
==============================================================================
---
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/SkippingState.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SkippingState.java
Tue Nov 6 03:48:00 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.codec.decoder.support;
+package org.apache.mina.filter.codec.statemachine;
import org.apache.mina.common.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
@@ -25,7 +25,7 @@
/**
* Skips data until [EMAIL PROTECTED] #canSkip(byte)} returns <tt>false</tt>.
*
- * @author trustin
+ * @author The Apache MINA Project ([EMAIL PROTECTED])
* @version $Rev$, $Date$
*/
public abstract class SkippingState implements DecodingState {
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/StateMachineProtocolDecoder.java
(from r592337,
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/StateMachineProtocolDecoder.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/StateMachineProtocolDecoder.java?p2=mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/StateMachineProtocolDecoder.java&p1=mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/StateMachineProtocolDecoder.java&r1=592337&r2=592391&rev=592391&view=diff
==============================================================================
---
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/codec/decoder/support/StateMachineProtocolDecoder.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/StateMachineProtocolDecoder.java
Tue Nov 6 03:48:00 2007
@@ -17,13 +17,18 @@
* under the License.
*
*/
-package org.safehaus.asyncweb.codec.decoder.support;
+package org.apache.mina.filter.codec.statemachine;
import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoSession;
import org.apache.mina.filter.codec.ProtocolDecoder;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+/**
+ *
+ * @author The Apache MINA Project ([EMAIL PROTECTED])
+ * @version $Rev$, $Date$
+ */
public class StateMachineProtocolDecoder implements ProtocolDecoder {
private final DecodingStateMachine stateMachine;
