svn commit: r1470778 - in /camel/branches/camel-2.10.x: ./ platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextInfo.java platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteInfo.java

[ningjiang]

Author: ningjiang
Date: Tue Apr 23 02:07:39 2013
New Revision: 1470778

URL: http://svn.apache.org/r1470778
Log:
CAMEL-6297 camel karaf command supports a custom JMX Agent, with thanks to 
Michael
Merged revisions 1470579 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.11.x

........
  r1470579 | davsclaus | 2013-04-22 23:33:33 +0800 (Mon, 22 Apr 2013) | 1 line
  
  CAMEL-6297 camel karaf command supports a custom JMX Agent, with thanks to 
Michael
........

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextInfo.java
    
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteInfo.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1469819
  Merged /camel/branches/camel-2.11.x:r1470579

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextInfo.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextInfo.java?rev=1470778&r1=1470777&r2=1470778&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextInfo.java
 (original)
+++ 
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextInfo.java
 Tue Apr 23 02:07:39 2013
@@ -27,7 +27,6 @@ import javax.management.ObjectName;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Route;
-import org.apache.camel.management.DefaultManagementAgent;
 import org.apache.camel.spi.ManagementAgent;
 import org.apache.felix.gogo.commands.Argument;
 import org.apache.felix.gogo.commands.Command;
@@ -71,7 +70,7 @@ public class ContextInfo extends OsgiCom
         if (agent != null) {
             MBeanServer mBeanServer = agent.getMBeanServer();
 
-            Set<ObjectName> set = mBeanServer.queryNames(new 
ObjectName(DefaultManagementAgent.DEFAULT_DOMAIN + ":type=context,name=\"" + 
name + "\",*"), null);
+            Set<ObjectName> set = mBeanServer.queryNames(new 
ObjectName(agent.getMBeanObjectDomainName() + ":type=context,name=\"" + name + 
"\",*"), null);
             Iterator<ObjectName> iterator = set.iterator();
             if (iterator.hasNext()) {
                 contextMBean = iterator.next();

Modified: 
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteInfo.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteInfo.java?rev=1470778&r1=1470777&r2=1470778&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteInfo.java
 (original)
+++ 
camel/branches/camel-2.10.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteInfo.java
 Tue Apr 23 02:07:39 2013
@@ -26,7 +26,6 @@ import javax.management.ObjectName;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Route;
-import org.apache.camel.management.DefaultManagementAgent;
 import org.apache.camel.model.ModelHelper;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.spi.ManagementAgent;
@@ -75,7 +74,7 @@ public class RouteInfo extends OsgiComma
             ManagementAgent agent = 
camelContext.getManagementStrategy().getManagementAgent();
             if (agent != null) {
                 MBeanServer mBeanServer = agent.getMBeanServer();
-                Set<ObjectName> set = mBeanServer.queryNames(new 
ObjectName(DefaultManagementAgent.DEFAULT_DOMAIN + ":type=routes,name=\"" + 
route + "\",*"), null);
+                Set<ObjectName> set = mBeanServer.queryNames(new 
ObjectName(agent.getMBeanObjectDomainName() + ":type=routes,name=\"" + route + 
"\",*"), null);
                 Iterator<ObjectName> iterator = set.iterator();
                 if (iterator.hasNext()) {
                     ObjectName routeMBean = iterator.next();