Updated Branches: refs/heads/master 376d30152 -> 99365506f
CAMEL-6634: <jmxAgent> in XML now supports using property placeholders in the statistisLevel option Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/99365506 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/99365506 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/99365506 Branch: refs/heads/master Commit: 99365506f05395d1056a3e4da70b034d7ae04aaf Parents: 376d301 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Aug 14 09:18:19 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Aug 14 09:18:19 2013 +0200 ---------------------------------------------------------------------- .../apache/camel/core/xml/AbstractCamelContextFactoryBean.java | 6 +++++- .../org/apache/camel/core/xml/CamelJMXAgentDefinition.java | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/99365506/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java ---------------------------------------------------------------------- diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java index ac13f35..8b4ffb1 100644 --- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java +++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java @@ -30,6 +30,7 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.CamelContext; import org.apache.camel.CamelException; +import org.apache.camel.ManagementStatisticsLevel; import org.apache.camel.RoutesBuilder; import org.apache.camel.ShutdownRoute; import org.apache.camel.ShutdownRunningTask; @@ -372,7 +373,10 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex // set additional configuration from camelJMXAgent boolean onlyId = agent.getOnlyRegisterProcessorWithCustomId() != null && agent.getOnlyRegisterProcessorWithCustomId(); getContext().getManagementStrategy().onlyManageProcessorWithCustomId(onlyId); - getContext().getManagementStrategy().setStatisticsLevel(camelJMXAgent.getStatisticsLevel()); + + String level = CamelContextHelper.parseText(getContext(), camelJMXAgent.getStatisticsLevel()); + ManagementStatisticsLevel msLevel = getContext().getTypeConverter().mandatoryConvertTo(ManagementStatisticsLevel.class, level); + getContext().getManagementStrategy().setStatisticsLevel(msLevel); Boolean loadStatisticsEnabled = CamelContextHelper.parseBoolean(getContext(), camelJMXAgent.getLoadStatisticsEnabled()); if (loadStatisticsEnabled != null) { http://git-wip-us.apache.org/repos/asf/camel/blob/99365506/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java ---------------------------------------------------------------------- diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java index 6d73c3c..463c543 100644 --- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java +++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java @@ -103,7 +103,7 @@ public class CamelJMXAgentDefinition extends IdentifiedType { * Level of granularity for performance statistics enabled */ @XmlAttribute - private ManagementStatisticsLevel statisticsLevel = ManagementStatisticsLevel.All; + private String statisticsLevel = ManagementStatisticsLevel.All.name(); /** * A flag that indicates whether Load statistics is enabled @@ -189,11 +189,11 @@ public class CamelJMXAgentDefinition extends IdentifiedType { this.usePlatformMBeanServer = usePlatformMBeanServer; } - public ManagementStatisticsLevel getStatisticsLevel() { + public String getStatisticsLevel() { return statisticsLevel; } - public void setStatisticsLevel(ManagementStatisticsLevel statisticsLevel) { + public void setStatisticsLevel(String statisticsLevel) { this.statisticsLevel = statisticsLevel; }
