camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r791395 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/component/ref/ camel-core/src/main/java/org/apache/camel/model/ camel-core/src/main/java/org/apache/camel/processor/ camel-core/src/main/java/org/apache/camel/util/ camel-...
Date Mon, 06 Jul 2009 07:02:04 GMT
Author: davsclaus
Date: Mon Jul  6 07:02:03 2009
New Revision: 791395

URL: http://svn.apache.org/viewvc?rev=791395&view=rev
Log:
CAMEL-1756: A little whoa with the endpoint resolution as we need to enforce using // in the path as some protocols require this. CAMEL-1798: redelivery default changed maximum redeliveries from 5 to 0.

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/ref/RefComponent.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ContextErrorHandlerTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaNoConsumerTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/impl/FromEndpointTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/impl/FromMultipleEndpointTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationCustomMBeanTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/model/ProcessorTypeConfigurationTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnExceptionOnRedeliveryTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnRedeliveryTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerOnExceptionTraceTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/NavigateRouteTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalTraceTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapUsingFireAndForgetTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromUriWildcardHeaderUriTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromUriWildcardTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToEndpointDynamicTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSimpleRouteTraceTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorDestinationTest.java
    camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestComponent.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetTest.java
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml
    camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamComponent.java
    camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
    camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/ref/RefComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/ref/RefComponent.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/ref/RefComponent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/ref/RefComponent.java Mon Jul  6 07:02:03 2009
@@ -35,6 +35,9 @@
         if (index >= 0) {
             name = uri.substring(index + 1);
         }
+        if (name.startsWith("//")) {
+            name = name.substring(2);
+        }
         return lookupEndpoint(name, parameters);
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java Mon Jul  6 07:02:03 2009
@@ -168,7 +168,7 @@
             if (method != null) {
                 methodText = " method: " + method;
             }
