svn commit: r1071531 - in /camel/trunk/components: camel-core-xml/src/main/java/org/apache/camel/core/xml/ camel-spring/src/test/resources/org/apache/camel/spring/

[davsclaus]

Author: davsclaus
Date: Thu Feb 17 07:45:33 2011
New Revision: 1071531

URL: http://svn.apache.org/viewvc?rev=1071531&view=rev
Log:
CAMEL-3675: Fixed <jmxAgent> supporting property placeholders in the disabled 
option.

Modified:
    
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
    
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java
    
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/jmx.properties
    
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/jmxConfigUsingProperties.xml

Modified: 
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java?rev=1071531&r1=1071530&r2=1071531&view=diff
==============================================================================
--- 
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
 (original)
+++ 
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
 Thu Feb 17 07:45:33 2011
@@ -319,7 +319,13 @@ public abstract class AbstractCamelConte
 
     private void initJMXAgent() throws Exception {
         CamelJMXAgentDefinition camelJMXAgent = getCamelJMXAgent();
-        if (camelJMXAgent != null && camelJMXAgent.isAgentDisabled()) {
+
+        boolean disabled = false;
+        if (camelJMXAgent != null) {
+            disabled = CamelContextHelper.parseBoolean(getContext(), 
camelJMXAgent.getDisabled());
+        }
+
+        if (disabled) {
             LOG.info("JMXAgent disabled");
             // clear the existing lifecycle strategies define by the 
DefaultCamelContext constructor
             getContext().getLifecycleStrategies().clear();

Modified: 
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java?rev=1071531&r1=1071530&r2=1071531&view=diff
==============================================================================
--- 
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java
 (original)
+++ 
camel/trunk/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelJMXAgentDefinition.java
 Thu Feb 17 07:45:33 2011
@@ -109,10 +109,6 @@ public class CamelJMXAgentDefinition ext
         return disabled;
     }
 
-    public boolean isAgentDisabled() {
-        return disabled != null && Boolean.parseBoolean(disabled);
-    }
-
     public void setDisabled(String disabled) {
         this.disabled = disabled;
     }

Modified: 
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/jmx.properties
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/jmx.properties?rev=1071531&r1=1071530&r2=1071531&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/jmx.properties
 (original)
+++ 
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/jmx.properties
 Thu Feb 17 07:45:33 2011
@@ -17,3 +17,4 @@
 
 myjmx.port=20008
 myjmx.usePlatform=true
+myjmx.disabled=false

Modified: 
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/jmxConfigUsingProperties.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/jmxConfigUsingProperties.xml?rev=1071531&r1=1071530&r2=1071531&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/jmxConfigUsingProperties.xml
 (original)
+++ 
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/jmxConfigUsingProperties.xml
 Thu Feb 17 07:45:33 2011
@@ -32,7 +32,7 @@
         <propertyPlaceholder id="properties" 
location="org/apache/camel/spring/jmx.properties"/>
 
         <!-- we can use propery placeholders when we define the JMX agent -->
-        <jmxAgent id="agent" registryPort="{{myjmx.port}}"
+        <jmxAgent id="agent" registryPort="{{myjmx.port}}" 
disabled="{{myjmx.disabled}}"
                   usePlatformMBeanServer="{{myjmx.usePlatform}}"
                   createConnector="true"
                   statisticsLevel="RoutesOnly"/>