Repository: camel Updated Branches: refs/heads/master 527ce6c7b -> 3511f1e3c
CAMEL-7567: Added camelId and camelManagementName JMX attributes to mbean where it was missing. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3511f1e3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3511f1e3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3511f1e3 Branch: refs/heads/master Commit: 3511f1e3c200f1120d85cc7a3ba3a67782b4ab41 Parents: 527ce6c Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Jul 3 13:32:28 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Jul 3 13:32:28 2014 +0200 ---------------------------------------------------------------------- .../api/management/mbean/ManagedBacklogDebuggerMBean.java | 6 ++++++ .../api/management/mbean/ManagedBacklogTracerMBean.java | 6 ++++++ .../camel/api/management/mbean/ManagedCamelContextMBean.java | 2 +- .../management/mbean/ManagedStreamCachingStrategyMBean.java | 2 +- .../camel/api/management/mbean/ManagedThreadPoolMBean.java | 6 ++++++ .../camel/api/management/mbean/ManagedTracerMBean.java | 6 ++++++ .../camel/management/mbean/ManagedBacklogDebugger.java | 8 ++++++++ .../apache/camel/management/mbean/ManagedBacklogTracer.java | 8 ++++++++ .../org/apache/camel/management/mbean/ManagedThreadPool.java | 8 ++++++++ .../org/apache/camel/management/mbean/ManagedTracer.java | 8 ++++++++ 10 files changed, 58 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3511f1e3/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogDebuggerMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogDebuggerMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogDebuggerMBean.java index 036ef3d..a24e243 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogDebuggerMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogDebuggerMBean.java @@ -23,6 +23,12 @@ import org.apache.camel.api.management.ManagedOperation; public interface ManagedBacklogDebuggerMBean { + @ManagedAttribute(description = "Camel ID") + String getCamelId(); + + @ManagedAttribute(description = "Camel ManagementName") + String getCamelManagementName(); + @ManagedAttribute(description = "Logging Level") String getLoggingLevel(); http://git-wip-us.apache.org/repos/asf/camel/blob/3511f1e3/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogTracerMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogTracerMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogTracerMBean.java index 154fbbf..a85f737 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogTracerMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogTracerMBean.java @@ -23,6 +23,12 @@ import org.apache.camel.api.management.ManagedOperation; public interface ManagedBacklogTracerMBean { + @ManagedAttribute(description = "Camel ID") + String getCamelId(); + + @ManagedAttribute(description = "Camel ManagementName") + String getCamelManagementName(); + @ManagedAttribute(description = "Is tracing enabled") boolean isEnabled(); http://git-wip-us.apache.org/repos/asf/camel/blob/3511f1e3/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java index ce08339..583ad01 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java @@ -30,7 +30,7 @@ public interface ManagedCamelContextMBean extends ManagedPerformanceCounterMBean @ManagedAttribute(description = "Camel ID") String getCamelId(); - @ManagedAttribute(description = "Camel Management Name") + @ManagedAttribute(description = "Camel ManagementName") String getManagementName(); @ManagedAttribute(description = "Camel Version") http://git-wip-us.apache.org/repos/asf/camel/blob/3511f1e3/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedStreamCachingStrategyMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedStreamCachingStrategyMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedStreamCachingStrategyMBean.java index 5f6f9e3..5af8674 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedStreamCachingStrategyMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedStreamCachingStrategyMBean.java @@ -20,7 +20,7 @@ import org.apache.camel.api.management.ManagedAttribute; import org.apache.camel.api.management.ManagedOperation; import org.apache.camel.spi.StreamCachingStrategy; -public interface ManagedStreamCachingStrategyMBean { +public interface ManagedStreamCachingStrategyMBean extends ManagedServiceMBean { @ManagedAttribute(description = "Whether stream caching is enabled") boolean isEnabled(); http://git-wip-us.apache.org/repos/asf/camel/blob/3511f1e3/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedThreadPoolMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedThreadPoolMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedThreadPoolMBean.java index 8fd024d..eea31f3 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedThreadPoolMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedThreadPoolMBean.java @@ -21,6 +21,12 @@ import org.apache.camel.api.management.ManagedOperation; public interface ManagedThreadPoolMBean { + @ManagedAttribute(description = "Camel ID") + String getCamelId(); + + @ManagedAttribute(description = "Camel ManagementName") + String getCamelManagementName(); + @ManagedAttribute(description = "Thread Pool ID") String getId(); http://git-wip-us.apache.org/repos/asf/camel/blob/3511f1e3/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedTracerMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedTracerMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedTracerMBean.java index aa09078..4486253 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedTracerMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedTracerMBean.java @@ -20,6 +20,12 @@ import org.apache.camel.api.management.ManagedAttribute; public interface ManagedTracerMBean { + @ManagedAttribute(description = "Camel ID") + String getCamelId(); + + @ManagedAttribute(description = "Camel ManagementName") + String getCamelManagementName(); + @ManagedAttribute(description = "Tracer enabled") boolean getEnabled(); http://git-wip-us.apache.org/repos/asf/camel/blob/3511f1e3/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java index 9f3a94c..7de1d19 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java @@ -49,6 +49,14 @@ public class ManagedBacklogDebugger implements ManagedBacklogDebuggerMBean { return backlogDebugger; } + public String getCamelId() { + return camelContext.getName(); + } + + public String getCamelManagementName() { + return camelContext.getManagementName(); + } + public String getLoggingLevel() { return backlogDebugger.getLoggingLevel(); } http://git-wip-us.apache.org/repos/asf/camel/blob/3511f1e3/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogTracer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogTracer.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogTracer.java index bb74666..7defbe7 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogTracer.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBacklogTracer.java @@ -54,6 +54,14 @@ public class ManagedBacklogTracer implements ManagedBacklogTracerMBean { return backlogTracer.isEnabled(); } + public String getCamelId() { + return camelContext.getName(); + } + + public String getCamelManagementName() { + return camelContext.getManagementName(); + } + public void setEnabled(boolean enabled) { backlogTracer.setEnabled(enabled); } http://git-wip-us.apache.org/repos/asf/camel/blob/3511f1e3/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreadPool.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreadPool.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreadPool.java index fff89ca..a19ccf7 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreadPool.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreadPool.java @@ -59,6 +59,14 @@ public class ManagedThreadPool implements ManagedThreadPoolMBean { return threadPool; } + public String getCamelId() { + return camelContext.getName(); + } + + public String getCamelManagementName() { + return camelContext.getManagementName(); + } + public String getId() { return id; } http://git-wip-us.apache.org/repos/asf/camel/blob/3511f1e3/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTracer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTracer.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTracer.java index 66ccc2d..1b9fe9d 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTracer.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTracer.java @@ -59,6 +59,14 @@ public class ManagedTracer implements NotificationSenderAware, ManagedTracerMBea return tracer; } + public String getCamelId() { + return camelContext.getName(); + } + + public String getCamelManagementName() { + return camelContext.getManagementName(); + } + public boolean getEnabled() { return tracer.isEnabled(); }