-            return "ref: " + ref + methodText;
+            return "ref:" + ref + methodText;
         } else if (bean != null) {
             return bean.toString();
         } else if (beanType != null) {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java Mon Jul  6 07:02:03 2009
@@ -217,7 +217,7 @@
         if (loadBalancerType != null) {
             return "LoadBalanceType[" + loadBalancerType + ", " + getOutputs() + "]";
         } else {
-            return "LoadBalanceType[ref: " + ref + ", " + getOutputs() + "]";
+            return "LoadBalanceType[ref:" + ref + ", " + getOutputs() + "]";
         }
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java Mon Jul  6 07:02:03 2009
@@ -83,7 +83,7 @@
         if (dataFormatType != null) {
             return "Marshal[" + dataFormatType + "]";
         } else {
-            return "Marshal[ref: " + ref + "]";
+            return "Marshal[ref:" + ref + "]";
         }
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java Mon Jul  6 07:02:03 2009
@@ -65,7 +65,7 @@
     @Override
     public String getLabel() {
         if (ref != null) {
-            return "ref: " + ref;
+            return "ref:" + ref;
         } else if (policy != null) {
             return policy.toString();
         } else {
@@ -121,7 +121,7 @@
         if (policy != null) {
             return policy.toString();
         } else {
-            return "ref: " + ref;
+            return "ref:" + ref;
         }
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java Mon Jul  6 07:02:03 2009
@@ -54,7 +54,7 @@
     @Override
     public String toString() {
         return "process["
-                + ((ref != null) ? "ref: " + ref : processor)
+                + ((ref != null) ? "ref:" + ref : processor)
                 + "]";
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java Mon Jul  6 07:02:03 2009
@@ -50,7 +50,7 @@
 
     @Override
     public String toString() {
-        return "ThrowException[" + (exception != null ? exception.getClass().getCanonicalName() : "ref: " + ref) + "]";
+        return "ThrowException[" + (exception != null ? exception.getClass().getCanonicalName() : "ref:" + ref) + "]";
     }
 
     @Override

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java Mon Jul  6 07:02:03 2009
@@ -78,7 +78,7 @@
     @Override
     public String getLabel() {
         if (ref != null) {
-            return "ref: " + ref;
+            return "ref:" + ref;
         } else if (policy != null) {
             return policy.toString();
         } else {
@@ -135,7 +135,7 @@
         if (policy != null) {
             return policy.toString();
         } else {
-            return "ref: " + ref;
+            return "ref:" + ref;
         }
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java Mon Jul  6 07:02:03 2009
@@ -85,7 +85,7 @@
         if (dataFormatType != null) {
             return "Marshal[" + dataFormatType + "]";
         } else {
-            return "Marshal[ref: " + ref + "]";
+            return "Marshal[ref:" + ref + "]";
         }
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java Mon Jul  6 07:02:03 2009
@@ -36,7 +36,7 @@
  * <p>
  * The default values are:
  * <ul>
- *   <li>maximumRedeliveries = 5</li>
+ *   <li>maximumRedeliveries = 0</li>
  *   <li>redeliverDelay = 1000L (the initial delay)</li>
  *   <li>maximumRedeliveryDelay = 60 * 1000L</li>
  *   <li>backOffMultiplier = 2</li>
@@ -75,7 +75,7 @@
     private static final transient Log LOG = LogFactory.getLog(RedeliveryPolicy.class);
 
     protected long redeliverDelay = 1000L;
-    protected int maximumRedeliveries = 5;
+    protected int maximumRedeliveries = 0;
     protected long maximumRedeliveryDelay = 60 * 1000L;
     protected double backOffMultiplier = 2;
     protected boolean useExponentialBackOff;

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/URISupport.java Mon Jul  6 07:02:03 2009
@@ -389,12 +389,8 @@
     }
 
     private static String buildUri(String scheme, String path, String query) {
-        // http scheme should have //
-        if (scheme.startsWith("http")) {
-            return scheme + "://" + path + (query != null ? "?" + query : "");
-        }
-        // the order should not as we really dont use them for other types of components
-        return scheme + ":" + path + (query != null ? "?" + query : "");
+        // must include :// to do a correct URI all components can work with
+        return scheme + "://" + path + (query != null ? "?" + query : "");
     }
    
 }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ContextErrorHandlerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ContextErrorHandlerTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ContextErrorHandlerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ContextErrorHandlerTest.java Mon Jul  6 07:02:03 2009
@@ -71,7 +71,7 @@
         assertEquals("Number routes created" + list, 1, list.size());
         for (Route route : list) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda:a", key.getEndpointUri());
+            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
 
             EventDrivenConsumerRoute consumerRoute = assertIsInstanceOf(EventDrivenConsumerRoute.class, route);
             Processor processor = consumerRoute.getProcessor();

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java Mon Jul  6 07:02:03 2009
@@ -52,7 +52,7 @@
         assertEquals("Number routes created" + list, 1, list.size());
         for (Route route : list) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda:a", key.getEndpointUri());
+            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
 
             EventDrivenConsumerRoute consumerRoute = assertIsInstanceOf(EventDrivenConsumerRoute.class, route);
             Channel channel = unwrapChannel(consumerRoute.getProcessor());
@@ -103,7 +103,7 @@
         assertEquals("Number routes created" + list, 1, list.size());
         for (Route route : list) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda:a", key.getEndpointUri());
+            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
 
             EventDrivenConsumerRoute consumerRoute = assertIsInstanceOf(EventDrivenConsumerRoute.class, route);
             Channel channel = unwrapChannel(consumerRoute.getProcessor());
@@ -131,7 +131,7 @@
         assertEquals("Number routes created" + list, 1, list.size());
         for (Route route : list) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda:a", key.getEndpointUri());
+            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
 
             EventDrivenConsumerRoute consumerRoute = assertIsInstanceOf(EventDrivenConsumerRoute.class, route);
             Processor processor = consumerRoute.getProcessor();
@@ -159,7 +159,7 @@
         assertEquals("Number routes created", 1, routes.size());
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda:a", key.getEndpointUri());
+            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
             EventDrivenConsumerRoute consumerRoute = assertIsInstanceOf(EventDrivenConsumerRoute.class, route);
             Channel channel = unwrapChannel(consumerRoute.getProcessor());
 

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java Mon Jul  6 07:02:03 2009
@@ -76,13 +76,13 @@
         assertEquals("Number routes created", 1, routes.size());
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda:a", key.getEndpointUri());
+            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
 
             EventDrivenConsumerRoute consumer = assertIsInstanceOf(EventDrivenConsumerRoute.class, route);
             Channel channel = unwrapChannel(consumer.getProcessor());
 
             SendProcessor sendProcessor = assertIsInstanceOf(SendProcessor.class, channel.getNextProcessor());
-            assertEquals("Endpoint URI", "seda:b", sendProcessor.getDestination().getEndpointUri());
+            assertEquals("Endpoint URI", "seda://b", sendProcessor.getDestination().getEndpointUri());
         }
     }
 
@@ -107,14 +107,14 @@
         assertEquals("Number routes created", 1, routes.size());
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda:a", key.getEndpointUri());
+            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
 
             EventDrivenConsumerRoute consumer = assertIsInstanceOf(EventDrivenConsumerRoute.class, route);
             Channel channel = unwrapChannel(consumer.getProcessor());
 
             FilterProcessor filterProcessor = assertIsInstanceOf(FilterProcessor.class, channel.getNextProcessor());
             SendProcessor sendProcessor = assertIsInstanceOf(SendProcessor.class, unwrapChannel(filterProcessor).getNextProcessor());
-            assertEquals("Endpoint URI", "seda:b", sendProcessor.getDestination().getEndpointUri());
+            assertEquals("Endpoint URI", "seda://b", sendProcessor.getDestination().getEndpointUri());
         }
     }
 
@@ -140,7 +140,7 @@
         assertEquals("Number routes created", 1, routes.size());
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda:a", key.getEndpointUri());
+            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
 
             EventDrivenConsumerRoute consumer = assertIsInstanceOf(EventDrivenConsumerRoute.class, route);
             Channel channel = unwrapChannel(consumer.getProcessor());
@@ -150,12 +150,12 @@
             assertEquals("Should be two when clauses", 2, filters.size());
 
             FilterProcessor filter1 = filters.get(0);
