svn commit: r1380671 - in /camel/trunk/camel-core/src/main/java/org/apache/camel/model: FromDefinition.java SendDefinition.java

[jstrachan]

Author: jstrachan
Date: Tue Sep  4 14:48:31 2012
New Revision: 1380671

URL: http://svn.apache.org/viewvc?rev=1380671&view=rev
Log:
fixes CAMEL-5565 so that routes created using Endpoints with the JavaDSL have 
their endpoint URIs visible to JMX and tooling rather than being an anonymous 
endpoint

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java?rev=1380671&r1=1380670&r2=1380671&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java 
(original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java 
Tue Sep  4 14:48:31 2012
@@ -50,7 +50,7 @@ public class FromDefinition extends Opti
     }
 
     public FromDefinition(Endpoint endpoint) {
-        this.endpoint = endpoint;
+        setEndpoint(endpoint);
     }
 
     @Override
@@ -128,6 +128,10 @@ public class FromDefinition extends Opti
 
     public void setEndpoint(Endpoint endpoint) {
         this.endpoint = endpoint;
+        this.uri = null;
+        if (endpoint != null) {
+            this.uri = endpoint.getEndpointUri();
+        }
     }
 
     /**

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java?rev=1380671&r1=1380670&r2=1380671&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java 
(original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java 
Tue Sep  4 14:48:31 2012
@@ -97,6 +97,10 @@ public abstract class SendDefinition<Typ
 
     public void setEndpoint(Endpoint endpoint) {
         this.endpoint = endpoint;
+        this.uri = null;
+        if (endpoint != null) {
+            this.uri = endpoint.getEndpointUri();
+        }
     }
 
     public ExchangePattern getPattern() {