You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/07/09 12:42:45 UTC
svn commit: r554600 [1/2] - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/component/queue/
camel-core/src/main/java/org/apache/camel/component/seda/
camel-core/src/main/java/org/apache/camel/component/vm/
camel-core/src/main/resou...
Author: jstrachan
Date: Mon Jul 9 03:42:42 2007
New Revision: 554600
URL: http://svn.apache.org/viewvc?view=rev&rev=554600
Log:
renaming queue: to seda: to avoid confusing with JMS queues for CAMEL-70
Added:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/QueueComponent.java (contents, props changed)
- copied, changed from r554558, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java (with props)
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java (contents, props changed)
- copied, changed from r554558, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java (contents, props changed)
- copied, changed from r554558, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/package.html (contents, props changed)
- copied, changed from r554558, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/package.html
activemq/camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/component/seda
- copied, changed from r554558, activemq/camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/component/queue
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaRouteTest.java
- copied, changed from r554558, activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/queue/QueueRouteTest.java
Removed:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/package.html
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/queue/
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java
activemq/camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/component/queue
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThrottlerTest.java
activemq/camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteIntegration.java
activemq/camel/trunk/components/camel-jbi/src/test/java/org/apache/camel/component/jbi/NonJbiCamelEndpointsIntegrationTest.java
activemq/camel/trunk/components/camel-jbi/src/test/java/org/apache/camel/component/jbi/SendFromCamelToJbiAndBackToCamelTest.java
activemq/camel/trunk/components/camel-jbi/src/test/resources/org/apache/camel/component/jbi/su1-src/camel-context.xml
activemq/camel/trunk/components/camel-jbi/src/test/resources/org/apache/camel/component/jbi/su2-src/camel-context.xml
activemq/camel/trunk/components/camel-jbi/src/test/resources/org/apache/camel/component/jbi/su3-src/camel-context.xml
activemq/camel/trunk/components/camel-jbi/src/test/resources/org/apache/camel/component/jbi/su4-src/camel-context.xml
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
activemq/camel/trunk/components/camel-spring/README.txt
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/test1/MyRouteBuilder.java
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/builder/spring_route_builder_test.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/camelContextFactoryBean.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/examples.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/routingUsingCamelContextFactory.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessor.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessorWithFilter.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildDynamicRecipientList.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildIdempotentConsumer.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildRouteWithInterceptor.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRoute.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithChoice.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithHeaderPredicate.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildStaticRecipientList.xml
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildWireTap.xml
activemq/camel/trunk/tooling/archetypes/camel-jbi-service-unit/src/main/resources/archetype-resources/src/main/resources/camel-context.xml
Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/QueueComponent.java (from r554558, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueComponent.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/QueueComponent.java?view=diff&rev=554600&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueComponent.java&r1=554558&p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/QueueComponent.java&r2=554600
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueComponent.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/QueueComponent.java Mon Jul 9 03:42:42 2007
@@ -14,11 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.queue;
+package org.apache.camel.component.seda;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
+import org.apache.camel.component.seda.SedaEndpoint;
import org.apache.camel.impl.DefaultComponent;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import java.util.Map;
import java.util.concurrent.BlockingQueue;
@@ -31,14 +34,10 @@
* @org.apache.xbean.XBean
* @version $Revision: 519973 $
*/
-public class QueueComponent<E extends Exchange> extends DefaultComponent<E> {
-
- public BlockingQueue<E> createQueue() {
- return new LinkedBlockingQueue<E>(1000);
- }
+public class QueueComponent<E extends Exchange> extends SedaComponent<E> {
+ private static final transient Log log = LogFactory.getLog(QueueComponent.class);
- @Override
- protected Endpoint<E> createEndpoint(String uri, String remaining, Map parameters) throws Exception {
- return new QueueEndpoint<E>(uri, this);
+ public QueueComponent() {
+ log.warn("This component has been deprecated; please use the seda: URI format instead of queue:");
}
}
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/QueueComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java?view=auto&rev=554600
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java (added)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java Mon Jul 9 03:42:42 2007
@@ -0,0 +1,43 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.seda;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.impl.DefaultComponent;
+
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+/**
+ * An implementation of the <a href="http://activemq.apache.org/camel/seda.html">SEDA components</a>
+ * for asynchronous SEDA exchanges on a {@link BlockingQueue} within a CamelContext
+ *
+ * @version $Revision: 1.1 $
+ */
+public class SedaComponent<E extends Exchange> extends DefaultComponent<E> {
+ public BlockingQueue<E> createQueue() {
+ return new LinkedBlockingQueue<E>(1000);
+ }
+
+ @Override
+ protected Endpoint<E> createEndpoint(String uri, String remaining, Map parameters) throws Exception {
+ return new SedaEndpoint<E>(uri, this);
+ }
+}
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java (from r554558, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueConsumer.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java?view=diff&rev=554600&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueConsumer.java&r1=554558&p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java&r2=554600
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueConsumer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java Mon Jul 9 03:42:42 2007
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.queue;
+package org.apache.camel.component.seda;
import org.apache.camel.AlreadyStoppedException;
import org.apache.camel.Consumer;
@@ -30,14 +30,14 @@
/**
* @version $Revision$
*/
-public class QueueConsumer<E extends Exchange> extends ServiceSupport implements Consumer<E>, Runnable {
- private static final Log log = LogFactory.getLog(QueueConsumer.class);
+public class SedaConsumer<E extends Exchange> extends ServiceSupport implements Consumer<E>, Runnable {
+ private static final Log log = LogFactory.getLog(SedaConsumer.class);
- private QueueEndpoint<E> endpoint;
+ private SedaEndpoint<E> endpoint;
private Processor processor;
private Thread thread;
- public QueueConsumer(QueueEndpoint<E> endpoint, Processor processor) {
+ public SedaConsumer(SedaEndpoint<E> endpoint, Processor processor) {
this.endpoint = endpoint;
this.processor = processor;
}
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java (from r554558, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueEndpoint.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java?view=diff&rev=554600&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueEndpoint.java&r1=554558&p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java&r2=554600
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/QueueEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java Mon Jul 9 03:42:42 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.queue;
+package org.apache.camel.component.seda;
import java.util.concurrent.BlockingQueue;
@@ -34,15 +34,15 @@
* @org.apache.xbean.XBean
* @version $Revision: 519973 $
*/
-public class QueueEndpoint<E extends Exchange> extends DefaultEndpoint<E> {
+public class SedaEndpoint<E extends Exchange> extends DefaultEndpoint<E> {
private BlockingQueue<E> queue;
- public QueueEndpoint(String endpointUri, Component component, BlockingQueue<E> queue) {
+ public SedaEndpoint(String endpointUri, Component component, BlockingQueue<E> queue) {
super(endpointUri, component);
this.queue = queue;
}
- public QueueEndpoint(String uri, QueueComponent<E> component) {
+ public SedaEndpoint(String uri, SedaComponent<E> component) {
this(uri, component, component.createQueue());
}
@@ -55,7 +55,7 @@
}
public Consumer<E> createConsumer(Processor processor) throws Exception {
- return new QueueConsumer<E>(this, processor);
+ return new SedaConsumer<E>(this, processor);
}
public E createExchange() {
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/package.html (from r554558, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/package.html)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/package.html?view=diff&rev=554600&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/package.html&r1=554558&p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/package.html&r2=554600
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/queue/package.html (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/package.html Mon Jul 9 03:42:42 2007
@@ -19,7 +19,7 @@
</head>
<body>
-The <a href="http://activemq.apache.org/camel/queue.html">Queue Component</a> for asynchronous
+The <a href="http://activemq.apache.org/camel/seda.html">SEDA Component</a> for asynchronous
<a href="http://www.eecs.harvard.edu/~mdw/proj/seda/">SEDA</a> exchanges on a
<a href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/BlockingQueue.html">BlockingQueue</a>
within a single CamelContext
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/package.html
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/package.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/vm/VmComponent.java Mon Jul 9 03:42:42 2007
@@ -19,8 +19,8 @@
import org.apache.camel.Exchange;
import org.apache.camel.Endpoint;
-import org.apache.camel.component.queue.QueueComponent;
-import org.apache.camel.component.queue.QueueEndpoint;
+import org.apache.camel.component.seda.QueueComponent;
+import org.apache.camel.component.seda.SedaEndpoint;
import java.util.Map;
import java.util.HashMap;
@@ -40,7 +40,7 @@
@Override
protected Endpoint<E> createEndpoint(String uri, String remaining, Map parameters) throws Exception {
BlockingQueue<E> blockingQueue = (BlockingQueue<E>) getBlockingQueue(uri);
- return new QueueEndpoint<E>(uri, this, blockingQueue);
+ return new SedaEndpoint<E>(uri, this, blockingQueue);
}
protected BlockingQueue<Exchange> getBlockingQueue(String uri) {
Modified: activemq/camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/component/queue
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/component/queue?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/component/queue (original)
+++ activemq/camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/component/queue Mon Jul 9 03:42:42 2007
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.component.queue.QueueComponent
+class=org.apache.camel.component.seda.QueueComponent
Copied: activemq/camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/component/seda (from r554558, activemq/camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/component/queue)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/component/seda?view=diff&rev=554600&p1=activemq/camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/component/queue&r1=554558&p2=activemq/camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/component/seda&r2=554600
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/component/queue (original)
+++ activemq/camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/component/seda Mon Jul 9 03:42:42 2007
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.component.queue.QueueComponent
+class=org.apache.camel.component.seda.SedaComponent
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java Mon Jul 9 03:42:42 2007
@@ -41,7 +41,7 @@
public void configure() {
errorHandler(loggingErrorHandler("FOO.BAR"));
- from("queue:a").to("queue:b");
+ from("seda:a").to("seda:b");
}
};
// END SNIPPET: e1
@@ -51,7 +51,7 @@
assertEquals("Number routes created", 1, routes.size());
for (Map.Entry<Endpoint<Exchange>, Processor> route : routes) {
Endpoint<Exchange> key = route.getKey();
- assertEquals("From endpoint", "queue:a", key.getEndpointUri());
+ assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = route.getValue();
LoggingErrorHandler loggingProcessor = assertIsInstanceOf(LoggingErrorHandler.class, processor);
@@ -63,10 +63,10 @@
// START SNIPPET: e2
RouteBuilder<Exchange> builder = new RouteBuilder<Exchange>() {
public void configure() {
- from("queue:a").errorHandler(loggingErrorHandler("FOO.BAR")).to("queue:b");
+ from("seda:a").errorHandler(loggingErrorHandler("FOO.BAR")).to("seda:b");
// this route will use the default error handler, DeadLetterChannel
- from("queue:b").to("queue:c");
+ from("seda:b").to("seda:c");
}
};
// END SNIPPET: e2
@@ -81,14 +81,14 @@
String endpointUri = key.getEndpointUri();
Processor processor = route.getValue();
- if (endpointUri.equals("queue:a")) {
+ if (endpointUri.equals("seda:a")) {
LoggingErrorHandler loggingProcessor = assertIsInstanceOf(LoggingErrorHandler.class, processor);
Processor outputProcessor = loggingProcessor.getOutput();
SendProcessor sendProcessor = assertIsInstanceOf(SendProcessor.class, outputProcessor);
}
else {
- assertEquals("From endpoint", "queue:b", endpointUri);
+ assertEquals("From endpoint", "seda:b", endpointUri);
DeadLetterChannel deadLetterChannel = assertIsInstanceOf(DeadLetterChannel.class, processor);
Processor outputProcessor = deadLetterChannel.getOutput();
@@ -102,9 +102,9 @@
// START SNIPPET: e3
RouteBuilder<Exchange> builder = new RouteBuilder<Exchange>() {
public void configure() {
- errorHandler(deadLetterChannel("queue:errors"));
+ errorHandler(deadLetterChannel("seda:errors"));
- from("queue:a").to("queue:b");
+ from("seda:a").to("seda:b");
}
};
// END SNIPPET: e3
@@ -114,12 +114,12 @@
assertEquals("Number routes created", 1, routes.size());
for (Map.Entry<Endpoint<Exchange>, Processor> route : routes) {
Endpoint<Exchange> key = route.getKey();
- assertEquals("From endpoint", "queue:a", key.getEndpointUri());
+ assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = route.getValue();
DeadLetterChannel deadLetterChannel = assertIsInstanceOf(DeadLetterChannel.class, processor);
Endpoint deadLetterEndpoint = assertIsInstanceOf(Endpoint.class, deadLetterChannel.getDeadLetter());
- assertEndpointUri(deadLetterEndpoint, "queue:errors");
+ assertEndpointUri(deadLetterEndpoint, "seda:errors");
}
}
@@ -128,9 +128,9 @@
// START SNIPPET: e4
RouteBuilder<Exchange> builder = new RouteBuilder<Exchange>() {
public void configure() {
- errorHandler(deadLetterChannel("queue:errors").maximumRedeliveries(2).useExponentialBackOff());
+ errorHandler(deadLetterChannel("seda:errors").maximumRedeliveries(2).useExponentialBackOff());
- from("queue:a").to("queue:b");
+ from("seda:a").to("seda:b");
}
};
// END SNIPPET: e4
@@ -140,12 +140,12 @@
assertEquals("Number routes created", 1, routes.size());
for (Map.Entry<Endpoint<Exchange>, Processor> route : routes) {
Endpoint<Exchange> key = route.getKey();
- assertEquals("From endpoint", "queue:a", key.getEndpointUri());
+ assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = route.getValue();
DeadLetterChannel deadLetterChannel = assertIsInstanceOf(DeadLetterChannel.class, processor);
Endpoint deadLetterEndpoint = assertIsInstanceOf(Endpoint.class, deadLetterChannel.getDeadLetter());
- assertEndpointUri(deadLetterEndpoint, "queue:errors");
+ assertEndpointUri(deadLetterEndpoint, "seda:errors");
RedeliveryPolicy redeliveryPolicy = deadLetterChannel.getRedeliveryPolicy();
assertEquals("getMaximumRedeliveries()", 2, redeliveryPolicy.getMaximumRedeliveries());
assertEquals("isUseExponentialBackOff()", true, redeliveryPolicy.isUseExponentialBackOff());
@@ -159,7 +159,7 @@
public void configure() {
inheritErrorHandler(false);
- from("queue:a").errorHandler(loggingErrorHandler("FOO.BAR")).filter(body().isInstanceOf(String.class)).to("queue:b");
+ from("seda:a").errorHandler(loggingErrorHandler("FOO.BAR")).filter(body().isInstanceOf(String.class)).to("seda:b");
}
};
// END SNIPPET: e5
@@ -168,7 +168,7 @@
assertEquals("Number routes created", 1, routes.size());
for (Route<Exchange> route : routes) {
Endpoint<Exchange> key = route.getEndpoint();
- assertEquals("From endpoint", "queue:a", key.getEndpointUri());
+ assertEquals("From endpoint", "seda:a", key.getEndpointUri());
EventDrivenConsumerRoute consumerRoute = assertIsInstanceOf(EventDrivenConsumerRoute.class, route);
Processor processor = consumerRoute.getProcessor();
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java Mon Jul 9 03:42:42 2007
@@ -50,7 +50,7 @@
// START SNIPPET: e1
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("queue:a").to("queue:b");
+ from("seda:a").to("seda:b");
}
};
// END SNIPPET: e1
@@ -63,11 +63,11 @@
assertEquals("Number routes created", 1, routes.size());
for (Route<Exchange> route : routes) {
Endpoint<Exchange> key = route.getEndpoint();
- assertEquals("From endpoint", "queue:a", key.getEndpointUri());
+ assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = getProcessorWithoutErrorHandler(route);
SendProcessor sendProcessor = assertIsInstanceOf(SendProcessor.class, processor);
- assertEquals("Endpoint URI", "queue:b", sendProcessor.getDestination().getEndpointUri());
+ assertEquals("Endpoint URI", "seda:b", sendProcessor.getDestination().getEndpointUri());
}
}
@@ -75,7 +75,7 @@
// START SNIPPET: e2
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("queue:a").filter(header("foo").isEqualTo("bar")).to("queue:b");
+ from("seda:a").filter(header("foo").isEqualTo("bar")).to("seda:b");
}
};
// END SNIPPET: e2
@@ -90,12 +90,12 @@
assertEquals("Number routes created", 1, routes.size());
for (Route route : routes) {
Endpoint key = route.getEndpoint();
- assertEquals("From endpoint", "queue:a", key.getEndpointUri());
+ assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = getProcessorWithoutErrorHandler(route);
FilterProcessor filterProcessor = assertIsInstanceOf(FilterProcessor.class, processor);
SendProcessor sendProcessor = assertIsInstanceOf(SendProcessor.class, unwrapErrorHandler(filterProcessor.getProcessor()));
- assertEquals("Endpoint URI", "queue:b", sendProcessor.getDestination().getEndpointUri());
+ assertEquals("Endpoint URI", "seda:b", sendProcessor.getDestination().getEndpointUri());
}
}
@@ -103,10 +103,10 @@
// START SNIPPET: e3
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("queue:a").choice()
- .when(header("foo").isEqualTo("bar")).to("queue:b")
- .when(header("foo").isEqualTo("cheese")).to("queue:c")
- .otherwise().to("queue:d");
+ from("seda:a").choice()
+ .when(header("foo").isEqualTo("bar")).to("seda:b")
+ .when(header("foo").isEqualTo("cheese")).to("seda:c")
+ .otherwise().to("seda:d");
}
};
// END SNIPPET: e3
@@ -121,7 +121,7 @@
assertEquals("Number routes created", 1, routes.size());
for (Route route : routes) {
Endpoint key = route.getEndpoint();
- assertEquals("From endpoint", "queue:a", key.getEndpointUri());
+ assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = getProcessorWithoutErrorHandler(route);
ChoiceProcessor choiceProcessor = assertIsInstanceOf(ChoiceProcessor.class, processor);
@@ -129,12 +129,12 @@
assertEquals("Should be two when clauses", 2, filters.size());
FilterProcessor filter1 = filters.get(0);
- assertSendTo(filter1.getProcessor(), "queue:b");
+ assertSendTo(filter1.getProcessor(), "seda:b");
FilterProcessor filter2 = filters.get(1);
- assertSendTo(filter2.getProcessor(), "queue:c");
+ assertSendTo(filter2.getProcessor(), "seda:c");
- assertSendTo(choiceProcessor.getOtherwise(), "queue:d");
+ assertSendTo(choiceProcessor.getOtherwise(), "seda:d");
}
}
@@ -148,7 +148,7 @@
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("queue:a").process(myProcessor);
+ from("seda:a").process(myProcessor);
}
};
// END SNIPPET: e4
@@ -161,7 +161,7 @@
assertEquals("Number routes created", 1, routes.size());
for (Route route : routes) {
Endpoint key = route.getEndpoint();
- assertEquals("From endpoint", "queue:a", key.getEndpointUri());
+ assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = getProcessorWithoutErrorHandler(route);
assertEquals("Should be called with my processor", myProcessor, processor);
@@ -172,7 +172,7 @@
// START SNIPPET: e5
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("queue:a").filter(header("foo").isEqualTo("bar")).process(myProcessor);
+ from("seda:a").filter(header("foo").isEqualTo("bar")).process(myProcessor);
}
};
// END SNIPPET: e5
@@ -187,7 +187,7 @@
assertEquals("Number routes created", 1, routes.size());
for (Route route : routes) {
Endpoint key = route.getEndpoint();
- assertEquals("From endpoint", "queue:a", key.getEndpointUri());
+ assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = getProcessorWithoutErrorHandler(route);
FilterProcessor filterProcessor = assertIsInstanceOf(FilterProcessor.class, processor);
@@ -199,7 +199,7 @@
// START SNIPPET: e6
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("queue:a").to("queue:tap", "queue:b");
+ from("seda:a").to("seda:tap", "seda:b");
}
};
// END SNIPPET: e6
@@ -214,15 +214,15 @@
assertEquals("Number routes created", 1, routes.size());
for (Route route : routes) {
Endpoint key = route.getEndpoint();
- assertEquals("From endpoint", "queue:a", key.getEndpointUri());
+ assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = getProcessorWithoutErrorHandler(route);
MulticastProcessor multicastProcessor = assertIsInstanceOf(MulticastProcessor.class, processor);
List<Endpoint> endpoints = new ArrayList<Endpoint>(multicastProcessor.getEndpoints());
assertEquals("Should have 2 endpoints", 2, endpoints.size());
- assertEndpointUri(endpoints.get(0), "queue:tap");
- assertEndpointUri(endpoints.get(1), "queue:b");
+ assertEndpointUri(endpoints.get(0), "seda:tap");
+ assertEndpointUri(endpoints.get(1), "seda:b");
}
}
@@ -235,11 +235,11 @@
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("queue:a")
+ from("seda:a")
.intercept()
.add(interceptor1)
.add(interceptor2)
- .target().to("queue:d");
+ .target().to("seda:d");
}
};
// END SNIPPET: e7
@@ -255,7 +255,7 @@
assertEquals("Number routes created", 1, routes.size());
for (Route route : routes) {
Endpoint key = route.getEndpoint();
- assertEquals("From endpoint", "queue:a", key.getEndpointUri());
+ assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = getProcessorWithoutErrorHandler(route);
DelegateProcessor p1 = assertIsInstanceOf(DelegateProcessor.class, processor);
@@ -263,7 +263,7 @@
DelegateProcessor p2 = assertIsInstanceOf(DelegateProcessor.class, processor);
- assertSendTo(p2.getProcessor(), "queue:d");
+ assertSendTo(p2.getProcessor(), "seda:d");
}
}
@@ -271,8 +271,8 @@
// START SNIPPET: e7
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("queue:a").filter(header("foo").isEqualTo(123)).to("queue:b");
- from("queue:a").filter(header("bar").isGreaterThan(45)).to("queue:b");
+ from("seda:a").filter(header("foo").isEqualTo(123)).to("seda:b");
+ from("seda:a").filter(header("bar").isGreaterThan(45)).to("seda:b");
}
};
// END SNIPPET: e7
@@ -283,7 +283,7 @@
assertEquals("Number routes created", 2, routes.size());
for (Route route : routes) {
Endpoint key = route.getEndpoint();
- assertEquals("From endpoint", "queue:a", key.getEndpointUri());
+ assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = getProcessorWithoutErrorHandler(route);
log.debug("processor: " + processor);
@@ -291,7 +291,7 @@
FilterProcessor filterProcessor = assertIsInstanceOf(FilterProcessor.class, processor);
SendProcessor sendProcessor = assertIsInstanceOf(SendProcessor.class, filterProcessor.getProcessor());
- assertEquals("Endpoint URI", "queue:b", sendProcessor.getDestination().getEndpointUri());
+ assertEquals("Endpoint URI", "seda:b", sendProcessor.getDestination().getEndpointUri());
*/
}
}
@@ -300,7 +300,7 @@
// START SNIPPET: e8
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("queue:a").to("queue:b", "queue:c", "queue:d");
+ from("seda:a").to("seda:b", "seda:c", "seda:d");
}
};
// END SNIPPET: e8
@@ -311,7 +311,7 @@
// START SNIPPET: e9
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("queue:a").recipientList(header("foo"));
+ from("seda:a").recipientList(header("foo"));
}
};
// END SNIPPET: e9
@@ -327,7 +327,7 @@
assertEquals("Number routes created", 1, routes.size());
for (Route route : routes) {
Endpoint key = route.getEndpoint();
- assertEquals("From endpoint", "queue:a", key.getEndpointUri());
+ assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = getProcessorWithoutErrorHandler(route);
RecipientList p1 = assertIsInstanceOf(RecipientList.class, processor);
@@ -338,7 +338,7 @@
// START SNIPPET: splitter
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("queue:a").splitter(bodyAs(String.class).tokenize("\n")).to("queue:b");
+ from("seda:a").splitter(bodyAs(String.class).tokenize("\n")).to("seda:b");
}
};
// END SNIPPET: splitter
@@ -354,7 +354,7 @@
assertEquals("Number routes created", 1, routes.size());
for (Route route : routes) {
Endpoint key = route.getEndpoint();
- assertEquals("From endpoint", "queue:a", key.getEndpointUri());
+ assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = getProcessorWithoutErrorHandler(route);
Splitter p1 = assertIsInstanceOf(Splitter.class, processor);
@@ -365,9 +365,9 @@
// START SNIPPET: idempotent
RouteBuilder builder = new RouteBuilder() {
public void configure() {
- from("queue:a").idempotentConsumer(
+ from("seda:a").idempotentConsumer(
header("myMessageId"), memoryMessageIdRepository(200)
- ).to("queue:b");
+ ).to("seda:b");
}
};
// END SNIPPET: idempotent
@@ -383,7 +383,7 @@
assertEquals("Number routes created", 1, routes.size());
for (Route route : routes) {
Endpoint key = route.getEndpoint();
- assertEquals("From endpoint", "queue:a", key.getEndpointUri());
+ assertEquals("From endpoint", "seda:a", key.getEndpointUri());
Processor processor = getProcessorWithoutErrorHandler(route);
IdempotentConsumer idempotentConsumer = assertIsInstanceOf(IdempotentConsumer.class, processor);
@@ -393,7 +393,7 @@
assertIsInstanceOf(MemoryMessageIdRepository.class, idempotentConsumer.getMessageIdRepository());
SendProcessor sendProcessor = assertIsInstanceOf(SendProcessor.class, idempotentConsumer.getNextProcessor());
- assertEquals("Endpoint URI", "queue:b", sendProcessor.getDestination().getEndpointUri());
+ assertEquals("Endpoint URI", "seda:b", sendProcessor.getDestination().getEndpointUri());
}
}
Copied: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaRouteTest.java (from r554558, activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/queue/QueueRouteTest.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaRouteTest.java?view=diff&rev=554600&p1=activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/queue/QueueRouteTest.java&r1=554558&p2=activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaRouteTest.java&r2=554600
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/queue/QueueRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaRouteTest.java Mon Jul 9 03:42:42 2007
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.queue;
+package org.apache.camel.component.seda;
import junit.framework.TestCase;
import org.apache.camel.CamelContext;
@@ -34,9 +34,9 @@
/**
* @version $Revision: 520220 $
*/
-public class QueueRouteTest extends TestSupport {
+public class SedaRouteTest extends TestSupport {
+
-
public void testSedaQueue() throws Exception {
final CountDownLatch latch = new CountDownLatch(1);
@@ -45,8 +45,8 @@
// lets add some routes
context.addRoutes(new RouteBuilder() {
public void configure() {
- from("queue:test.a").to("queue:test.b");
- from("queue:test.b").process(new Processor() {
+ from("seda:test.a").to("seda:test.b");
+ from("seda:test.b").process(new Processor() {
public void process(Exchange e) {
log.debug("Received exchange: " + e.getIn());
latch.countDown();
@@ -57,9 +57,9 @@
context.start();
-
+
// now lets fire in a message
- Endpoint<Exchange> endpoint = context.getEndpoint("queue:test.a");
+ Endpoint<Exchange> endpoint = context.getEndpoint("seda:test.a");
Exchange exchange = endpoint.createExchange();
exchange.getIn().setHeader("cheese", 123);
@@ -72,18 +72,18 @@
context.stop();
}
-
-
+
+
public void testThatShowsEndpointResolutionIsNotConsistent() throws Exception {
final CountDownLatch latch = new CountDownLatch(1);
CamelContext context = new DefaultCamelContext();
-
+
// lets add some routes
context.addRoutes(new RouteBuilder() {
public void configure() {
- from("queue:test.a").to("queue:test.b");
- from("queue:test.b").process(new Processor() {
+ from("seda:test.a").to("seda:test.b");
+ from("seda:test.b").process(new Processor() {
public void process(Exchange e) {
log.debug("Received exchange: " + e.getIn());
latch.countDown();
@@ -92,11 +92,11 @@
}
});
-
+
context.start();
-
+
// now lets fire in a message
- Endpoint<Exchange> endpoint = context.getEndpoint("queue:test.a");
+ Endpoint<Exchange> endpoint = context.getEndpoint("seda:test.a");
Exchange exchange = endpoint.createExchange();
exchange.getIn().setHeader("cheese", 123);
@@ -109,5 +109,5 @@
context.stop();
}
-
-}
+
+}
\ No newline at end of file
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerTest.java Mon Jul 9 03:42:42 2007
@@ -30,7 +30,7 @@
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(0);
- template.sendBody("queue:a", "<hello>world!</hello>", "JMSTimestamp", System.currentTimeMillis());
+ template.sendBody("seda:a", "<hello>world!</hello>", "JMSTimestamp", System.currentTimeMillis());
resultEndpoint.assertIsSatisfied();
// now if we wait a bit longer we should receive the message!
@@ -48,7 +48,7 @@
return new RouteBuilder() {
public void configure() {
// START SNIPPET: ex
- from("queue:a").delayer(header("JMSTimestamp"), 3000).to("mock:result");
+ from("seda:a").delayer(header("JMSTimestamp"), 3000).to("mock:result");
// END SNIPPET: ex
}
};
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThrottlerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThrottlerTest.java?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThrottlerTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThrottlerTest.java Mon Jul 9 03:42:42 2007
@@ -33,7 +33,7 @@
resultEndpoint.setDefaulResultWaitMillis(1000);
for (int i = 0; i < messageCount; i++) {
- template.sendBody("queue:a", "<message>" + i + "</message>");
+ template.sendBody("seda:a", "<message>" + i + "</message>");
}
// lets pause to give the requests time to be processed
@@ -45,7 +45,7 @@
return new RouteBuilder() {
public void configure() {
// START SNIPPET: ex
- from("queue:a").throttler(3).timePeriodMillis(30000).to("mock:result");
+ from("seda:a").throttler(3).timePeriodMillis(30000).to("mock:result");
// END SNIPPET: ex
}
};
Modified: activemq/camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteIntegration.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteIntegration.java?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteIntegration.java (original)
+++ activemq/camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteIntegration.java Mon Jul 9 03:42:42 2007
@@ -53,12 +53,12 @@
from("irc://camel-con@irc.codehaus.org:6667/%23camel-test").
choice().
when(header("irc.messageType").isEqualTo("PRIVMSG")).to("mock:result").
- when(header("irc.messageType").isEqualTo("JOIN")).to("queue:consumerJoined");
+ when(header("irc.messageType").isEqualTo("JOIN")).to("seda:consumerJoined");
// TODO this causes errors on shutdown...
//otherwise().to("mock:otherIrcCommands");
- from("queue:consumerJoined").process(new Processor() {
+ from("seda:consumerJoined").process(new Processor() {
public void process(Exchange exchange) throws Exception {
sendMessages();
}
Modified: activemq/camel/trunk/components/camel-jbi/src/test/java/org/apache/camel/component/jbi/NonJbiCamelEndpointsIntegrationTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jbi/src/test/java/org/apache/camel/component/jbi/NonJbiCamelEndpointsIntegrationTest.java?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-jbi/src/test/java/org/apache/camel/component/jbi/NonJbiCamelEndpointsIntegrationTest.java (original)
+++ activemq/camel/trunk/components/camel-jbi/src/test/java/org/apache/camel/component/jbi/NonJbiCamelEndpointsIntegrationTest.java Mon Jul 9 03:42:42 2007
@@ -128,7 +128,7 @@
}
protected void configureExchange(ServiceMixClient client, MessageExchange exchange) {
- ServiceEndpoint endpoint = client.getContext().getEndpoint(CamelJbiEndpoint.SERVICE_NAME, "queue:a");
+ ServiceEndpoint endpoint = client.getContext().getEndpoint(CamelJbiEndpoint.SERVICE_NAME, "seda:a");
assertNotNull("Should have a Camel endpoint exposed in JBI!", endpoint);
exchange.setEndpoint(endpoint);
}
Modified: activemq/camel/trunk/components/camel-jbi/src/test/java/org/apache/camel/component/jbi/SendFromCamelToJbiAndBackToCamelTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jbi/src/test/java/org/apache/camel/component/jbi/SendFromCamelToJbiAndBackToCamelTest.java?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-jbi/src/test/java/org/apache/camel/component/jbi/SendFromCamelToJbiAndBackToCamelTest.java (original)
+++ activemq/camel/trunk/components/camel-jbi/src/test/java/org/apache/camel/component/jbi/SendFromCamelToJbiAndBackToCamelTest.java Mon Jul 9 03:42:42 2007
@@ -19,7 +19,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.queue.QueueEndpoint;
+import org.apache.camel.component.seda.SedaEndpoint;
import org.apache.servicemix.jbi.container.ActivationSpec;
import org.apache.servicemix.jbi.resolver.URIResolver;
import org.apache.servicemix.tck.SenderComponent;
@@ -38,7 +38,7 @@
public void testCamelInvokingJbi() throws Exception {
senderComponent.sendMessages(1);
- QueueEndpoint receiverEndpoint = (QueueEndpoint) camelContext.getEndpoint("queue:receiver");
+ SedaEndpoint receiverEndpoint = (SedaEndpoint) camelContext.getEndpoint("seda:receiver");
BlockingQueue<Exchange> queue = receiverEndpoint.getQueue();
Exchange exchange = queue.poll(5, TimeUnit.SECONDS);
@@ -57,7 +57,7 @@
}
protected void appendJbiActivationSpecs(List<ActivationSpec> activationSpecList) {
- this.startEndpointUri = "queue:receiver";
+ this.startEndpointUri = "seda:receiver";
ActivationSpec activationSpec = new ActivationSpec();
activationSpec.setId("jbiSender");
@@ -65,7 +65,7 @@
activationSpec.setEndpoint("endpointA");
// lets setup the sender to talk directly to camel
- senderComponent.setResolver(new URIResolver("camel:queue:receiver"));
+ senderComponent.setResolver(new URIResolver("camel:seda:receiver"));
activationSpec.setComponent(senderComponent);
activationSpecList.add(activationSpec);
Modified: activemq/camel/trunk/components/camel-jbi/src/test/resources/org/apache/camel/component/jbi/su1-src/camel-context.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jbi/src/test/resources/org/apache/camel/component/jbi/su1-src/camel-context.xml?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-jbi/src/test/resources/org/apache/camel/component/jbi/su1-src/camel-context.xml (original)
+++ activemq/camel/trunk/components/camel-jbi/src/test/resources/org/apache/camel/component/jbi/su1-src/camel-context.xml Mon Jul 9 03:42:42 2007
@@ -26,12 +26,12 @@
">
<!--
- from("queue:a").to("queue:b");
+ from("seda:a").to("seda:b");
-->
<camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
- <to uri="queue:b"/>
+ <from uri="seda:a"/>
+ <to uri="seda:b"/>
</route>
</camelContext>
Modified: activemq/camel/trunk/components/camel-jbi/src/test/resources/org/apache/camel/component/jbi/su2-src/camel-context.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jbi/src/test/resources/org/apache/camel/component/jbi/su2-src/camel-context.xml?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-jbi/src/test/resources/org/apache/camel/component/jbi/su2-src/camel-context.xml (original)
+++ activemq/camel/trunk/components/camel-jbi/src/test/resources/org/apache/camel/component/jbi/su2-src/camel-context.xml Mon Jul 9 03:42:42 2007
@@ -26,12 +26,12 @@
">
<!--
- from("queue:a").to("queue:b");
+ from("seda:a").to("seda:b");
-->
<camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="jbi:endpoint:http://foo.bar.org/myService/myEndpointName"/>
- <to uri="queue:b"/>
+ <to uri="seda:b"/>
</route>
</camelContext>
Modified: activemq/camel/trunk/components/camel-jbi/src/test/resources/org/apache/camel/component/jbi/su3-src/camel-context.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jbi/src/test/resources/org/apache/camel/component/jbi/su3-src/camel-context.xml?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-jbi/src/test/resources/org/apache/camel/component/jbi/su3-src/camel-context.xml (original)
+++ activemq/camel/trunk/components/camel-jbi/src/test/resources/org/apache/camel/component/jbi/su3-src/camel-context.xml Mon Jul 9 03:42:42 2007
@@ -26,12 +26,12 @@
">
<!--
- from("queue:a").to("queue:b");
+ from("seda:a").to("seda:b");
-->
<camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="jbi:service:http://foo.bar.org/myService"/>
- <to uri="queue:b"/>
+ <to uri="seda:b"/>
</route>
</camelContext>
Modified: activemq/camel/trunk/components/camel-jbi/src/test/resources/org/apache/camel/component/jbi/su4-src/camel-context.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jbi/src/test/resources/org/apache/camel/component/jbi/su4-src/camel-context.xml?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-jbi/src/test/resources/org/apache/camel/component/jbi/su4-src/camel-context.xml (original)
+++ activemq/camel/trunk/components/camel-jbi/src/test/resources/org/apache/camel/component/jbi/su4-src/camel-context.xml Mon Jul 9 03:42:42 2007
@@ -26,12 +26,12 @@
">
<!--
- from("queue:a").to("queue:b");
+ from("seda:a").to("seda:b");
-->
<camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
<from uri="jbi:name:cheese"/>
- <to uri="queue:b"/>
+ <to uri="seda:b"/>
</route>
</camelContext>
Modified: activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java (original)
+++ activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java Mon Jul 9 03:42:42 2007
@@ -30,8 +30,6 @@
* @version $Revision:520964 $
*/
public class MailComponent extends DefaultComponent<MailExchange> {
- public static final String QUEUE_PREFIX = "queue:";
- public static final String TOPIC_PREFIX = "topic:";
private MailConfiguration configuration;
/**
Modified: activemq/camel/trunk/components/camel-spring/README.txt
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/README.txt?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-spring/README.txt (original)
+++ activemq/camel/trunk/components/camel-spring/README.txt Mon Jul 9 03:42:42 2007
@@ -11,13 +11,13 @@
Where in Java you would do a:
- from("queue:a").to("queue:b")
+ from("seda:a").to("seda:b")
The spring configuration equivalent would be as follows:
<route>
- <from uri="queue:a"/>
- <to uri="queue:b"/>
+ <from uri="seda:a"/>
+ <to uri="seda:b"/>
</route>
Developers
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java Mon Jul 9 03:42:42 2007
@@ -64,7 +64,7 @@
Processor processor = consumerRoute.getProcessor();
assertNotNull(processor);
- assertEndpointUri(key, "queue:test.a");
+ assertEndpointUri(key, "seda:test.a");
}
}
@@ -86,7 +86,7 @@
Processor processor = consumerRoute.getProcessor();
assertNotNull(processor);
- assertEndpointUri(key, "queue:test.c");
+ assertEndpointUri(key, "seda:test.c");
}
}
}
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java Mon Jul 9 03:42:42 2007
@@ -47,7 +47,7 @@
// now lets send a message
CamelTemplate<Exchange> template = new CamelTemplate<Exchange>(context);
- template.send("queue:start", new Processor() {
+ template.send("seda:start", new Processor() {
public void process(Exchange exchange) {
Message in = exchange.getIn();
in.setHeader("name", "James");
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/test1/MyRouteBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/test1/MyRouteBuilder.java?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/test1/MyRouteBuilder.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/test1/MyRouteBuilder.java Mon Jul 9 03:42:42 2007
@@ -24,6 +24,6 @@
*/
public class MyRouteBuilder extends RouteBuilder {
public void configure() {
- from("queue:test.a").to("queue:test.b");
+ from("seda:test.a").to("seda:test.b");
}
}
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/builder/spring_route_builder_test.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/builder/spring_route_builder_test.xml?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/builder/spring_route_builder_test.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/builder/spring_route_builder_test.xml Mon Jul 9 03:42:42 2007
@@ -30,63 +30,63 @@
<!--
- from("queue:a").to("queue:b");
+ from("seda:a").to("seda:b");
-->
<!-- START SNIPPET: e1 -->
<camelContext id="buildSimpleRoute" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
- <to uri="queue:b"/>
+ <from uri="seda:a"/>
+ <to uri="seda:b"/>
</route>
</camelContext>
<!-- END SNIPPET: e1 -->
<!--
- from("queue:a").filter(header("foo").isEqualTo("bar")).to("queue:b");
+ from("seda:a").filter(header("foo").isEqualTo("bar")).to("seda:b");
-->
<!-- START SNIPPET: e2 -->
<camelContext id="buildSimpleRouteWithHeaderPredicate" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<filter>
<predicate>
<header name="foo"/>
<isEqualTo value="bar"/>
</predicate>
</filter>
- <to uri="queue:b"/>
+ <to uri="seda:b"/>
</route>
</camelContext>
<!-- END SNIPPET: e2 -->
<!--
- from("queue:a").choice()
- .when(header("foo").isEqualTo("bar")).to("queue:b")
- .when(header("foo").isEqualTo("cheese")).to("queue:c")
- .otherwise().to("queue:d");
+ from("seda:a").choice()
+ .when(header("foo").isEqualTo("bar")).to("seda:b")
+ .when(header("foo").isEqualTo("cheese")).to("seda:c")
+ .otherwise().to("seda:d");
-->
<!-- START SNIPPET: e3 -->
<camelContext id="buildSimpleRouteWithChoice" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<choice>
<when>
<predicate>
<header name="foo"/>
<isEqualTo value="bar"/>
</predicate>
- <to uri="queue:b"/>
+ <to uri="seda:b"/>
</when>
<when>
<predicate>
<header name="foo"/>
<isEqualTo value="cheese"/>
</predicate>
- <to uri="queue:c"/>
+ <to uri="seda:c"/>
</when>
<otherwise>
- <to uri="queue:d"/>
+ <to uri="seda:d"/>
</otherwise>
</choice>
</route>
@@ -95,25 +95,25 @@
<!--
- from("queue:a").process(myProcessor);
+ from("seda:a").process(myProcessor);
-->
<!-- START SNIPPET: e4 -->
<bean id="myProcessor" class="org.apache.camel.builder.MyProcessor"/>
<camelContext id="buildCustomProcessor" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<process ref="#myProcessor"/>
</route>
</camelContext>
<!-- END SNIPPET: e4 -->
<!--
- from("queue:a").filter(header("foo").isEqualTo("bar")).process(myProcessor);
+ from("seda:a").filter(header("foo").isEqualTo("bar")).process(myProcessor);
-->
<!-- START SNIPPET: e5 -->
<camelContext id="buildCustomProcessorWithFilter" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<filter>
<predicate>
<header name="foo"/>
@@ -127,15 +127,15 @@
<!--
- from("queue:a").to("queue:tap", "queue:b");
+ from("seda:a").to("seda:tap", "seda:b");
-->
<!-- START SNIPPET: e6-->
<camelContext id="buildWireTap" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<to>
- <uri>queue:tap</uri>
- <uri>queue:b</uri>
+ <uri>seda:tap</uri>
+ <uri>seda:b</uri>
</to>
</route>
</camelContext>
@@ -143,38 +143,38 @@
<!--
- from("queue:a")
+ from("seda:a")
.intercept()
.add(interceptor1)
.add(interceptor2)
- .target().to("queue:d");
+ .target().to("seda:d");
-->
<!-- START SNIPPET: e7 -->
<bean id="interceptor1" class="org.apache.camel.builder.MyInterceptorProcessor"/>
<bean id="interceptor2" class="org.apache.camel.builder.MyInterceptorProcessor"/>
<camelContext id="buildRouteWithInterceptor" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<intercept>
<interceptor ref="#interceptor1"/>
<interceptor ref="#interceptor2"/>
</intercept>
- <to uri="queue:d"/>
+ <to uri="seda:d"/>
</route>
</camelContext>
<!-- END SNIPPET: e7 -->
<!--
- from("queue:a").to("queue:b", "queue:c", "queue:d");
+ from("seda:a").to("seda:b", "seda:c", "seda:d");
-->
<!-- START SNIPPET: e8 -->
<camelContext id="buildStaticRecipientList" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<to>
- <uri>queue:b</uri>
- <uri>queue:c</uri>
- <uri>queue:d</uri>
+ <uri>seda:b</uri>
+ <uri>seda:c</uri>
+ <uri>seda:d</uri>
</to>
</route>
</camelContext>
@@ -182,12 +182,12 @@
<!--
- from("queue:a").recipientList(header("foo"));
+ from("seda:a").recipientList(header("foo"));
-->
<!-- START SNIPPET: e9 -->
<camelContext id="buildDynamicRecipientList" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<recipientList>
<recipients>
<header name="foo"/>
@@ -198,12 +198,12 @@
<!-- END SNIPPET: e9 -->
<!--
- from("queue:a").splitter(bodyAs(String.class).tokenize("\n")).to("queue:b");
+ from("seda:a").splitter(bodyAs(String.class).tokenize("\n")).to("seda:b");
-->
<!-- START SNIPPET: splitter -->
<camelContext id="buildSplitter" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<splitter>
<recipients>
<bodyAs class="java.lang.String"/>
@@ -211,23 +211,23 @@
"/>
</recipients>
</splitter>
- <to uri="queue:b"/>
+ <to uri="seda:b"/>
</route>
</camelContext>
<!-- END SNIPPET: splitter -->
<!--
- from("queue:a").idempotentConsumer(header("myMessageId"), memoryMessageIdRepository()).to("queue:b");
+ from("seda:a").idempotentConsumer(header("myMessageId"), memoryMessageIdRepository()).to("seda:b");
-->
<!-- START SNIPPET: idempotent -->
<camelContext id="buildIdempotentConsumer" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<!--
<idempotentConsumer>
</idempotentConsumer>
-->
- <to uri="queue:b"/>
+ <to uri="seda:b"/>
</route>
</camelContext>
<!-- END SNIPPET: idempotent -->
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/camelContextFactoryBean.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/camelContextFactoryBean.xml?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/camelContextFactoryBean.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/camelContextFactoryBean.xml Mon Jul 9 03:42:42 2007
@@ -31,8 +31,8 @@
<!-- START SNIPPET: example2 -->
<camelContext id="camel2" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:test.c"/>
- <to uri="queue:test.d"/>
+ <from uri="seda:test.c"/>
+ <to uri="seda:test.d"/>
</route>
</camelContext>
<!-- END SNIPPET: example2 -->
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/examples.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/examples.xml?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/examples.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/examples.xml Mon Jul 9 03:42:42 2007
@@ -29,12 +29,12 @@
<camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
- <to uri="queue:b"/>
+ <from uri="seda:a"/>
+ <to uri="seda:b"/>
</route>
<route>
- <from uri="queue:a"/>
- <to uri="queue:b"/>
+ <from uri="seda:a"/>
+ <to uri="seda:b"/>
</route>
<route>
<from ref="a"/>
@@ -42,12 +42,12 @@
</route>
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<process ref="myProcessor"/>
</route>
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<filter>
<predicate>
<header name="foo"/>
@@ -64,7 +64,7 @@
</route>
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<intercept>
<interceptor ref="interceptor1"/>
<interceptor ref="#interceptor2"/>
@@ -73,53 +73,53 @@
<interceptor ref="#interceptor1"/>
<interceptor ref="interceptor2"/>
</intercept>
- <to uri="queue:b"/>
+ <to uri="seda:b"/>
</route>
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<choice>
<when>
<predicate>
<header name="foo"/>
<isEqualTo value="bar"/>
</predicate>
- <to uri="queue:b"/>
+ <to uri="seda:b"/>
</when>
<when>
<predicate>
<header name="foo"/>
<isNotEqualTo value="cheese"/>
</predicate>
- <to uri="queue:c"/>
+ <to uri="seda:c"/>
</when>
<otherwise>
- <to uri="queue:d"/>
+ <to uri="seda:d"/>
</otherwise>
</choice>
</route>
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<filter>
<predicate>
<header name="foo"/>
<isEqualTo value="bar"/>
</predicate>
</filter>
- <to uri="queue:b"/>
+ <to uri="seda:b"/>
</route>
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<to>
- <uri>queue:tap</uri>
- <uri>queue:a</uri>
+ <uri>seda:tap</uri>
+ <uri>seda:a</uri>
</to>
</route>
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<recipientList>
<recipients>
<header name=""/>
@@ -128,7 +128,7 @@
</route>
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<recipientList>
<recipients>
<header name=""/>
@@ -138,7 +138,7 @@
</route>
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<filter>
<predicate>
<body/>
@@ -154,7 +154,7 @@
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<splitter>
<recipients>
<bodyAs class="java.lang.String"/>
@@ -162,7 +162,7 @@
"/>
</recipients>
</splitter>
- <to uri="queue:b"/>
+ <to uri="seda:b"/>
</route>
</camelContext>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/routingUsingCamelContextFactory.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/routingUsingCamelContextFactory.xml?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/routingUsingCamelContextFactory.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/routingUsingCamelContextFactory.xml Mon Jul 9 03:42:42 2007
@@ -25,7 +25,7 @@
<!-- START SNIPPET: example -->
<camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:start"/>
+ <from uri="seda:start"/>
<to uri="mock:result"/>
</route>
</camelContext>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessor.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessor.xml?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessor.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessor.xml Mon Jul 9 03:42:42 2007
@@ -23,14 +23,14 @@
">
<!--
- from("queue:a").process(myProcessor);
+ from("seda:a").process(myProcessor);
-->
<!-- START SNIPPET: example -->
<bean id="myProcessor" class="org.apache.camel.builder.MyProcessor"/>
<camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<process ref="myProcessor"/>
</route>
</camelContext>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessorWithFilter.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessorWithFilter.xml?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessorWithFilter.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildCustomProcessorWithFilter.xml Mon Jul 9 03:42:42 2007
@@ -23,14 +23,14 @@
">
<!--
- from("queue:a").filter(header("foo").isEqualTo("bar")).process(myProcessor);
+ from("seda:a").filter(header("foo").isEqualTo("bar")).process(myProcessor);
-->
<!-- START SNIPPET: example -->
<bean id="myProcessor" class="org.apache.camel.builder.MyProcessor"/>
<camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<filter>
<predicate>
<header name="foo"/>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildDynamicRecipientList.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildDynamicRecipientList.xml?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildDynamicRecipientList.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildDynamicRecipientList.xml Mon Jul 9 03:42:42 2007
@@ -23,12 +23,12 @@
">
<!--
- from("queue:a").recipientList(header("foo"));
+ from("seda:a").recipientList(header("foo"));
-->
<!-- START SNIPPET: example -->
<camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<recipientList>
<recipients>
<header name="foo"/>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildIdempotentConsumer.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildIdempotentConsumer.xml?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildIdempotentConsumer.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildIdempotentConsumer.xml Mon Jul 9 03:42:42 2007
@@ -23,17 +23,17 @@
">
<!--
- from("queue:a").idempotentConsumer(header("myMessageId"), memoryMessageIdRepository()).to("queue:b");
+ from("seda:a").idempotentConsumer(header("myMessageId"), memoryMessageIdRepository()).to("seda:b");
-->
<!-- START SNIPPET: example -->
<camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<!--
<idempotentConsumer>
</idempotentConsumer>
-->
- <to uri="queue:b"/>
+ <to uri="seda:b"/>
</route>
</camelContext>
<!-- END SNIPPET: example -->
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildRouteWithInterceptor.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildRouteWithInterceptor.xml?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildRouteWithInterceptor.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildRouteWithInterceptor.xml Mon Jul 9 03:42:42 2007
@@ -23,11 +23,11 @@
">
<!--
- from("queue:a")
+ from("seda:a")
.intercept()
.add(interceptor1)
.add(interceptor2)
- .target().to("queue:d");
+ .target().to("seda:d");
-->
<!-- START SNIPPET: example -->
<bean id="interceptor1" class="org.apache.camel.builder.MyInterceptorProcessor"/>
@@ -35,12 +35,12 @@
<camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<intercept>
<interceptor ref="interceptor1"/>
<interceptor ref="interceptor2"/>
</intercept>
- <to uri="queue:d"/>
+ <to uri="seda:d"/>
</route>
</camelContext>
<!-- END SNIPPET: example -->
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRoute.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRoute.xml?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRoute.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRoute.xml Mon Jul 9 03:42:42 2007
@@ -23,13 +23,13 @@
">
<!--
- from("queue:a").to("queue:b");
+ from("seda:a").to("seda:b");
-->
<!-- START SNIPPET: example -->
<camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
- <to uri="queue:b"/>
+ <from uri="seda:a"/>
+ <to uri="seda:b"/>
</route>
</camelContext>
<!-- END SNIPPET: example -->
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithChoice.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithChoice.xml?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithChoice.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithChoice.xml Mon Jul 9 03:42:42 2007
@@ -23,32 +23,32 @@
">
<!--
- from("queue:a").choice()
- .when(header("foo").isEqualTo("bar")).to("queue:b")
- .when(header("foo").isEqualTo("cheese")).to("queue:c")
- .otherwise().to("queue:d");
+ from("seda:a").choice()
+ .when(header("foo").isEqualTo("bar")).to("seda:b")
+ .when(header("foo").isEqualTo("cheese")).to("seda:c")
+ .otherwise().to("seda:d");
-->
<!-- START SNIPPET: example -->
<camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<choice>
<when>
<predicate>
<header name="foo"/>
<isEqualTo value="bar"/>
</predicate>
- <to uri="queue:b"/>
+ <to uri="seda:b"/>
</when>
<when>
<predicate>
<header name="foo"/>
<isEqualTo value="cheese"/>
</predicate>
- <to uri="queue:c"/>
+ <to uri="seda:c"/>
</when>
<otherwise>
- <to uri="queue:d"/>
+ <to uri="seda:d"/>
</otherwise>
</choice>
</route>
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithHeaderPredicate.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithHeaderPredicate.xml?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithHeaderPredicate.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSimpleRouteWithHeaderPredicate.xml Mon Jul 9 03:42:42 2007
@@ -23,19 +23,19 @@
">
<!--
- from("queue:a").filter(header("foo").isEqualTo("bar")).to("queue:b");
+ from("seda:a").filter(header("foo").isEqualTo("bar")).to("seda:b");
-->
<!-- START SNIPPET: example -->
<camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<filter>
<predicate>
<header name="foo"/>
<isEqualTo value="bar"/>
</predicate>
</filter>
- <to uri="queue:b"/>
+ <to uri="seda:b"/>
</route>
</camelContext>
<!-- END SNIPPET: example -->
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildSplitter.xml Mon Jul 9 03:42:42 2007
@@ -23,12 +23,12 @@
">
<!--
- from("queue:a").splitter(bodyAs(String.class).tokenize("\n")).to("queue:b");
+ from("seda:a").splitter(bodyAs(String.class).tokenize("\n")).to("seda:b");
-->
<!-- START SNIPPET: example -->
<camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<splitter>
<recipients>
<bodyAs class="java.lang.String"/>
@@ -36,7 +36,7 @@
"/>
</recipients>
</splitter>
- <to uri="queue:b"/>
+ <to uri="seda:b"/>
</route>
</camelContext>
<!-- END SNIPPET: example -->
Modified: activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildStaticRecipientList.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildStaticRecipientList.xml?view=diff&rev=554600&r1=554599&r2=554600
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildStaticRecipientList.xml (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/xml/buildStaticRecipientList.xml Mon Jul 9 03:42:42 2007
@@ -23,16 +23,16 @@
">
<!--
- from("queue:a").to("queue:b", "queue:c", "queue:d");
+ from("seda:a").to("seda:b", "seda:c", "seda:d");
-->
<!-- START SNIPPET: example -->
<camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
<route>
- <from uri="queue:a"/>
+ <from uri="seda:a"/>
<to>
- <uri>queue:b</uri>
- <uri>queue:c</uri>
- <uri>queue:d</uri>
+ <uri>seda:b</uri>
+ <uri>seda:c</uri>
+ <uri>seda:d</uri>
</to>
</route>
</camelContext>