-            assertSendTo(unwrapChannel(filter1.getProcessor()).getNextProcessor(), "seda:b");
+            assertSendTo(unwrapChannel(filter1.getProcessor()).getNextProcessor(), "seda://b");
 
             FilterProcessor filter2 = filters.get(1);
-            assertSendTo(unwrapChannel(filter2.getProcessor()).getNextProcessor(), "seda:c");
+            assertSendTo(unwrapChannel(filter2.getProcessor()).getNextProcessor(), "seda://c");
 
-            assertSendTo(unwrapChannel(choiceProcessor.getOtherwise()).getNextProcessor(), "seda:d");
+            assertSendTo(unwrapChannel(choiceProcessor.getOtherwise()).getNextProcessor(), "seda://d");
         }
     }
 
@@ -184,7 +184,7 @@
         assertEquals("Number routes created", 1, routes.size());
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda:a", key.getEndpointUri());
+            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
             EventDrivenConsumerRoute consumer = assertIsInstanceOf(EventDrivenConsumerRoute.class, route);
             Channel channel = unwrapChannel(consumer.getProcessor());
 
@@ -213,7 +213,7 @@
         assertEquals("Number routes created", 1, routes.size());
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda:a", key.getEndpointUri());
+            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
 
             EventDrivenConsumerRoute consumer = assertIsInstanceOf(EventDrivenConsumerRoute.class, route);
             Channel channel = unwrapChannel(consumer.getProcessor());
@@ -244,7 +244,7 @@
         assertEquals("Number routes created", 1, routes.size());
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda:a", key.getEndpointUri());
+            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
 
             EventDrivenConsumerRoute consumer = assertIsInstanceOf(EventDrivenConsumerRoute.class, route);
             Channel channel = unwrapChannel(consumer.getProcessor());
@@ -253,8 +253,8 @@
             List<Processor> endpoints = new ArrayList<Processor>(multicastProcessor.getProcessors());
             assertEquals("Should have 2 endpoints", 2, endpoints.size());
 
-            assertSendToProcessor(unwrapChannel(endpoints.get(0)).getNextProcessor(), "seda:tap");
-            assertSendToProcessor(unwrapChannel(endpoints.get(1)).getNextProcessor(), "seda:b");
+            assertSendToProcessor(unwrapChannel(endpoints.get(0)).getNextProcessor(), "seda://tap");
+            assertSendToProcessor(unwrapChannel(endpoints.get(1)).getNextProcessor(), "seda://b");
         }
     }
 
@@ -285,7 +285,7 @@
         assertEquals("Number routes created", 1, routes.size());
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda:a", key.getEndpointUri());
+            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
 
             EventDrivenConsumerRoute consumer = assertIsInstanceOf(EventDrivenConsumerRoute.class, route);
 
@@ -295,7 +295,7 @@
 
             List<Processor> processors = new ArrayList<Processor>(line.getProcessors());
             Processor sendTo = assertIsInstanceOf(SendProcessor.class, unwrapChannel(processors.get(2)).getNextProcessor());
-            assertSendTo(sendTo, "seda:d");
+            assertSendTo(sendTo, "seda://d");
         }
     }
 
@@ -317,7 +317,7 @@
         assertEquals("Number routes created", 2, routes.size());
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda:a", key.getEndpointUri());
+            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
         }
     }
 
@@ -356,7 +356,7 @@
         assertEquals("Number routes created", 1, routes.size());
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda:a", key.getEndpointUri());
+            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
 
             EventDrivenConsumerRoute consumer = assertIsInstanceOf(EventDrivenConsumerRoute.class, route);
             Channel channel = unwrapChannel(consumer.getProcessor());
@@ -387,7 +387,7 @@
         assertEquals("Number routes created", 1, routes.size());
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda:a", key.getEndpointUri());
+            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
 
             EventDrivenConsumerRoute consumer = assertIsInstanceOf(EventDrivenConsumerRoute.class, route);
             Channel channel = unwrapChannel(consumer.getProcessor());
@@ -418,7 +418,7 @@
         assertEquals("Number routes created", 1, routes.size());
         for (Route route : routes) {
             Endpoint key = route.getEndpoint();
-            assertEquals("From endpoint", "seda:a", key.getEndpointUri());
+            assertEquals("From endpoint", "seda://a", key.getEndpointUri());
 
             EventDrivenConsumerRoute consumer = assertIsInstanceOf(EventDrivenConsumerRoute.class, route);
             Channel channel = unwrapChannel(consumer.getProcessor());
@@ -428,7 +428,7 @@
 
             assertIsInstanceOf(MemoryIdempotentRepository.class, idempotentConsumer.getIdempotentRepository());
             SendProcessor sendProcessor = assertIsInstanceOf(SendProcessor.class, unwrapChannel(idempotentConsumer.getProcessor()).getNextProcessor());
-            assertEquals("Endpoint URI", "seda:b", sendProcessor.getDestination().getEndpointUri());
+            assertEquals("Endpoint URI", "seda://b", sendProcessor.getDestination().getEndpointUri());
         }
     }
 

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaNoConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaNoConsumerTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaNoConsumerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaNoConsumerTest.java Mon Jul  6 07:02:03 2009
@@ -35,7 +35,7 @@
             template.requestBody("direct:start", "Hello World");
         } catch (CamelExecutionException e) {
             assertIsInstanceOf(IllegalStateException.class, e.getCause());
-            assertTrue(e.getCause().getMessage().startsWith("Cannot send to endpoint: seda:foo as no consumers is registered."));
+            assertTrue(e.getCause().getMessage().startsWith("Cannot send to endpoint: seda://foo as no consumers is registered."));
         }
     }
 

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/FromEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/FromEndpointTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/FromEndpointTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/FromEndpointTest.java Mon Jul  6 07:02:03 2009
@@ -42,7 +42,7 @@
         Exchange exchange = list.get(0);
         Endpoint fromEndpoint = exchange.getFromEndpoint();
         assertNotNull("exchange.fromEndpoint() is null!", fromEndpoint);
