Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottlingInflightRoutePolicy.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottlingInflightRoutePolicy.java?rev=1210806&r1=1210805&r2=1210806&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottlingInflightRoutePolicy.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThrottlingInflightRoutePolicy.java Tue Dec 6 07:29:02 2011 @@ -18,15 +18,15 @@ package org.apache.camel.management.mbea import org.apache.camel.CamelContext; import org.apache.camel.LoggingLevel; -import org.apache.camel.api.management.ManagedAttribute; import org.apache.camel.api.management.ManagedResource; +import org.apache.camel.api.management.mbean.ManagedThrottlingInflightRoutePolicyMBean; import org.apache.camel.impl.ThrottlingInflightRoutePolicy; /** * @version */ @ManagedResource(description = "Managed ThrottlingInflightRoutePolicy") -public class ManagedThrottlingInflightRoutePolicy extends ManagedService { +public class ManagedThrottlingInflightRoutePolicy extends ManagedService implements ManagedThrottlingInflightRoutePolicyMBean { private final ThrottlingInflightRoutePolicy policy; public ManagedThrottlingInflightRoutePolicy(CamelContext context, ThrottlingInflightRoutePolicy policy) { @@ -38,42 +38,34 @@ public class ManagedThrottlingInflightRo return policy; } - @ManagedAttribute(description = "Maximum inflight exchanges") public int getMaxInflightExchanges() { return getPolicy().getMaxInflightExchanges(); } - @ManagedAttribute(description = "Maximum inflight exchanges") public void setMaxInflightExchanges(int maxInflightExchanges) { getPolicy().setMaxInflightExchanges(maxInflightExchanges); } - @ManagedAttribute(description = "Resume percentage of maximum inflight exchanges") public int getResumePercentOfMax() { return getPolicy().getResumePercentOfMax(); } - @ManagedAttribute(description = "Resume percentage of maximum inflight exchanges") public void setResumePercentOfMax(int resumePercentOfMax) { getPolicy().setResumePercentOfMax(resumePercentOfMax); } - @ManagedAttribute(description = "Scope") public String getScope() { return getPolicy().getScope().name(); } - @ManagedAttribute(description = "Scope") public void setScope(String scope) { getPolicy().setScope(ThrottlingInflightRoutePolicy.ThrottlingScope.valueOf(scope)); } - @ManagedAttribute(description = "Logging Level") public String getLoggingLevel() { return getPolicy().getLoggingLevel().name(); } - @ManagedAttribute(description = "Logging Level") public void setLoggingLevel(String loggingLevel) { LoggingLevel level = LoggingLevel.valueOf(loggingLevel); getPolicy().setLoggingLevel(level);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTracer.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTracer.java?rev=1210806&r1=1210805&r2=1210806&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTracer.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedTracer.java Tue Dec 6 07:29:02 2011 @@ -18,12 +18,12 @@ package org.apache.camel.management.mbea import org.apache.camel.CamelContext; import org.apache.camel.LoggingLevel; -import org.apache.camel.api.management.ManagedAttribute; import org.apache.camel.api.management.ManagedNotification; import org.apache.camel.api.management.ManagedNotifications; import org.apache.camel.api.management.ManagedResource; import org.apache.camel.api.management.NotificationSender; import org.apache.camel.api.management.NotificationSenderAware; +import org.apache.camel.api.management.mbean.ManagedTracerMBean; import org.apache.camel.processor.interceptor.Tracer; import org.apache.camel.spi.ManagementStrategy; import org.apache.camel.util.ObjectHelper; @@ -35,7 +35,7 @@ import org.apache.camel.util.ObjectHelpe @ManagedNotifications(@ManagedNotification(name = "javax.management.Notification", description = "Fine grained trace events", notificationTypes = {"TraceNotification"})) -public class ManagedTracer implements NotificationSenderAware { +public class ManagedTracer implements NotificationSenderAware, ManagedTracerMBean { private final CamelContext camelContext; private final Tracer tracer; private JMXNotificationTraceEventHandler jmxTraceHandler; @@ -59,22 +59,18 @@ public class ManagedTracer implements No return tracer; } - @ManagedAttribute(description = "Tracer enabled") public boolean getEnabled() { return tracer.isEnabled(); } - @ManagedAttribute(description = "Tracer enabled") public void setEnabled(boolean enabled) { tracer.setEnabled(enabled); } - @ManagedAttribute(description = "Additional destination Uri") public String getDestinationUri() { return tracer.getDestinationUri(); } - @ManagedAttribute(description = "Additional destination Uri") public void setDestinationUri(String uri) { if (ObjectHelper.isEmpty(uri)) { tracer.setDestinationUri(null); @@ -83,72 +79,58 @@ public class ManagedTracer implements No } } - @ManagedAttribute(description = "Logging Name") public String getLogName() { return tracer.getLogName(); } - @ManagedAttribute(description = "Using Jpa") public boolean getUseJpa() { return tracer.isUseJpa(); } - @ManagedAttribute(description = "Logging Name") public void setLogName(String logName) { tracer.setLogName(logName); } - @ManagedAttribute(description = "Logging Level") public String getLogLevel() { return tracer.getLogLevel().name(); } - @ManagedAttribute(description = "Logging Level") public void setLogLevel(String logLevel) { tracer.setLogLevel(LoggingLevel.valueOf(logLevel)); } - @ManagedAttribute(description = "Log Stacktrace") public boolean getLogStackTrace() { return tracer.isLogStackTrace(); } - @ManagedAttribute(description = "Log Stacktrace") public void setLogStackTrace(boolean logStackTrace) { tracer.setLogStackTrace(logStackTrace); } - @ManagedAttribute(description = "Trace Interceptors") public boolean getTraceInterceptors() { return tracer.isTraceInterceptors(); } - @ManagedAttribute(description = "Trace Interceptors") public void setTraceInterceptors(boolean traceInterceptors) { tracer.setTraceInterceptors(traceInterceptors); } - @ManagedAttribute(description = "Trace Exceptions") public boolean getTraceExceptions() { return tracer.isTraceExceptions(); } - @ManagedAttribute(description = "Trace Exceptions") public void setTraceExceptions(boolean traceExceptions) { tracer.setTraceExceptions(traceExceptions); } - @ManagedAttribute(description = "Trace Out Exchanges") public boolean getTraceOutExchanges() { return tracer.isTraceOutExchanges(); } - @ManagedAttribute(description = "Trace Out Exchanges") public void setTraceOutExchanges(boolean traceOutExchanges) { tracer.setTraceOutExchanges(traceOutExchanges); } - @ManagedAttribute(description = "Formatter show body") public boolean getFormatterShowBody() { if (tracer.getDefaultTraceFormatter() == null) { return false; @@ -156,7 +138,6 @@ public class ManagedTracer implements No return tracer.getDefaultTraceFormatter().isShowBody(); } - @ManagedAttribute(description = "Formatter show body") public void setFormatterShowBody(boolean showBody) { if (tracer.getDefaultTraceFormatter() == null) { return; @@ -164,7 +145,6 @@ public class ManagedTracer implements No tracer.getDefaultTraceFormatter().setShowBody(showBody); } - @ManagedAttribute(description = "Formatter show body type") public boolean getFormatterShowBodyType() { if (tracer.getDefaultTraceFormatter() == null) { return false; @@ -172,7 +152,6 @@ public class ManagedTracer implements No return tracer.getDefaultTraceFormatter().isShowBodyType(); } - @ManagedAttribute(description = "Formatter show body type") public void setFormatterShowBodyType(boolean showBodyType) { if (tracer.getDefaultTraceFormatter() == null) { return; @@ -180,7 +159,6 @@ public class ManagedTracer implements No tracer.getDefaultTraceFormatter().setShowBodyType(showBodyType); } - @ManagedAttribute(description = "Formatter show out body") public boolean getFormatterShowOutBody() { if (tracer.getDefaultTraceFormatter() == null) { return false; @@ -188,7 +166,6 @@ public class ManagedTracer implements No return tracer.getDefaultTraceFormatter().isShowOutBody(); } - @ManagedAttribute(description = "Formatter show out body") public void setFormatterShowOutBody(boolean showOutBody) { if (tracer.getDefaultTraceFormatter() == null) { return; @@ -196,7 +173,6 @@ public class ManagedTracer implements No tracer.getDefaultTraceFormatter().setShowOutBody(showOutBody); } - @ManagedAttribute(description = "Formatter show out body type") public boolean getFormatterShowOutBodyType() { if (tracer.getDefaultTraceFormatter() == null) { return false; @@ -204,7 +180,6 @@ public class ManagedTracer implements No return tracer.getDefaultTraceFormatter().isShowOutBodyType(); } - @ManagedAttribute(description = "Formatter show out body type") public void setFormatterShowOutBodyType(boolean showOutBodyType) { if (tracer.getDefaultTraceFormatter() == null) { return; @@ -212,7 +187,6 @@ public class ManagedTracer implements No tracer.getDefaultTraceFormatter().setShowOutBodyType(showOutBodyType); } - @ManagedAttribute(description = "Formatter show breadcrumb") public boolean getFormatterShowBreadCrumb() { if (tracer.getDefaultTraceFormatter() == null) { return false; @@ -220,7 +194,6 @@ public class ManagedTracer implements No return tracer.getDefaultTraceFormatter().isShowBreadCrumb(); } - @ManagedAttribute(description = "Formatter show breadcrumb") public void setFormatterShowBreadCrumb(boolean showBreadCrumb) { if (tracer.getDefaultTraceFormatter() == null) { return; @@ -228,7 +201,6 @@ public class ManagedTracer implements No tracer.getDefaultTraceFormatter().setShowBreadCrumb(showBreadCrumb); } - @ManagedAttribute(description = "Formatter show exchange id") public boolean getFormatterShowExchangeId() { if (tracer.getDefaultTraceFormatter() == null) { return false; @@ -236,7 +208,6 @@ public class ManagedTracer implements No return tracer.getDefaultTraceFormatter().isShowExchangeId(); } - @ManagedAttribute(description = "Formatter show exchange id") public void setFormatterShowExchangeId(boolean showExchangeId) { if (tracer.getDefaultTraceFormatter() == null) { return; @@ -244,7 +215,6 @@ public class ManagedTracer implements No tracer.getDefaultTraceFormatter().setShowExchangeId(showExchangeId); } - @ManagedAttribute(description = "Formatter show headers") public boolean getFormatterShowHeaders() { if (tracer.getDefaultTraceFormatter() == null) { return false; @@ -252,7 +222,6 @@ public class ManagedTracer implements No return tracer.getDefaultTraceFormatter().isShowHeaders(); } - @ManagedAttribute(description = "Formatter show headers") public void setFormatterShowHeaders(boolean showHeaders) { if (tracer.getDefaultTraceFormatter() == null) { return; @@ -260,7 +229,6 @@ public class ManagedTracer implements No tracer.getDefaultTraceFormatter().setShowHeaders(showHeaders); } - @ManagedAttribute(description = "Formatter show out headers") public boolean getFormatterShowOutHeaders() { if (tracer.getDefaultTraceFormatter() == null) { return false; @@ -268,7 +236,6 @@ public class ManagedTracer implements No return tracer.getDefaultTraceFormatter().isShowOutHeaders(); } - @ManagedAttribute(description = "Formatter show out headers") public void setFormatterShowOutHeaders(boolean showOutHeaders) { if (tracer.getDefaultTraceFormatter() == null) { return; @@ -276,7 +243,6 @@ public class ManagedTracer implements No tracer.getDefaultTraceFormatter().setShowOutHeaders(showOutHeaders); } - @ManagedAttribute(description = "Formatter show properties") public boolean getFormatterShowProperties() { if (tracer.getDefaultTraceFormatter() == null) { return false; @@ -284,7 +250,6 @@ public class ManagedTracer implements No return tracer.getDefaultTraceFormatter().isShowProperties(); } - @ManagedAttribute(description = "Formatter show properties") public void setFormatterShowProperties(boolean showProperties) { if (tracer.getDefaultTraceFormatter() == null) { return; @@ -292,7 +257,6 @@ public class ManagedTracer implements No tracer.getDefaultTraceFormatter().setShowProperties(showProperties); } - @ManagedAttribute(description = "Formatter show node") public boolean getFormatterShowNode() { if (tracer.getDefaultTraceFormatter() == null) { return false; @@ -300,7 +264,6 @@ public class ManagedTracer implements No return tracer.getDefaultTraceFormatter().isShowNode(); } - @ManagedAttribute(description = "Formatter show node") public void setFormatterShowNode(boolean showNode) { if (tracer.getDefaultTraceFormatter() == null) { return; @@ -308,7 +271,6 @@ public class ManagedTracer implements No tracer.getDefaultTraceFormatter().setShowNode(showNode); } - @ManagedAttribute(description = "Formatter show exchange pattern") public boolean getFormatterShowExchangePattern() { if (tracer.getDefaultTraceFormatter() == null) { return false; @@ -316,7 +278,6 @@ public class ManagedTracer implements No return tracer.getDefaultTraceFormatter().isShowExchangePattern(); } - @ManagedAttribute(description = "Formatter show exchange pattern") public void setFormatterShowExchangePattern(boolean showExchangePattern) { if (tracer.getDefaultTraceFormatter() == null) { return; @@ -324,7 +285,6 @@ public class ManagedTracer implements No tracer.getDefaultTraceFormatter().setShowExchangePattern(showExchangePattern); } - @ManagedAttribute(description = "Formatter show exception") public boolean getFormatterShowException() { if (tracer.getDefaultTraceFormatter() == null) { return false; @@ -332,7 +292,6 @@ public class ManagedTracer implements No return tracer.getDefaultTraceFormatter().isShowException(); } - @ManagedAttribute(description = "Formatter show exception") public void setFormatterShowException(boolean showException) { if (tracer.getDefaultTraceFormatter() == null) { return; @@ -340,7 +299,6 @@ public class ManagedTracer implements No tracer.getDefaultTraceFormatter().setShowException(showException); } - @ManagedAttribute(description = "Formatter show route id") public boolean getFormatterShowRouteId() { if (tracer.getDefaultTraceFormatter() == null) { return false; @@ -348,7 +306,6 @@ public class ManagedTracer implements No return tracer.getDefaultTraceFormatter().isShowRouteId(); } - @ManagedAttribute(description = "Formatter show route id") public void setFormatterShowRouteId(boolean showRouteId) { if (tracer.getDefaultTraceFormatter() == null) { return; @@ -356,7 +313,6 @@ public class ManagedTracer implements No tracer.getDefaultTraceFormatter().setShowRouteId(showRouteId); } - @ManagedAttribute(description = "Formatter breadcrumb length") public int getFormatterBreadCrumbLength() { if (tracer.getDefaultTraceFormatter() == null) { return 0; @@ -364,7 +320,6 @@ public class ManagedTracer implements No return tracer.getDefaultTraceFormatter().getBreadCrumbLength(); } - @ManagedAttribute(description = "Formatter breadcrumb length") public void setFormatterBreadCrumbLength(int breadCrumbLength) { if (tracer.getDefaultTraceFormatter() == null) { return; @@ -372,7 +327,6 @@ public class ManagedTracer implements No tracer.getDefaultTraceFormatter().setBreadCrumbLength(breadCrumbLength); } - @ManagedAttribute(description = "Formatter show short exchange id") public boolean getFormatterShowShortExchangeId() { if (tracer.getDefaultTraceFormatter() == null) { return false; @@ -380,7 +334,6 @@ public class ManagedTracer implements No return tracer.getDefaultTraceFormatter().isShowShortExchangeId(); } - @ManagedAttribute(description = "Formatter show short exchange id") public void setFormatterShowShortExchangeId(boolean showShortExchangeId) { if (tracer.getDefaultTraceFormatter() == null) { return; @@ -388,7 +341,6 @@ public class ManagedTracer implements No tracer.getDefaultTraceFormatter().setShowShortExchangeId(showShortExchangeId); } - @ManagedAttribute(description = "Formatter node length") public int getFormatterNodeLength() { if (tracer.getDefaultTraceFormatter() == null) { return 0; @@ -396,7 +348,6 @@ public class ManagedTracer implements No return tracer.getDefaultTraceFormatter().getNodeLength(); } - @ManagedAttribute(description = "Formatter node length") public void setFormatterNodeLength(int nodeLength) { if (tracer.getDefaultTraceFormatter() == null) { return; @@ -404,7 +355,6 @@ public class ManagedTracer implements No tracer.getDefaultTraceFormatter().setNodeLength(nodeLength); } - @ManagedAttribute(description = "Formatter max chars") public int getFormatterMaxChars() { if (tracer.getDefaultTraceFormatter() == null) { return 0; @@ -412,7 +362,6 @@ public class ManagedTracer implements No return tracer.getDefaultTraceFormatter().getMaxChars(); } - @ManagedAttribute(description = "Formatter max chars") public void setFormatterMaxChars(int maxChars) { if (tracer.getDefaultTraceFormatter() == null) { return; @@ -420,22 +369,18 @@ public class ManagedTracer implements No tracer.getDefaultTraceFormatter().setMaxChars(maxChars); } - @ManagedAttribute(description = "Should trace events be sent as jmx notifications") public boolean isJmxTraceNotifications() { return this.tracer.isJmxTraceNotifications(); } - @ManagedAttribute public void setJmxTraceNotifications(boolean jmxTraceNotifications) { this.tracer.setJmxTraceNotifications(jmxTraceNotifications); } - @ManagedAttribute(description = "Maximum size of a message body for trace notification") public int getTraceBodySize() { return this.tracer.getTraceBodySize(); } - @ManagedAttribute public void setTraceBodySize(int traceBodySize) { this.tracer.setTraceBodySize(traceBodySize); } Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopUsingMBeanAPITest.java (from r1210790, camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopTest.java) URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopUsingMBeanAPITest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopUsingMBeanAPITest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopTest.java&r1=1210790&r2=1210806&rev=1210806&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopUsingMBeanAPITest.java Tue Dec 6 07:29:02 2011 @@ -18,15 +18,17 @@ package org.apache.camel.management; import java.util.Set; import javax.management.MBeanServer; +import javax.management.MBeanServerInvocationHandler; import javax.management.ObjectName; import org.apache.camel.ServiceStatus; +import org.apache.camel.api.management.mbean.ManagedRouteMBean; import org.apache.camel.builder.RouteBuilder; /** * @version */ -public class ManagedRouteStopTest extends ManagementTestSupport { +public class ManagedRouteStopUsingMBeanAPITest extends ManagementTestSupport { public void testStopRoute() throws Exception { // fire a message to get it running @@ -41,25 +43,18 @@ public class ManagedRouteStopTest extend ObjectName on = set.iterator().next(); - boolean registered = mbeanServer.isRegistered(on); - assertEquals("Should be registered", true, registered); + ManagedRouteMBean mbean = MBeanServerInvocationHandler.newProxyInstance(mbeanServer, on, ManagedRouteMBean.class, false); - String uri = (String) mbeanServer.getAttribute(on, "EndpointUri"); // the route has this starting endpoint uri - assertEquals("direct://start", uri); + assertEquals("direct://start", mbean.getEndpointUri()); // should be started - String state = (String) mbeanServer.getAttribute(on, "State"); - assertEquals("Should be started", ServiceStatus.Started.name(), state); + assertEquals("Should be started", ServiceStatus.Started.name(), mbean.getState()); - mbeanServer.invoke(on, "stop", null, null); + mbean.stop(); - registered = mbeanServer.isRegistered(on); - assertEquals("Should be registered", true, registered); - - // should be stopped, eg its removed - state = (String) mbeanServer.getAttribute(on, "State"); - assertEquals("Should be stopped", ServiceStatus.Stopped.name(), state); + // should be stopped + assertEquals("Should be stopped", ServiceStatus.Stopped.name(), mbean.getState()); } @Override
