svn commit: r1049435 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/ main/java/org/apache/camel/impl/ test/java/org/apache/camel/impl/ test/java/org/apache/camel/processor/

[da...@apache.org]

Author: davsclaus
Date: Wed Dec 15 05:44:51 2010
New Revision: 1049435

URL: http://svn.apache.org/viewvc?rev=1049435&view=rev
Log:
CAMEL-3428: Polished

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchEndpointException.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelBuilderWithInvalidDeadLetterUriTest.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchEndpointException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchEndpointException.java?rev=1049435&r1=1049434&r2=1049435&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchEndpointException.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/NoSuchEndpointException.java Wed Dec 15 05:44:51 2010
@@ -29,7 +29,7 @@ public class NoSuchEndpointException ext
 
     public NoSuchEndpointException(String uri) {
         super("No endpoint could be found for: " + uri
-              + ", please check your classpath contains the needed camel component jar.");
+              + ", please check your classpath contains the needed Camel component jar.");
         this.uri = uri;
     }
     

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1049435&r1=1049434&r2=1049435&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Wed Dec 15 05:44:51 2010
@@ -49,6 +49,7 @@ import org.apache.camel.FailedToStartRou
 import org.apache.camel.IsSingleton;
 import org.apache.camel.MultipleConsumersSupport;
 import org.apache.camel.NoFactoryAvailableException;
+import org.apache.camel.NoSuchEndpointException;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.ProducerTemplate;
@@ -467,7 +468,7 @@ public class DefaultCamelContext extends
     public <T extends Endpoint> T getEndpoint(String name, Class<T> endpointType) {
         Endpoint endpoint = getEndpoint(name);
         if (endpoint == null) {
-            throw new IllegalArgumentException("No endpoint found with name: " + name);
+            throw new NoSuchEndpointException(name);
         }
         if (endpoint instanceof InterceptSendToEndpoint) {
             endpoint = ((InterceptSendToEndpoint) endpoint).getDelegate();

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java?rev=1049435&r1=1049434&r2=1049435&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java Wed Dec 15 05:44:51 2010
@@ -92,13 +92,13 @@ public class DefaultCamelContextTest ext
     public void testGetEndPointByTypeUnknown() {
         DefaultCamelContext camelContext = new DefaultCamelContext();
         try {
-            camelContext.getEndpoint("unknown", Endpoint.class);
+            camelContext.getEndpoint("xxx", Endpoint.class);
             fail();
-        } catch (IllegalArgumentException e) {
+        } catch (NoSuchEndpointException e) {
+            assertEquals("No endpoint could be found for: xxx, please check your classpath contains the needed Camel component jar.", e.getMessage());
         }
     }
 
-
     public void testRemoveEndpoint() throws Exception {
         DefaultCamelContext ctx = new DefaultCamelContext();
         ctx.disableJMX();

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelBuilderWithInvalidDeadLetterUriTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelBuilderWithInvalidDeadLetterUriTest.java?rev=1049435&r1=1049434&r2=1049435&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelBuilderWithInvalidDeadLetterUriTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelBuilderWithInvalidDeadLetterUriTest.java Wed Dec 15 05:44:51 2010
@@ -39,7 +39,7 @@ public class DeadLetterChannelBuilderWit
 
             fail("Should have thrown an exception");
         } catch (NoSuchEndpointException e) {
-            assertEquals("No endpoint could be found for: xxx, please check your classpath contains the needed camel component jar.", e.getMessage());
+            assertEquals("No endpoint could be found for: xxx, please check your classpath contains the needed Camel component jar.", e.getMessage());
         }
     }