-        assertEquals("fromEndpoint URI", "direct:start", fromEndpoint.getEndpointUri());
+        assertEquals("fromEndpoint URI", "direct://start", fromEndpoint.getEndpointUri());
     }
 
     @Override

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/FromMultipleEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/FromMultipleEndpointTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/FromMultipleEndpointTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/FromMultipleEndpointTest.java Mon Jul  6 07:02:03 2009
@@ -42,11 +42,11 @@
 
         Exchange exchange = list.get(0);
         Endpoint fromEndpoint = exchange.getFromEndpoint();
-        assertEquals("fromEndpoint URI", "direct:foo", fromEndpoint.getEndpointUri());
+        assertEquals("fromEndpoint URI", "direct://foo", fromEndpoint.getEndpointUri());
 
         exchange = list.get(1);
         fromEndpoint = exchange.getFromEndpoint();
-        assertEquals("fromEndpoint URI", "seda:bar", fromEndpoint.getEndpointUri());
+        assertEquals("fromEndpoint URI", "seda://bar", fromEndpoint.getEndpointUri());
     }
 
     @Override

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationCustomMBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationCustomMBeanTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationCustomMBeanTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationCustomMBeanTest.java Mon Jul  6 07:02:03 2009
@@ -66,7 +66,7 @@
 
         ObjectName dynamicallyGeneratedObjName = s.iterator().next();
 
-        assertEquals("direct:start", mbsc.getAttribute(dynamicallyGeneratedObjName, "Uri"));
+        assertEquals("direct://start", mbsc.getAttribute(dynamicallyGeneratedObjName, "Uri"));
     }
 
     public void testCounters() throws Exception {

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/model/ProcessorTypeConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/model/ProcessorTypeConfigurationTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/model/ProcessorTypeConfigurationTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/model/ProcessorTypeConfigurationTest.java Mon Jul  6 07:02:03 2009
@@ -33,7 +33,7 @@
             });
             fail("Should have thrown IllegalArgumentException");
         } catch (IllegalArgumentException e) {
-            assertEquals("registry entry called hello must be specified on: process[ref: hello]", e.getMessage());
+            assertEquals("registry entry called hello must be specified on: process[ref:hello]", e.getMessage());
         }
     }
 

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnExceptionOnRedeliveryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnExceptionOnRedeliveryTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnExceptionOnRedeliveryTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnExceptionOnRedeliveryTest.java Mon Jul  6 07:02:03 2009
@@ -72,7 +72,7 @@
                 // we configure our Dead Letter Channel to invoke
                 // MyRedeliveryProcessor before a redelivery is
                 // attempted. This allows us to alter the message before
-                errorHandler(deadLetterChannel("mock:error")
+                errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(5)
                         .onRedelivery(new MyRedeliverPrcessor())
                         // setting delay to zero is just to make unit teting faster
                         .redeliverDelay(0L));

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnRedeliveryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnRedeliveryTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnRedeliveryTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelOnRedeliveryTest.java Mon Jul  6 07:02:03 2009
@@ -63,7 +63,7 @@
                 // we configure our Dead Letter Channel to invoke
                 // MyRedeliveryProcessor before a redelivery is
                 // attempted. This allows us to alter the message before
-                errorHandler(deadLetterChannel("mock:error")
+                errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(5)
                         .onRedelivery(new MyRedeliverPrcessor())
                         // setting delay to zero is just to make unit teting faster
                         .redeliverDelay(0L));

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerOnExceptionTraceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerOnExceptionTraceTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerOnExceptionTraceTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DefaultErrorHandlerOnExceptionTraceTest.java Mon Jul  6 07:02:03 2009
@@ -51,11 +51,11 @@
         TraceEventMessage msg1 = getMockEndpoint("mock:trace").getReceivedExchanges().get(0).getIn().getBody(TraceEventMessage.class);
         TraceEventMessage msg2 = getMockEndpoint("mock:trace").getReceivedExchanges().get(1).getIn().getBody(TraceEventMessage.class);
 
-        assertEquals("direct:start", msg1.getFromEndpointUri());
+        assertEquals("direct://start", msg1.getFromEndpointUri());
         assertEquals("ref:myProcessor", msg1.getToNode());
 
         assertEquals("ref:myProcessor", msg2.getPreviousNode());
