CAMEL-9687: Dump route/rests from JMX now support resolving property 
placeholders. Needed in camel-swagger-java so the rest api is presented with 
resolved values.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7c2905f4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7c2905f4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7c2905f4

Branch: refs/heads/camel-2.16.x
Commit: 7c2905f404134a0c3faf5b8514290ed673f4cc20
Parents: e83d737
Author: Claus Ibsen <davscl...@apache.org>
Authored: Thu Mar 10 07:40:45 2016 +0100
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Thu Mar 10 08:06:39 2016 +0100

----------------------------------------------------------------------
 .../org/apache/camel/management/mbean/ManagedCamelContext.java     | 2 ++
 .../main/java/org/apache/camel/management/mbean/ManagedRoute.java  | 1 +
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/7c2905f4/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
 
b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
index c69169a..5640c13 100644
--- 
a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
+++ 
b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
@@ -364,6 +364,7 @@ public class ManagedCamelContext extends 
ManagedPerformanceCounter implements Ti
         def.setRests(rests);
         String xml = ModelHelper.dumpModelAsXml(context, def);
 
+        // if resolving placeholders we parse the xml, and resolve the 
property placeholders during parsing
         if (resolvePlaceholders) {
             final AtomicBoolean changed = new AtomicBoolean();
             InputStream is = new ByteArrayInputStream(xml.getBytes());
@@ -409,6 +410,7 @@ public class ManagedCamelContext extends 
ManagedPerformanceCounter implements Ti
         def.setRoutes(routes);
         String xml = ModelHelper.dumpModelAsXml(context, def);
 
+        // if resolving placeholders we parse the xml, and resolve the 
property placeholders during parsing
         if (resolvePlaceholders) {
             final AtomicBoolean changed = new AtomicBoolean();
             InputStream is = new ByteArrayInputStream(xml.getBytes());

http://git-wip-us.apache.org/repos/asf/camel/blob/7c2905f4/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
----------------------------------------------------------------------
diff --git 
a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java 
b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
index 837d798..7bd414e 100644
--- 
a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
+++ 
b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
@@ -272,6 +272,7 @@ public class ManagedRoute extends ManagedPerformanceCounter 
implements TimerList
         if (def != null) {
             String xml = ModelHelper.dumpModelAsXml(context, def);
 
+            // if resolving placeholders we parse the xml, and resolve the 
property placeholders during parsing
             if (resolvePlaceholders) {
                 final AtomicBoolean changed = new AtomicBoolean();
                 InputStream is = new ByteArrayInputStream(xml.getBytes());

Reply via email to