You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/08/27 08:46:17 UTC
svn commit: r808299 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/management/
main/java/org/apache/camel/management/mbean/
test/java/org/apache/camel/management/
Author: davsclaus
Date: Thu Aug 27 06:46:16 2009
New Revision: 808299
URL: http://svn.apache.org/viewvc?rev=808299&view=rev
Log:
CAMEL-1933: Overhaul of JMX. Added more State and renamed some attributes.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedService.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationCustomMBeanTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterCamelContextTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterEndpointTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterCamelContextTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterComponentTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterEndpointTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterRouteTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java?rev=808299&r1=808298&r2=808299&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java Thu Aug 27 06:46:16 2009
@@ -94,7 +94,7 @@
buffer.append(domainName).append(":");
buffer.append(KEY_CONTEXT + "=").append(getContextId(mbean.getComponent().getCamelContext())).append(",");
buffer.append(KEY_TYPE + "=" + TYPE_COMPONENT + ",");
- buffer.append(KEY_NAME + "=").append(ObjectName.quote(mbean.getName()));
+ buffer.append(KEY_NAME + "=").append(ObjectName.quote(mbean.getComponentName()));
return createObjectName(buffer);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java?rev=808299&r1=808298&r2=808299&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java Thu Aug 27 06:46:16 2009
@@ -16,8 +16,11 @@
*/
package org.apache.camel.management.mbean;
+import java.util.Map;
+
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.ServiceStatus;
import org.apache.camel.impl.ServiceSupport;
import org.springframework.jmx.export.annotation.ManagedAttribute;
import org.springframework.jmx.export.annotation.ManagedOperation;
@@ -30,7 +33,6 @@
public class ManagedCamelContext {
private CamelContext context;
- private ProducerTemplate template;
public ManagedCamelContext(CamelContext context) {
this.context = context;
@@ -40,14 +42,28 @@
return context;
}
- @ManagedAttribute(description = "Name")
- public String getName() {
+ @ManagedAttribute(description = "Camel id")
+ public String getCamelId() {
return context.getName();
}
- @ManagedAttribute(description = "Camel running state")
- public boolean isStarted() {
- return ((ServiceSupport) context).isStarted();
+ @ManagedAttribute(description = "Camel State")
+ public String getState() {
+ // must use String type to be sure remote JMX can read the attribute without requiring Camel classes.
+ ServiceStatus status = ((ServiceSupport) context).getStatus();
+ // if no status exists then its stopped
+ if (status == null) {
+ status = ServiceStatus.Stopped;
+ }
+ return status.name();
+ }
+
+ @ManagedAttribute(description = "Camel Properties")
+ public Map<String, String> getProperties() {
+ if (context.getProperties().isEmpty()) {
+ return null;
+ }
+ return context.getProperties();
}
@ManagedOperation(description = "Start Camel")
@@ -75,7 +91,4 @@
return answer;
}
-
-
-
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java?rev=808299&r1=808298&r2=808299&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java Thu Aug 27 06:46:16 2009
@@ -17,6 +17,8 @@
package org.apache.camel.management.mbean;
import org.apache.camel.Component;
+import org.apache.camel.ServiceStatus;
+import org.apache.camel.impl.ServiceSupport;
import org.springframework.jmx.export.annotation.ManagedAttribute;
import org.springframework.jmx.export.annotation.ManagedResource;
@@ -34,12 +36,34 @@
this.component = component;
}
+ public Component getComponent() {
+ return component;
+ }
+
@ManagedAttribute(description = "Component Name")
- public String getName() {
+ public String getComponentName() {
return name;
}
- public Component getComponent() {
- return component;
+ @ManagedAttribute(description = "Component State")
+ public String getState() {
+ // must use String type to be sure remote JMX can read the attribute without requiring Camel classes.
+ if (component instanceof ServiceSupport) {
+ ServiceStatus status = ((ServiceSupport) component).getStatus();
+ // if no status exists then its stopped
+ if (status == null) {
+ status = ServiceStatus.Stopped;
+ }
+ return status.name();
+ }
+
+ // assume started if not a ServiceSupport instance
+ return ServiceStatus.Started.name();
}
+
+ @ManagedAttribute(description = "Camel id")
+ public String getCamelId() {
+ return component.getCamelContext().getName();
+ }
+
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java?rev=808299&r1=808298&r2=808299&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java Thu Aug 27 06:46:16 2009
@@ -33,8 +33,13 @@
return endpoint;
}
+ @ManagedAttribute(description = "Camel id")
+ public String getCamelId() {
+ return endpoint.getCamelContext().getName();
+ }
+
@ManagedAttribute(description = "Endpoint Uri")
- public String getUri() {
+ public String getEndpointUri() {
return endpoint.getEndpointUri();
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java?rev=808299&r1=808298&r2=808299&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java Thu Aug 27 06:46:16 2009
@@ -18,6 +18,8 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Processor;
+import org.apache.camel.ServiceStatus;
+import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RouteDefinition;
import org.springframework.jmx.export.annotation.ManagedAttribute;
@@ -56,17 +58,38 @@
return definition;
}
+ @ManagedAttribute(description = "Processor State")
+ public String getState() {
+ // must use String type to be sure remote JMX can read the attribute without requiring Camel classes.
+ if (processor instanceof ServiceSupport) {
+ ServiceStatus status = ((ServiceSupport) processor).getStatus();
+ // if no status exists then its stopped
+ if (status == null) {
+ status = ServiceStatus.Stopped;
+ }
+ return status.name();
+ }
+
+ // assume started if not a ServiceSupport instance
+ return ServiceStatus.Started.name();
+ }
+
+ @ManagedAttribute(description = "Camel id")
+ public String getCamelId() {
+ return context.getName();
+ }
+
@ManagedAttribute(description = "Route id")
public String getRouteId() {
return routeId;
}
- @ManagedAttribute(description = "id")
- public String getId() {
+ @ManagedAttribute(description = "Processor id")
+ public String getProcessorId() {
return id;
}
- private String doGetRouteId(ProcessorDefinition definition) {
+ private static String doGetRouteId(ProcessorDefinition definition) {
if (definition == null) {
return null;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java?rev=808299&r1=808298&r2=808299&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java Thu Aug 27 06:46:16 2009
@@ -49,7 +49,7 @@
}
@ManagedAttribute(description = "Route id")
- public String getId() {
+ public String getRouteId() {
String id = route.getId();
if (id == null) {
id = VALUE_UNKNOWN;
@@ -79,6 +79,11 @@
return status.name();
}
+ @ManagedAttribute(description = "Camel id")
+ public String getCamelId() {
+ return context.getName();
+ }
+
@ManagedOperation(description = "Start Route")
public void start() throws Exception {
throw new IllegalArgumentException("Start not supported");
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedService.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedService.java?rev=808299&r1=808298&r2=808299&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedService.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedService.java Thu Aug 27 06:46:16 2009
@@ -18,6 +18,7 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Service;
+import org.apache.camel.ServiceStatus;
import org.apache.camel.impl.ServiceSupport;
import org.springframework.jmx.export.annotation.ManagedAttribute;
import org.springframework.jmx.export.annotation.ManagedOperation;
@@ -42,12 +43,25 @@
return context;
}
- @ManagedAttribute(description = "Service running state")
- public boolean isStarted() {
+ @ManagedAttribute(description = "Service State")
+ public String getState() {
+ // must use String type to be sure remote JMX can read the attribute without requiring Camel classes.
if (service instanceof ServiceSupport) {
- return ((ServiceSupport) service).isStarted();
+ ServiceStatus status = ((ServiceSupport) service).getStatus();
+ // if no status exists then its stopped
+ if (status == null) {
+ status = ServiceStatus.Stopped;
+ }
+ return status.name();
}
- throw new IllegalStateException("The managed service does not support running state, is type: " + service.getClass().getName());
+
+ // assume started if not a ServiceSupport instance
+ return ServiceStatus.Started.name();
+ }
+
+ @ManagedAttribute(description = "Camel id")
+ public String getCamelId() {
+ return context.getName();
}
@ManagedOperation(description = "Start Service")
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationCustomMBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationCustomMBeanTest.java?rev=808299&r1=808298&r2=808299&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationCustomMBeanTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationCustomMBeanTest.java Thu Aug 27 06:46:16 2009
@@ -66,7 +66,7 @@
ObjectName dynamicallyGeneratedObjName = s.iterator().next();
- assertEquals("direct://start", mbsc.getAttribute(dynamicallyGeneratedObjName, "Uri"));
+ assertEquals("direct://start", mbsc.getAttribute(dynamicallyGeneratedObjName, "EndpointUri"));
}
public void testCounters() throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java?rev=808299&r1=808298&r2=808299&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java Thu Aug 27 06:46:16 2009
@@ -45,7 +45,7 @@
assertEquals("Could not find 1 processor: " + s, 1, s.size());
// should be mock foo
ObjectName on = (ObjectName) s.iterator().next();
- String id = (String) server.getAttribute(on, "Id");
+ String id = (String) server.getAttribute(on, "ProcessorId");
assertEquals("myfoo", id);
s = server.queryNames(new ObjectName(domainName + ":type=routes,*"), null);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointTest.java?rev=808299&r1=808298&r2=808299&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointTest.java Thu Aug 27 06:46:16 2009
@@ -49,7 +49,7 @@
MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
ObjectName name = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=endpoints,name=\"mock://result\"");
- String uri = (String) mbeanServer.getAttribute(name, "Uri");
+ String uri = (String) mbeanServer.getAttribute(name, "EndpointUri");
assertEquals("mock://result", uri);
Long size = (Long) mbeanServer.invoke(name, "qeueSize", null, null);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterCamelContextTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterCamelContextTest.java?rev=808299&r1=808298&r2=808299&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterCamelContextTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterCamelContextTest.java Thu Aug 27 06:46:16 2009
@@ -21,6 +21,7 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
/**
@@ -42,11 +43,11 @@
MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=context,name=\"camel-1\"");
- String name = (String) mbeanServer.getAttribute(on, "Name");
+ String name = (String) mbeanServer.getAttribute(on, "CamelId");
assertEquals("camel-1", name);
- Boolean started = (Boolean) mbeanServer.getAttribute(on, "Started");
- assertEquals(Boolean.TRUE, started);
+ String state = (String) mbeanServer.getAttribute(on, "State");
+ assertEquals(ServiceStatus.Started.name(), state);
}
@Override
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterEndpointTest.java?rev=808299&r1=808298&r2=808299&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterEndpointTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterEndpointTest.java Thu Aug 27 06:46:16 2009
@@ -41,15 +41,15 @@
MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
ObjectName name = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=endpoints,name=\"direct://start\"");
- String uri = (String) mbeanServer.getAttribute(name, "Uri");
+ String uri = (String) mbeanServer.getAttribute(name, "EndpointUri");
assertEquals("direct://start", uri);
name = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=endpoints,name=\"log://foo\"");
- uri = (String) mbeanServer.getAttribute(name, "Uri");
+ uri = (String) mbeanServer.getAttribute(name, "EndpointUri");
assertEquals("log://foo", uri);
name = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=endpoints,name=\"mock://result\"");
- uri = (String) mbeanServer.getAttribute(name, "Uri");
+ uri = (String) mbeanServer.getAttribute(name, "EndpointUri");
assertEquals("mock://result", uri);
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterCamelContextTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterCamelContextTest.java?rev=808299&r1=808298&r2=808299&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterCamelContextTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterCamelContextTest.java Thu Aug 27 06:46:16 2009
@@ -21,6 +21,7 @@
import org.apache.camel.CamelContext;
import org.apache.camel.TestSupport;
+import org.apache.camel.ServiceStatus;
import org.apache.camel.impl.DefaultCamelContext;
/**
@@ -45,11 +46,11 @@
ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=context,name=\"camel-1\"");
assertTrue("Should be registered", mbeanServer.isRegistered(on));
- String name = (String) mbeanServer.getAttribute(on, "Name");
+ String name = (String) mbeanServer.getAttribute(on, "CamelId");
assertEquals("camel-1", name);
- Boolean started = (Boolean) mbeanServer.getAttribute(on, "Started");
- assertEquals(true, started.booleanValue());
+ String state = (String) mbeanServer.getAttribute(on, "State");
+ assertEquals(ServiceStatus.Started.name(), state);
context.stop();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterComponentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterComponentTest.java?rev=808299&r1=808298&r2=808299&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterComponentTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterComponentTest.java Thu Aug 27 06:46:16 2009
@@ -22,6 +22,7 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
@@ -48,6 +49,9 @@
ObjectName on = set.iterator().next();
assertTrue("Should be registered", mbeanServer.isRegistered(on));
+ String state = (String) mbeanServer.getAttribute(on, "State");
+ assertEquals(ServiceStatus.Started.name(), state);
+
context.stop();
assertFalse("Should no longer be registered", mbeanServer.isRegistered(on));
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterEndpointTest.java?rev=808299&r1=808298&r2=808299&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterEndpointTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterEndpointTest.java Thu Aug 27 06:46:16 2009
@@ -43,7 +43,7 @@
ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=endpoints,name=\"mock://result\"");
assertTrue("Should be registered", mbeanServer.isRegistered(on));
- String uri = (String) mbeanServer.getAttribute(on, "Uri");
+ String uri = (String) mbeanServer.getAttribute(on, "EndpointUri");
assertEquals("mock://result", uri);
context.stop();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterRouteTest.java?rev=808299&r1=808298&r2=808299&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterRouteTest.java Thu Aug 27 06:46:16 2009
@@ -43,7 +43,7 @@
ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=routes,name=\"route1\"");
assertTrue("Should be registered", mbeanServer.isRegistered(on));
- String id = (String) mbeanServer.getAttribute(on, "Id");
+ String id = (String) mbeanServer.getAttribute(on, "RouteId");
assertEquals("route1", id);
context.stop();