-        assertEquals("mock:result", msg2.getToNode());
+        assertEquals("mock://result", msg2.getToNode());
     }
 
     public void testWithError() throws Exception {
@@ -72,17 +72,17 @@
         TraceEventMessage msg3 = getMockEndpoint("mock:trace").getReceivedExchanges().get(2).getIn().getBody(TraceEventMessage.class);
         TraceEventMessage msg4 = getMockEndpoint("mock:trace").getReceivedExchanges().get(3).getIn().getBody(TraceEventMessage.class);
 
-        assertEquals("direct:start", msg1.getFromEndpointUri());
+        assertEquals("direct://start", msg1.getFromEndpointUri());
         assertEquals("ref:myProcessor", msg1.getToNode());
 
         assertEquals("ref:myProcessor", msg2.getPreviousNode());
         assertEquals("OnException[IllegalArgumentException]", msg2.getToNode());
 
         assertEquals("OnException[IllegalArgumentException]", msg3.getPreviousNode());
-        assertEquals("log:boom", msg3.getToNode());
+        assertEquals("log://boom", msg3.getToNode());
 
-        assertEquals("log:boom", msg4.getPreviousNode());
-        assertEquals("mock:boom", msg4.getToNode());
+        assertEquals("log://boom", msg4.getPreviousNode());
+        assertEquals("mock://boom", msg4.getToNode());
     }
 
     @Override

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/NavigateRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/NavigateRouteTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/NavigateRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/NavigateRouteTest.java Mon Jul  6 07:02:03 2009
@@ -55,7 +55,7 @@
 
             if (child instanceof SendProcessor) {
                 SendProcessor send = (SendProcessor) child;
-                assertEquals("mock:result", send.getDestination().getEndpointUri());
+                assertEquals("mock://result", send.getDestination().getEndpointUri());
             }
 
             if (child instanceof ConvertBodyProcessor) {

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalTraceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalTraceTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalTraceTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalTraceTest.java Mon Jul  6 07:02:03 2009
@@ -55,17 +55,17 @@
         TraceEventMessage msg3 = getMockEndpoint("mock:trace").getReceivedExchanges().get(2).getIn().getBody(TraceEventMessage.class);
         TraceEventMessage msg4 = getMockEndpoint("mock:trace").getReceivedExchanges().get(3).getIn().getBody(TraceEventMessage.class);
 
-        assertEquals("direct:start", msg1.getFromEndpointUri());
+        assertEquals("direct://start", msg1.getFromEndpointUri());
         assertEquals("ref:myProcessor", msg1.getToNode());
 
         assertEquals("ref:myProcessor", msg2.getPreviousNode());
-        assertEquals("mock:result", msg2.getToNode());
+        assertEquals("mock://result", msg2.getToNode());
 
         assertTrue(msg3.getPreviousNode().startsWith("OnCompletion"));
-        assertEquals("log:global", msg3.getToNode());
+        assertEquals("log://global", msg3.getToNode());
 
-        assertEquals("log:global", msg4.getPreviousNode());
-        assertEquals("mock:sync", msg4.getToNode());
+        assertEquals("log://global", msg4.getPreviousNode());
+        assertEquals("mock://sync", msg4.getToNode());
     }
 
     public void testSynchronizeFailure() throws Exception {
@@ -89,14 +89,14 @@
         TraceEventMessage msg2 = getMockEndpoint("mock:trace").getReceivedExchanges().get(1).getIn().getBody(TraceEventMessage.class);
         TraceEventMessage msg3 = getMockEndpoint("mock:trace").getReceivedExchanges().get(2).getIn().getBody(TraceEventMessage.class);
 
-        assertEquals("direct:start", msg1.getFromEndpointUri());
+        assertEquals("direct://start", msg1.getFromEndpointUri());
         assertEquals("ref:myProcessor", msg1.getToNode());
 
         assertTrue(msg2.getPreviousNode().startsWith("OnCompletion"));
-        assertEquals("log:global", msg2.getToNode());
+        assertEquals("log://global", msg2.getToNode());
 
-        assertEquals("log:global", msg3.getPreviousNode());
-        assertEquals("mock:sync", msg3.getToNode());
+        assertEquals("log://global", msg3.getPreviousNode());
+        assertEquals("mock://sync", msg3.getToNode());
     }
 
     @Override

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RandomLoadBalanceJavaDSLBuilderTest.java Mon Jul  6 07:02:03 2009
@@ -49,7 +49,7 @@
         navigateRoute(nav, sb);
 
         // output the Java DSL
