You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/05/28 13:11:40 UTC
svn commit: r779564 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/model/
camel-core/src/main/java/org/apache/camel/processor/
camel-core/src/main/resources/org/apache/camel/model/
camel-core/src/test/java/org/apache/camel/component/file/...
Author: davsclaus
Date: Thu May 28 11:11:39 2009
New Revision: 779564
URL: http://svn.apache.org/viewvc?rev=779564&view=rev
Log:
async renamed to threads
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java (contents, props changed)
- copied, changed from r779488, camel/trunk/camel-core/src/main/java/org/apache/camel/model/AsyncDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java (contents, props changed)
- copied, changed from r779488, camel/trunk/camel-core/src/main/java/org/apache/camel/processor/AsyncProcessor.java
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AsyncDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/AsyncProcessor.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentAggregateBatchConsumerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAsyncTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerAsyncTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncDeadLetterChannelTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncDefaultErrorHandlerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteIfReplyExpectedTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteNoWaitTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteNoWaitWithErrorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteWaitIfReplyExpectedTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteWithErrorTest.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteNoWaitTest.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteNoWaitWithErrorTest.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteTest.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteWaitIfReplyExpectedTest.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteWithErrorTest.xml
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java?rev=779564&r1=779563&r2=779564&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java Thu May 28 11:11:39 2009
@@ -29,7 +29,6 @@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlTransient;
-import org.apache.camel.CamelException;
import org.apache.camel.Channel;
import org.apache.camel.Endpoint;
import org.apache.camel.ExchangePattern;
@@ -672,8 +671,10 @@
}
/**
- * Breaks the route into asynchronous. The caller thread will either wait for the async route
- * to complete or imeddiately comntinue. If continue the OUT message will
+ * Leverages a thread pool for multi threading processing exchanges.
+ * <p/>
+ * The caller thread will either wait for the async route
+ * to complete or imeddiately continue. If continue the OUT message will
* contain a {@link java.util.concurrent.Future} handle so you can get the real response
* later using this handle.
* <p/>
@@ -686,30 +687,22 @@
*
* @return the builder
*/
- public AsyncDefinition async() {
- AsyncDefinition answer = new AsyncDefinition();
+ public ThreadsDefinition threads() {
+ ThreadsDefinition answer = new ThreadsDefinition();
addOutput(answer);
return answer;
}
/**
- * Breaks the route into asynchronous. The caller thread will either wait for the async route
- * to complete or imeddiately comntinue. If continue the OUT message will
- * contain a {@link java.util.concurrent.Future} handle so you can get the real response
- * later using this handle.
+ * Leverages a thread pool for multi threading processing exchanges.
* <p/>
- * Will default wait for the async route to complete, but this behavior can be overriden by:
- * <ul>
- * <li>Configuring the <tt>waitForTaskToComplete</tt> option</li>
- * <li>Provide an IN header with the key {@link org.apache.camel.Exchange#ASYNC_WAIT} with the
- * value containing a type {@link org.apache.camel.WaitForTaskToComplete}. The header will take precedence, if provided.</li>
- * </ul>
+ * See {@link #threads()} for more details.
*
* @param poolSize the core pool size
* @return the builder
*/
- public AsyncDefinition async(int poolSize) {
- AsyncDefinition answer = async();
+ public ThreadsDefinition threads(int poolSize) {
+ ThreadsDefinition answer = threads();
answer.setPoolSize(poolSize);
return answer;
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java (from r779488, camel/trunk/camel-core/src/main/java/org/apache/camel/model/AsyncDefinition.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/AsyncDefinition.java&r1=779488&r2=779564&rev=779564&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/AsyncDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java Thu May 28 11:11:39 2009
@@ -25,19 +25,19 @@
import org.apache.camel.Processor;
import org.apache.camel.WaitForTaskToComplete;
-import org.apache.camel.processor.AsyncProcessor;
+import org.apache.camel.processor.ThreadsProcessor;
import org.apache.camel.processor.UnitOfWorkProcessor;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.concurrent.ExecutorServiceHelper;
/**
- * Represents an XML <async/> element
+ * Represents an XML <threads/> element
*
* @version $Revision$
*/
-@XmlRootElement(name = "async")
+@XmlRootElement(name = "threads")
@XmlAccessorType(XmlAccessType.FIELD)
-public class AsyncDefinition extends OutputDefinition<ProcessorDefinition> {
+public class ThreadsDefinition extends OutputDefinition<ProcessorDefinition> {
@XmlTransient
private ExecutorService executorService;
@@ -61,22 +61,22 @@
// wrap it in a unit of work so the route that comes next is also done in a unit of work
UnitOfWorkProcessor uow = new UnitOfWorkProcessor(childProcessor);
- return new AsyncProcessor(uow, executorService, waitForTaskToComplete);
+ return new ThreadsProcessor(uow, executorService, waitForTaskToComplete);
}
@Override
public String getLabel() {
- return "async";
+ return "threads";
}
@Override
public String getShortName() {
- return "async";
+ return "threads";
}
@Override
public String toString() {
- return "Async[" + getOutputs() + "]";
+ return "Threads[" + getOutputs() + "]";
}
/**
@@ -84,7 +84,7 @@
*
* @return the builder
*/
- public AsyncDefinition executorService(ExecutorService executorService) {
+ public ThreadsDefinition executorService(ExecutorService executorService) {
setExecutorService(executorService);
return this;
}
@@ -94,7 +94,7 @@
*
* @return the builder
*/
- public AsyncDefinition poolSize(int poolSize) {
+ public ThreadsDefinition poolSize(int poolSize) {
setPoolSize(poolSize);
return this;
}
@@ -107,7 +107,7 @@
* @param wait the wait option
* @return the builder
*/
- public AsyncDefinition waitForTaskToComplete(WaitForTaskToComplete wait) {
+ public ThreadsDefinition waitForTaskToComplete(WaitForTaskToComplete wait) {
setWaitForTaskToComplete(wait);
return this;
}
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java (from r779488, camel/trunk/camel-core/src/main/java/org/apache/camel/processor/AsyncProcessor.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/processor/AsyncProcessor.java&r1=779488&r2=779564&rev=779564&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/AsyncProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java Thu May 28 11:11:39 2009
@@ -27,7 +27,7 @@
import org.apache.camel.util.concurrent.ExecutorServiceHelper;
/**
- * Async processor that turns the processing going forward into async mode.
+ * Threads processor that leverage a thread pool for processing exchanges.
* <p/>
* The original caller thread will receive a <tt>Future<Exchange></tt> in the OUT message body.
* It can then later use this handle to obtain the async response.
@@ -37,13 +37,13 @@
*
* @version $Revision$
*/
-public class AsyncProcessor extends DelegateProcessor implements Processor {
+public class ThreadsProcessor extends DelegateProcessor implements Processor {
private static final int DEFAULT_THREADPOOL_SIZE = 5;
private ExecutorService executorService;
private WaitForTaskToComplete waitTaskComplete;
- public AsyncProcessor(Processor output, ExecutorService executorService, WaitForTaskToComplete waitTaskComplete) {
+ public ThreadsProcessor(Processor output, ExecutorService executorService, WaitForTaskToComplete waitTaskComplete) {
super(output);
this.executorService = executorService;
this.waitTaskComplete = waitTaskComplete;
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index?rev=779564&r1=779563&r2=779564&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index (original)
+++ camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index Thu May 28 11:11:39 2009
@@ -15,7 +15,6 @@
## limitations under the License.
## ------------------------------------------------------------------------
AggregateDefinition
-AsyncDefinition
BeanDefinition
CatchDefinition
ChoiceDefinition
@@ -62,6 +61,7 @@
SortDefinition
SplitDefinition
StopDefinition
+ThreadsDefinition
ThrottleDefinition
ThrowExceptionDefinition
ToDefinition
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentAggregateBatchConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentAggregateBatchConsumerTest.java?rev=779564&r1=779563&r2=779564&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentAggregateBatchConsumerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentAggregateBatchConsumerTest.java Thu May 28 11:11:39 2009
@@ -37,7 +37,7 @@
public void configure() throws Exception {
from("file://target/concurrent?delay=60000&initialDelay=2500")
.setHeader("id", file("${file:onlyname.noext}"))
- .async(20)
+ .threads(20)
.beanRef("business")
.aggregate(header("country"), new MyBusinessTotal()).batchConsumer().batchTimeout(60000).to("mock:result");
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentTest.java?rev=779564&r1=779563&r2=779564&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConcurrentTest.java Thu May 28 11:11:39 2009
@@ -66,7 +66,7 @@
public void configure() throws Exception {
from("file://target/concurrent?delay=60000&initialDelay=2500")
.setHeader("id", file("${file:onlyname.noext}"))
- .async(20)
+ .threads(20)
.beanRef("business")
.aggregate(header("country"), new MyBusinessTotal()).batchSize(10).batchTimeout(60000).to("mock:result");
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAsyncTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAsyncTest.java?rev=779564&r1=779563&r2=779564&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAsyncTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAsyncTest.java Thu May 28 11:11:39 2009
@@ -60,7 +60,7 @@
return new RouteBuilder() {
public void configure() throws Exception {
from("file://target/files/?delete=true&delay=10000")
- .async()
+ .threads()
.to("mock:before")
.delay(3000)
.to("mock:result");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerAsyncTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerAsyncTest.java?rev=779564&r1=779563&r2=779564&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerAsyncTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerAsyncTest.java Thu May 28 11:11:39 2009
@@ -43,7 +43,7 @@
public void configure() throws Exception {
from("direct:start").idempotentConsumer(
header("messageId"), MemoryIdempotentRepository.memoryIdempotentRepository(200)
- ).async().to("mock:result");
+ ).threads().to("mock:result");
}
});
context.start();
@@ -68,7 +68,7 @@
from("direct:start").idempotentConsumer(
header("messageId"), MemoryIdempotentRepository.memoryIdempotentRepository(200)
- ).async().process(new Processor() {
+ ).threads().process(new Processor() {
public void process(Exchange exchange) throws Exception {
String id = exchange.getIn().getHeader("messageId", String.class);
if (id.equals("2")) {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncDeadLetterChannelTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncDeadLetterChannelTest.java?rev=779564&r1=779563&r2=779564&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncDeadLetterChannelTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncDeadLetterChannelTest.java Thu May 28 11:11:39 2009
@@ -43,7 +43,7 @@
errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(2).delay(0).logStackTrace(false));
from("direct:in")
- .async(2)
+ .threads(2)
.to("mock:foo")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
@@ -79,7 +79,7 @@
errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(2).delay(0).logStackTrace(false));
from("direct:in")
- .async(2).waitForTaskToComplete(WaitForTaskToComplete.Newer)
+ .threads(2).waitForTaskToComplete(WaitForTaskToComplete.Newer)
.to("mock:foo")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncDefaultErrorHandlerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncDefaultErrorHandlerTest.java?rev=779564&r1=779563&r2=779564&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncDefaultErrorHandlerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncDefaultErrorHandlerTest.java Thu May 28 11:11:39 2009
@@ -40,7 +40,7 @@
@Override
public void configure() throws Exception {
from("direct:in")
- .async(2)
+ .threads(2)
.to("mock:foo")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
@@ -68,7 +68,7 @@
@Override
public void configure() throws Exception {
from("direct:in")
- .async(2).waitForTaskToComplete(WaitForTaskToComplete.Newer)
+ .threads(2).waitForTaskToComplete(WaitForTaskToComplete.Newer)
.to("mock:foo")
.process(new Processor() {
public void process(Exchange exchange) throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteIfReplyExpectedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteIfReplyExpectedTest.java?rev=779564&r1=779563&r2=779564&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteIfReplyExpectedTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteIfReplyExpectedTest.java Thu May 28 11:11:39 2009
@@ -37,7 +37,7 @@
// the caller will have a Future<Exchange> returned as response in OUT
// to be used to grap the async response when he fell like it
// only wait if we expect a reply (also default for async)
- .async().waitForTaskToComplete(WaitForTaskToComplete.IfReplyExpected)
+ .threads().waitForTaskToComplete(WaitForTaskToComplete.IfReplyExpected)
// from this point forward this is the async route doing its work
// so we do a bit of delay to simulate heavy work that takes time
.to("mock:foo")
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteNoWaitTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteNoWaitTest.java?rev=779564&r1=779563&r2=779564&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteNoWaitTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteNoWaitTest.java Thu May 28 11:11:39 2009
@@ -127,7 +127,7 @@
// we do not want to wait for tasks to be complete so we instruct Camel
// to not wait, and therefore Camel returns the Future<Exchange> handle we
// can use to get the result when we want
- .async().waitForTaskToComplete(WaitForTaskToComplete.Newer)
+ .threads().waitForTaskToComplete(WaitForTaskToComplete.Newer)
// from this point forward this is the async route doing its work
// so we do a bit of delay to simulate heavy work that takes time
.to("mock:foo")
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteNoWaitWithErrorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteNoWaitWithErrorTest.java?rev=779564&r1=779563&r2=779564&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteNoWaitWithErrorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteNoWaitWithErrorTest.java Thu May 28 11:11:39 2009
@@ -104,7 +104,7 @@
// now turn the route into async from this point forward
// the caller will have a Future<Exchange> returned as response in OUT
// to be used to grap the async response when he fell like it
- .async().waitForTaskToComplete(WaitForTaskToComplete.Newer)
+ .threads().waitForTaskToComplete(WaitForTaskToComplete.Newer)
// from this point forward this is the async route doing its work
// so we do a bit of delay to simulate heavy work that takes time
.to("mock:foo")
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteTest.java?rev=779564&r1=779563&r2=779564&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteTest.java Thu May 28 11:11:39 2009
@@ -17,7 +17,6 @@
package org.apache.camel.processor.async;
import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
@@ -131,7 +130,7 @@
// now turn the route into async from this point forward
// the caller will have a Future<Exchange> returned as response in OUT
// to be used to grap the async response when he fell like it
- .async()
+ .threads()
// from this point forward this is the async route doing its work
// so we do a bit of delay to simulate heavy work that takes time
.to("mock:foo")
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteWaitIfReplyExpectedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteWaitIfReplyExpectedTest.java?rev=779564&r1=779563&r2=779564&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteWaitIfReplyExpectedTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteWaitIfReplyExpectedTest.java Thu May 28 11:11:39 2009
@@ -80,7 +80,7 @@
// to be used to grape the async response when he fell like it
// we only want to wait for tasks to complete if we expect a reply
// otherwise not
- .async().waitForTaskToComplete(WaitForTaskToComplete.IfReplyExpected)
+ .threads().waitForTaskToComplete(WaitForTaskToComplete.IfReplyExpected)
// from this point forward this is the async route doing its work
// so we do a bit of delay to simulate heavy work that takes time
.to("mock:foo")
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteWithErrorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteWithErrorTest.java?rev=779564&r1=779563&r2=779564&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteWithErrorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncRouteWithErrorTest.java Thu May 28 11:11:39 2009
@@ -89,7 +89,7 @@
// now turn the route into async from this point forward
// the caller will have a Future<Exchange> returned as response in OUT
// to be used to grap the async response when he fell like it
- .async()
+ .threads()
// from this point forward this is the async route doing its work
// so we do a bit of delay to simulate heavy work that takes time
.to("mock:foo")
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteNoWaitTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteNoWaitTest.xml?rev=779564&r1=779563&r2=779564&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteNoWaitTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteNoWaitTest.xml Thu May 28 11:11:39 2009
@@ -30,14 +30,14 @@
<constant>Hello World</constant>
</transform>
- <async waitForTaskToComplete="Newer">
+ <threads waitForTaskToComplete="Newer">
<to uri="mock:foo"/>
<delay>
<constant>100</constant>
</delay>
<process ref="myProcessor"/>
<to uri="mock:result"/>
- </async>
+ </threads>
</route>
</camelContext>
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteNoWaitWithErrorTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteNoWaitWithErrorTest.xml?rev=779564&r1=779563&r2=779564&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteNoWaitWithErrorTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteNoWaitWithErrorTest.xml Thu May 28 11:11:39 2009
@@ -30,14 +30,14 @@
<constant>Hello World</constant>
</transform>
- <async waitForTaskToComplete="Newer">
+ <threads waitForTaskToComplete="Newer">
<to uri="mock:foo"/>
<delay>
<constant>100</constant>
</delay>
<process ref="myProcessor"/>
<to uri="mock:result"/>
- </async>
+ </threads>
</route>
</camelContext>
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteTest.xml?rev=779564&r1=779563&r2=779564&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteTest.xml Thu May 28 11:11:39 2009
@@ -30,14 +30,14 @@
<constant>Hello World</constant>
</transform>
- <async>
+ <threads>
<to uri="mock:foo"/>
<delay>
<constant>500</constant>
</delay>
<process ref="myProcessor"/>
<to uri="mock:result"/>
- </async>
+ </threads>
</route>
</camelContext>
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteWaitIfReplyExpectedTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteWaitIfReplyExpectedTest.xml?rev=779564&r1=779563&r2=779564&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteWaitIfReplyExpectedTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteWaitIfReplyExpectedTest.xml Thu May 28 11:11:39 2009
@@ -30,14 +30,14 @@
<constant>Hello World</constant>
</transform>
- <async waitForTaskToComplete="IfReplyExpected">
+ <threads waitForTaskToComplete="IfReplyExpected">
<to uri="mock:foo"/>
<delay>
<constant>500</constant>
</delay>
<process ref="myProcessor"/>
<to uri="mock:result"/>
- </async>
+ </threads>
</route>
</camelContext>
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteWithErrorTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteWithErrorTest.xml?rev=779564&r1=779563&r2=779564&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteWithErrorTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/async/SpringAsyncRouteWithErrorTest.xml Thu May 28 11:11:39 2009
@@ -30,14 +30,14 @@
<constant>Hello World</constant>
</transform>
- <async>
+ <threads>
<to uri="mock:foo"/>
<delay>
<constant>100</constant>
</delay>
<process ref="myProcessor"/>
<to uri="mock:result"/>
- </async>
+ </threads>
</route>
</camelContext>
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java?rev=779564&r1=779563&r2=779564&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncDslTest.java Thu May 28 11:11:39 2009
@@ -100,11 +100,12 @@
// do some sanity check validation
.to("bean:validateOrder")
.to("mock:validate")
+ // use multi threading with a pool size of 20
// turn the route async as some others do not expect a reply
- // and a few does then we can use the async DSL as a turning point
+ // and a few does then we can use the threads DSL as a turning point
// if the JMS ReplyTo was set then we expect a reply, otherwise not
// use a pool of 20 threads for the point forward
- .async(20)
+ .threads(20)
// do some CPU heavy processing of the message (we simulate and delay just 100 ms)
.unmarshal(mySecureDataFormat).delay(100).to("bean:handleOrder").to("mock:order");
// END SNIPPET: e1