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 2012/05/04 08:58:54 UTC
svn commit: r1333775 - in /camel/branches/camel-2.9.x: ./
camel-core/src/main/java/org/apache/camel/api/management/mbean/
camel-core/src/main/java/org/apache/camel/management/mbean/
camel-core/src/test/java/org/apache/camel/management/
Author: davsclaus
Date: Fri May 4 06:58:54 2012
New Revision: 1333775
URL: http://svn.apache.org/viewvc?rev=1333775&view=rev
Log:
CAMEL-5245: Expose management name in camel context mbean.
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1333772
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java?rev=1333775&r1=1333774&r2=1333775&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java Fri May 4 06:58:54 2012
@@ -27,6 +27,9 @@ public interface ManagedCamelContextMBea
@ManagedAttribute(description = "Camel ID")
String getCamelId();
+ @ManagedAttribute(description = "Camel Management Name")
+ String getManagementName();
+
@ManagedAttribute(description = "Camel Version")
String getCamelVersion();
Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java?rev=1333775&r1=1333774&r2=1333775&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java Fri May 4 06:58:54 2012
@@ -60,6 +60,10 @@ public class ManagedCamelContext impleme
return context.getName();
}
+ public String getManagementName() {
+ return context.getManagementName();
+ }
+
public String getCamelVersion() {
return context.getVersion();
}
Modified: camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java?rev=1333775&r1=1333774&r2=1333775&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java Fri May 4 06:58:54 2012
@@ -21,6 +21,7 @@ import java.util.Map;
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -29,15 +30,26 @@ import org.apache.camel.component.mock.M
*/
public class ManagedCamelContextTest extends ManagementTestSupport {
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+ // to force a different management name than the camel id
+ context.getManagementNameStrategy().setNamePattern("19-#name#");
+ return context;
+ }
+
public void testManagedCamelContext() throws Exception {
MBeanServer mbeanServer = getMBeanServer();
- ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=context,name=\"camel-1\"");
+ ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/19-camel-1,type=context,name=\"camel-1\"");
assertTrue("Should be registered", mbeanServer.isRegistered(on));
String name = (String) mbeanServer.getAttribute(on, "CamelId");
assertEquals("camel-1", name);
+ String managementName = (String) mbeanServer.getAttribute(on, "ManagementName");
+ assertEquals("19-camel-1", managementName);
+
String uptime = (String) mbeanServer.getAttribute(on, "Uptime");
assertNotNull(uptime);
@@ -85,7 +97,7 @@ public class ManagedCamelContextTest ext
public void testManagedCamelContextCreateEndpoint() throws Exception {
MBeanServer mbeanServer = getMBeanServer();
- ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=context,name=\"camel-1\"");
+ ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/19-camel-1,type=context,name=\"camel-1\"");
assertNull(context.hasEndpoint("seda:bar"));
@@ -95,7 +107,7 @@ public class ManagedCamelContextTest ext
assertNotNull(context.hasEndpoint("seda:bar"));
- ObjectName seda = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=endpoints,name=\"seda://bar\"");
+ ObjectName seda = ObjectName.getInstance("org.apache.camel:context=localhost/19-camel-1,type=endpoints,name=\"seda://bar\"");
boolean registered = mbeanServer.isRegistered(seda);
assertTrue("Should be registered " + seda, registered);
@@ -110,7 +122,7 @@ public class ManagedCamelContextTest ext
public void testManagedCamelContextRemoveEndpoint() throws Exception {
MBeanServer mbeanServer = getMBeanServer();
- ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=context,name=\"camel-1\"");
+ ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/19-camel-1,type=context,name=\"camel-1\"");
assertNull(context.hasEndpoint("seda:bar"));
@@ -120,7 +132,7 @@ public class ManagedCamelContextTest ext
assertNotNull(context.hasEndpoint("seda:bar"));
- ObjectName seda = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=endpoints,name=\"seda://bar\"");
+ ObjectName seda = ObjectName.getInstance("org.apache.camel:context=localhost/19-camel-1,type=endpoints,name=\"seda://bar\"");
boolean registered = mbeanServer.isRegistered(seda);
assertTrue("Should be registered " + seda, registered);