-        assertEquals("from(\"direct:start\").loadBalance().random().to(\"mock:x\").to(\"mock:y\").to(\"mock:z\")", sb.toString());
+        assertEquals("from(\"direct://start\").loadBalance().random().to(\"mock://x\").to(\"mock://y\").to(\"mock://z\")", sb.toString());
     }
 
     public void testNavigateRouteAsJavaDSL() throws Exception {
@@ -66,7 +66,7 @@
         navigateDefinition(route, sb);
 
         // output the Java DSL
-        assertEquals("from(\"direct:start\").loadBalance().random().to(\"mock:x\").to(\"mock:y\").to(\"mock:z\")", sb.toString());
+        assertEquals("from(\"direct://start\").loadBalance().random().to(\"mock://x\").to(\"mock://y\").to(\"mock://z\")", sb.toString());
     }
 
     private void navigateRoute(Navigate<Processor> nav, StringBuilder sb) {

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TraceableUnitOfWorkTest.java Mon Jul  6 07:02:03 2009
@@ -33,7 +33,7 @@
 
     public void testSendingSomeMessages() throws Exception {
         Object out = template.requestBody("direct:start", "Hello London");
-        assertEquals("Failed at: sendTo(Endpoint[bean:bar])", out);
+        assertEquals("Failed at: sendTo(Endpoint[bean://bar])", out);
     }
 
     @Override

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapUsingFireAndForgetTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapUsingFireAndForgetTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapUsingFireAndForgetTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapUsingFireAndForgetTest.java Mon Jul  6 07:02:03 2009
@@ -69,8 +69,8 @@
         assertNotSame("Should not be same Exchange", e1, e2);
 
         // should have different from endpoint
-        assertEquals("direct:start", e1.getFromEndpoint().getEndpointUri());
-        assertEquals("direct:foo", e2.getFromEndpoint().getEndpointUri());
+        assertEquals("direct://start", e1.getFromEndpoint().getEndpointUri());
+        assertEquals("direct://foo", e2.getFromEndpoint().getEndpointUri());
     }
 
     public void testFireAndForgetUsingExpression() throws Exception {
@@ -104,8 +104,8 @@
         assertNotSame("Should not be same Exchange", e1, e2);
 
         // should have different from endpoint
-        assertEquals("direct:start", e1.getFromEndpoint().getEndpointUri());
-        assertEquals("direct:foo", e2.getFromEndpoint().getEndpointUri());
+        assertEquals("direct://start", e1.getFromEndpoint().getEndpointUri());
+        assertEquals("direct://foo", e2.getFromEndpoint().getEndpointUri());
     }
 
 }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromUriWildcardHeaderUriTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromUriWildcardHeaderUriTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromUriWildcardHeaderUriTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromUriWildcardHeaderUriTest.java Mon Jul  6 07:02:03 2009
