Author: trustin
Date: Mon Nov 12 23:34:16 2007
New Revision: 594447
URL: http://svn.apache.org/viewvc?rev=594447&view=rev
Log:
Fixed compilation errors in AsyncWeb due to the recent changes in trunk
Modified:
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
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/service/HttpServiceHandler.java
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/service/transport/mina/MinaTransport.java
mina/sandbox/asyncweb/example/src/main/java/org/safehaus/asyncweb/example/lightweight/Main.java
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=594447&r1=594446&r2=594447&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
Mon Nov 12 23:34:16 2007
@@ -24,8 +24,8 @@
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.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;
@@ -136,7 +136,7 @@
}
};
- private final DecodingState AFTER_SKIP_CHUNK_EXTENSION = new
CRLFDecodingState() {
+ private final DecodingState AFTER_SKIP_CHUNK_EXTENSION = new
CrLfDecodingState() {
@Override
protected DecodingState finishDecode(boolean foundCRLF,
ProtocolDecoderOutput out) throws Exception {
@@ -163,7 +163,7 @@
}
};
- private final DecodingState AFTER_CHUNK_DATA = new CRLFDecodingState() {
+ private final DecodingState AFTER_CHUNK_DATA = new CrLfDecodingState() {
@Override
protected DecodingState finishDecode(boolean foundCRLF,
ProtocolDecoderOutput out) throws Exception {
@@ -178,7 +178,7 @@
}
};
- private final DecodingState FIND_END_OF_TRAILER = new CRLFDecodingState() {
+ private final DecodingState FIND_END_OF_TRAILER = new CrLfDecodingState() {
@Override
protected DecodingState finishDecode(boolean foundCRLF,
ProtocolDecoderOutput out) throws Exception {
@@ -203,7 +203,7 @@
}
};
- private final DecodingState AFTER_SKIP_ENTITY_HEADER = new
CRLFDecodingState() {
+ private final DecodingState AFTER_SKIP_ENTITY_HEADER = new
CrLfDecodingState() {
@Override
protected DecodingState finishDecode(boolean foundCRLF,
ProtocolDecoderOutput out) throws Exception {
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=594447&r1=594446&r2=594447&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
Mon Nov 12 23:34:16 2007
@@ -28,9 +28,9 @@
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.ConsumeToCRLFDecodingState;
+import org.apache.mina.filter.codec.statemachine.ConsumeToCrLfDecodingState;
import
org.apache.mina.filter.codec.statemachine.ConsumeToTerminatorDecodingState;
+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.LinearWhitespaceSkippingState;
@@ -72,7 +72,7 @@
protected void destroy() throws Exception {
}
- private final DecodingState FIND_EMPTY_LINE = new CRLFDecodingState() {
+ private final DecodingState FIND_EMPTY_LINE = new CrLfDecodingState() {
@Override
protected DecodingState finishDecode(boolean foundCRLF,
ProtocolDecoderOutput out) throws Exception {
@@ -105,7 +105,7 @@
}
};
- private final DecodingState READ_HEADER_VALUE = new
ConsumeToCRLFDecodingState() {
+ private final DecodingState READ_HEADER_VALUE = new
ConsumeToCrLfDecodingState() {
@Override
protected DecodingState finishDecode(IoBuffer product,
ProtocolDecoderOutput out) throws Exception {
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=594447&r1=594446&r2=594447&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
Mon Nov 12 23:34:16 2007
@@ -26,7 +26,7 @@
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.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;
@@ -113,7 +113,7 @@
protected void destroy() throws Exception {
}
- private final DecodingState SKIP_EMPTY_LINES = new CRLFDecodingState() {
+ private final DecodingState SKIP_EMPTY_LINES = new CrLfDecodingState() {
@Override
protected DecodingState finishDecode(boolean foundCRLF,
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=594447&r1=594446&r2=594447&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
Mon Nov 12 23:34:16 2007
@@ -25,9 +25,9 @@
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.CrLfDecodingState;
import org.apache.mina.filter.codec.statemachine.DecodingState;
import org.apache.mina.filter.codec.statemachine.DecodingStateMachine;
import org.apache.mina.filter.codec.statemachine.LinearWhitespaceSkippingState;
@@ -134,7 +134,7 @@
}
};
- private final DecodingState FINISH = new CRLFDecodingState() {
+ private final DecodingState FINISH = new CrLfDecodingState() {
@Override
protected DecodingState finishDecode(boolean foundCRLF,
ProtocolDecoderOutput out) throws Exception {
Modified:
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/service/HttpServiceHandler.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/service/HttpServiceHandler.java?rev=594447&r1=594446&r2=594447&view=diff
==============================================================================
---
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/service/HttpServiceHandler.java
(original)
+++
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/service/HttpServiceHandler.java
Mon Nov 12 23:34:16 2007
@@ -23,6 +23,7 @@
import java.util.Map;
import java.util.Map.Entry;
+import org.apache.mina.common.IoFilter;
import org.safehaus.asyncweb.common.DefaultHttpResponse;
import org.safehaus.asyncweb.common.HttpRequest;
import org.safehaus.asyncweb.common.HttpResponseStatus;
@@ -111,7 +112,8 @@
/**
* Handles a response. This handler does not perform any
- * action for responses - so the specified [EMAIL PROTECTED] NextFilter}
is invoked immediately.
+ * action for responses - so the specified [EMAIL PROTECTED]
IoFilter.NextFilter} is
+ * invoked immediately.
*/
public void handleResponse(NextFilter next, HttpServiceContext context) {
next.invoke();
Modified:
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/service/transport/mina/MinaTransport.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/service/transport/mina/MinaTransport.java?rev=594447&r1=594446&r2=594447&view=diff
==============================================================================
---
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/service/transport/mina/MinaTransport.java
(original)
+++
mina/sandbox/asyncweb/core/src/main/java/org/safehaus/asyncweb/service/transport/mina/MinaTransport.java
Mon Nov 12 23:34:16 2007
@@ -22,12 +22,10 @@
import java.io.IOException;
import java.net.InetSocketAddress;
import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
import org.apache.mina.common.IoFilter;
import org.apache.mina.filter.executor.ExecutorFilter;
+import org.apache.mina.filter.executor.OrderedThreadPoolExecutor;
import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.transport.socket.SocketAcceptor;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
@@ -58,8 +56,6 @@
private SocketAcceptor acceptor;
- private ExecutorService ioExecutor;
-
private ExecutorService eventExecutor;
private int port = DEFAULT_PORT;
@@ -158,13 +154,10 @@
*/
public void start() throws TransportException {
initIOHandler();
- ioExecutor = new ThreadPoolExecutor(ioThreads + 1, ioThreads + 1, 60,
- TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
- eventExecutor = new ThreadPoolExecutor(eventThreads + 1,
- eventThreads + 1, 60, TimeUnit.SECONDS,
- new LinkedBlockingQueue<Runnable>());
- acceptor = new NioSocketAcceptor(ioThreads, ioExecutor);
-
+ acceptor = new NioSocketAcceptor(ioThreads);
+ eventExecutor = new OrderedThreadPoolExecutor(this.eventThreads);
+
+ boolean success = false;
try {
acceptor.getFilterChain().addLast("threadPool",
new ExecutorFilter(eventExecutor));
@@ -185,11 +178,17 @@
acceptor.setHandler(ioHandler);
acceptor.bind();
-
+
+ success = true;
LOG.info("NIO HTTP Transport bound on port " + port);
} catch (IOException e) {
throw new TransportException("NIOTransport Failed to bind to port "
+ port, e);
+ } finally {
+ if (!success) {
+ acceptor.dispose();
+ acceptor = null;
+ }
}
}
@@ -197,9 +196,14 @@
* Stops this transport
*/
public void stop() throws TransportException {
- acceptor.unbind();
- ioExecutor.shutdown();
+ if (acceptor == null) {
+ return;
+ }
+
+ acceptor.dispose();
eventExecutor.shutdown();
+ acceptor = null;
+ eventExecutor = null;
}
/**
@@ -211,7 +215,7 @@
}
/**
- * Initialises our handler - creating a new (default) handler if none has
+ * Initializes our handler - creating a new (default) handler if none has
* been specified
*
* @throws IllegalStateException If we have not yet been associated with a
Modified:
mina/sandbox/asyncweb/example/src/main/java/org/safehaus/asyncweb/example/lightweight/Main.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/asyncweb/example/src/main/java/org/safehaus/asyncweb/example/lightweight/Main.java?rev=594447&r1=594446&r2=594447&view=diff
==============================================================================
---
mina/sandbox/asyncweb/example/src/main/java/org/safehaus/asyncweb/example/lightweight/Main.java
(original)
+++
mina/sandbox/asyncweb/example/src/main/java/org/safehaus/asyncweb/example/lightweight/Main.java
Mon Nov 12 23:34:16 2007
@@ -20,8 +20,6 @@
package org.safehaus.asyncweb.example.lightweight;
import java.net.InetSocketAddress;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.transport.socket.SocketAcceptor;
@@ -30,9 +28,7 @@
public class Main {
public static void main(String[] args) throws Exception {
- Executor threadPool = Executors.newCachedThreadPool();
- SocketAcceptor acceptor = new NioSocketAcceptor(Runtime.getRuntime()
- .availableProcessors() + 1, threadPool);
+ SocketAcceptor acceptor = new NioSocketAcceptor();
acceptor.getFilterChain().addLast("codec",
new ProtocolCodecFilter(new HttpServerCodecFactory()));