@@ -36,7 +36,7 @@
 
     public void testInterceptFoo() throws Exception {
         getMockEndpoint("mock:intercept").expectedMessageCount(1);
-        getMockEndpoint("mock:intercept").expectedHeaderReceived(Exchange.INTERCEPTED_ENDPOINT, "seda:foo");
+        getMockEndpoint("mock:intercept").expectedHeaderReceived(Exchange.INTERCEPTED_ENDPOINT, "seda://foo");
         getMockEndpoint("mock:result").expectedMessageCount(1);
 
         template.sendBody("seda:foo", "Hello World");
@@ -46,7 +46,7 @@
 
     public void testInterceptBar() throws Exception {
         getMockEndpoint("mock:intercept").expectedMessageCount(1);
-        getMockEndpoint("mock:intercept").expectedHeaderReceived(Exchange.INTERCEPTED_ENDPOINT, "seda:bar");
+        getMockEndpoint("mock:intercept").expectedHeaderReceived(Exchange.INTERCEPTED_ENDPOINT, "seda://bar");
         getMockEndpoint("mock:result").expectedMessageCount(1);
 
         template.sendBody("seda:bar", "Hello World");

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromUriWildcardTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromUriWildcardTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromUriWildcardTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptFromUriWildcardTest.java Mon Jul  6 07:02:03 2009
@@ -36,7 +36,7 @@
 
     public void testInterceptFoo() throws Exception {
         getMockEndpoint("mock:intercept").expectedMessageCount(1);
-        getMockEndpoint("mock:intercept").expectedHeaderReceived(Exchange.INTERCEPTED_ENDPOINT, "seda:foo");
+        getMockEndpoint("mock:intercept").expectedHeaderReceived(Exchange.INTERCEPTED_ENDPOINT, "seda://foo");
         getMockEndpoint("mock:result").expectedMessageCount(1);
 
         template.sendBody("seda:foo", "Hello World");

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToEndpointDynamicTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToEndpointDynamicTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToEndpointDynamicTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToEndpointDynamicTest.java Mon Jul  6 07:02:03 2009
@@ -85,7 +85,7 @@
         context.start();
 
         getMockEndpoint("mock:detour").expectedMessageCount(1);
-        getMockEndpoint("mock:detour").expectedHeaderReceived(Exchange.INTERCEPTED_ENDPOINT, "file:foo");
+        getMockEndpoint("mock:detour").expectedHeaderReceived(Exchange.INTERCEPTED_ENDPOINT, "file://foo");
         getMockEndpoint("mock:result").expectedMessageCount(1);
 
         template.sendBody("direct:first", "Hello World");

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSimpleRouteTraceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSimpleRouteTraceTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSimpleRouteTraceTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSimpleRouteTraceTest.java Mon Jul  6 07:02:03 2009
@@ -45,23 +45,23 @@
         TraceEventMessage msg5 = getMockEndpoint("mock:trace").getReceivedExchanges().get(4).getIn().getBody(TraceEventMessage.class);
         TraceEventMessage msg6 = getMockEndpoint("mock:trace").getReceivedExchanges().get(5).getIn().getBody(TraceEventMessage.class);
 
-        assertEquals("direct:start", msg1.getFromEndpointUri());
-        assertEquals("mock:intercepted", msg1.getToNode());
+        assertEquals("direct://start", msg1.getFromEndpointUri());
+        assertEquals("mock://intercepted", msg1.getToNode());
 
-        assertEquals("mock:intercepted", msg2.getPreviousNode());
-        assertEquals("mock:foo", msg2.getToNode());
+        assertEquals("mock://intercepted", msg2.getPreviousNode());
+        assertEquals("mock://foo", msg2.getToNode());
 
-        assertEquals("mock:foo", msg3.getPreviousNode());
-        assertEquals("mock:intercepted", msg3.getToNode());
+        assertEquals("mock://foo", msg3.getPreviousNode());
+        assertEquals("mock://intercepted", msg3.getToNode());
 
-        assertEquals("mock:intercepted", msg4.getPreviousNode());
-        assertEquals("mock:bar", msg4.getToNode());
+        assertEquals("mock://intercepted", msg4.getPreviousNode());
+        assertEquals("mock://bar", msg4.getToNode());
 
-        assertEquals("mock:bar", msg5.getPreviousNode());
-        assertEquals("mock:intercepted", msg5.getToNode());
+        assertEquals("mock://bar", msg5.getPreviousNode());
+        assertEquals("mock://intercepted", msg5.getToNode());
 
-        assertEquals("mock:intercepted", msg6.getPreviousNode());
-        assertEquals("mock:result", msg6.getToNode());
+        assertEquals("mock://intercepted", msg6.getPreviousNode());
+        assertEquals("mock://result", msg6.getToNode());
     }
 
     @Override

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorDestinationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorDestinationTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorDestinationTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/TraceInterceptorDestinationTest.java Mon Jul  6 07:02:03 2009
@@ -42,14 +42,14 @@
         MockEndpoint mock = getMockEndpoint("mock:traced");
         mock.expectedMessageCount(8);
         // should be in our CSV format (defined in bottom of this class)
-        mock.message(0).body().regex("^direct:start;.*;.*;Hello London");
-        mock.message(1).body().regex("^direct:start;.*;.*;Hello World");
-        mock.message(2).body().regex("^direct:start;.*;.*;Goodday World");
-        mock.message(3).body().regex("^direct:start;.*;.*;Bye World");
-        mock.message(4).body().regex("^direct:foo;.*;.*;Hello Copenhagen");
-        mock.message(5).body().regex("^direct:foo;.*;.*;Foo World");
-        mock.message(6).body().regex("^direct:foo;.*;.*;Hello Beijing");
-        mock.message(7).body().regex("^direct:foo;.*;.*;Foo World");
+        mock.message(0).body().regex("^direct://start;.*;.*;Hello London");
+        mock.message(1).body().regex("^direct://start;.*;.*;Hello World");
+        mock.message(2).body().regex("^direct://start;.*;.*;Goodday World");
+        mock.message(3).body().regex("^direct://start;.*;.*;Bye World");
+        mock.message(4).body().regex("^direct://foo;.*;.*;Hello Copenhagen");
+        mock.message(5).body().regex("^direct://foo;.*;.*;Foo World");
+        mock.message(6).body().regex("^direct://foo;.*;.*;Hello Beijing");
+        mock.message(7).body().regex("^direct://foo;.*;.*;Foo World");
 
         template.sendBodyAndHeader("direct:start", "Hello London", "to", "James");
         template.sendBody("direct:foo", "Hello Copenhagen");

Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestComponent.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestComponent.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestComponent.java Mon Jul  6 07:02:03 2009
@@ -41,6 +41,9 @@
         ObjectHelper.notNull(getCamelContext(), "camelContext");
         URI u = new URI(UnsafeUriCharactersEncoder.encode(uri));
         String path = u.getSchemeSpecificPart();
+        if (path.startsWith("//")) {
+            path = path.substring(2);
+        }
 
         return createEndpoint(uri, path, new HashMap());
     }

Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java Mon Jul  6 07:02:03 2009
@@ -34,11 +34,11 @@
     public void testEndpointConfiguration() throws Exception {
         Endpoint endpoint = getMandatoryBean(Endpoint.class, "endpoint1");
 
-        assertEquals("endpoint URI", "direct:start", endpoint.getEndpointUri());
+        assertEquals("endpoint URI", "direct://start", endpoint.getEndpointUri());
 
         DummyBean dummyBean = getMandatoryBean(DummyBean.class, "mybean");
         assertNotNull("The bean should have an endpoint injected", dummyBean.getEndpoint());
-        assertEquals("endpoint URI", "direct:start", dummyBean.getEndpoint().getEndpointUri());
+        assertEquals("endpoint URI", "direct://start", dummyBean.getEndpoint().getEndpointUri());
 
         log.debug("Found dummy bean: " + dummyBean);
 

Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java Mon Jul  6 07:02:03 2009
@@ -35,8 +35,8 @@
         log.info("getFieldInjectedCamelTemplate()    = " + bean.getFieldInjectedCamelTemplate());
         log.info("getPropertyInjectedCamelTemplate() = " + bean.getPropertyInjectedCamelTemplate());
 
-        assertEndpointUri(bean.getFieldInjectedEndpoint(), "direct:fieldInjectedEndpoint");
-        assertEndpointUri(bean.getPropertyInjectedEndpoint(), "direct:namedEndpoint1");
+        assertEndpointUri(bean.getFieldInjectedEndpoint(), "direct://fieldInjectedEndpoint");
+        assertEndpointUri(bean.getPropertyInjectedEndpoint(), "direct://namedEndpoint1");
 
         assertNotNull("No Producer injected for getFieldInjectedProducer()", bean.getFieldInjectedProducer());
         assertNotNull("No Producer injected for getPropertyInjectedProducer()", bean.getPropertyInjectedProducer());

Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java Mon Jul  6 07:02:03 2009
@@ -78,7 +78,7 @@
             Processor processor = consumerRoute.getProcessor();
             assertNotNull(processor);
 
-            assertEndpointUri(key, "seda:test.c");
+            assertEndpointUri(key, "seda://test.c");
         }
     }
     

Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java Mon Jul  6 07:02:03 2009
@@ -44,7 +44,7 @@
             List<FromDefinition> inputs = route.getInputs();
             assertEquals("Number of inputs", 1, inputs.size());
             FromDefinition fromType = inputs.get(0);
-            assertEquals("from URI", "seda:test.a", fromType.getEndpoint().getEndpointUri());
+            assertEquals("from URI", "seda://test.a", fromType.getEndpoint().getEndpointUri());
 
             List<ProcessorDefinition> outputs = route.getOutputs();
             assertEquals("Number of outputs", 1, outputs.size());

Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetTest.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringWireTapUsingFireAndForgetTest.java Mon Jul  6 07:02:03 2009
@@ -46,8 +46,8 @@
         assertNotSame("Should not be same Exchange", e1, e2);
 
         // should have different from endpoint
-        assertEquals("direct:start", e1.getFromEndpoint().getEndpointUri());
-        assertEquals("direct:foo", e2.getFromEndpoint().getEndpointUri());
+        assertEquals("direct://start", e1.getFromEndpoint().getEndpointUri());
+        assertEquals("direct://foo", e2.getFromEndpoint().getEndpointUri());
     }
 
     public void testFireAndForgetUsingProcessor() throws Exception {
@@ -68,8 +68,8 @@
         assertNotSame("Should not be same Exchange", e1, e2);
 
         // should have different from endpoint
-        assertEquals("direct:start2", e1.getFromEndpoint().getEndpointUri());
-        assertEquals("direct:foo", e2.getFromEndpoint().getEndpointUri());
+        assertEquals("direct://start2", e1.getFromEndpoint().getEndpointUri());
+        assertEquals("direct://foo", e2.getFromEndpoint().getEndpointUri());
     }
 
     // START SNIPPET: e1

Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/DeadLetterChannelOnExceptionOnRedeliveryTest.xml Mon Jul  6 07:02:03 2009
@@ -35,6 +35,7 @@
     </bean>
 
     <bean id="redeliveryPolicy" class="org.apache.camel.processor.RedeliveryPolicy">
+        <property name="maximumRedeliveries" value="5"/>
         <!-- go fast since its a unit test -->
         <property name="redeliverDelay" value="0"/>
     </bean>

Modified: camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamComponent.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamComponent.java (original)
+++ camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamComponent.java Mon Jul  6 07:02:03 2009
@@ -27,8 +27,7 @@
 public class StreamComponent extends DefaultComponent {
 
     @Override
-    protected Endpoint createEndpoint(String uri, String remaining, Map parameters)
-        throws Exception {
+    protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception {
         return new StreamEndpoint(uri, this);
     }
 }

Modified: camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java (original)
+++ camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java Mon Jul  6 07:02:03 2009
@@ -222,6 +222,10 @@
         }
 
         this.uri = t[0].trim();
+        if (this.uri.startsWith("//")) {
+            this.uri = this.uri.substring(2);
+        }
+        
         if (!TYPES_LIST.contains(this.uri)) {
             throw new IllegalArgumentException(INVALID_URI);
         }

Modified: camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java?rev=791395&r1=791394&r2=791395&view=diff
==============================================================================
--- camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java (original)
+++ camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java Mon Jul  6 07:02:03 2009
@@ -49,8 +49,7 @@
     private StreamEndpoint endpoint;
     private String uri;
 
-    public StreamProducer(StreamEndpoint endpoint, String uri)
-        throws Exception {
+    public StreamProducer(StreamEndpoint endpoint, String uri) throws Exception {
         super(endpoint);
         this.endpoint = endpoint;
         validateUri(uri);
@@ -153,6 +152,9 @@
             throw new IllegalArgumentException(INVALID_URI);
         }
         this.uri = t[0].trim();
+        if (this.uri.startsWith("//")) {
+            this.uri = this.uri.substring(2);
+        }
 
         if (!TYPES_LIST.contains(this.uri)) {
             throw new IllegalArgumentException(INVALID_URI);



Mime
View raw message