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 2010/12/07 18:08:22 UTC
svn commit: r1043131 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/component/bean/ main/java/org/apache/camel/impl/
main/java/org/apache/camel/management/
main/java/org/apache/camel/management/mbean/
test/java/org/apache/camel/issues/ te...
Author: davsclaus
Date: Tue Dec 7 17:08:21 2010
New Revision: 1043131
URL: http://svn.apache.org/viewvc?rev=1043131&view=rev
Log:
CAMEL-3279: Custom beans can now also be managed from JMX using their own set of operations/attributes.
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBeanProcessor.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCustomBeanTest.java
- copied, changed from r1043074, camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxMBeanAssembler.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterThrowExceptionInExpressionTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java?rev=1043131&r1=1043130&r2=1043131&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java Tue Dec 7 17:08:21 2010
@@ -211,6 +211,10 @@ public class BeanProcessor extends Servi
return beanHolder.getProcessor();
}
+ public Object getBean() {
+ return beanHolder.getBean();
+ }
+
// Properties
// -----------------------------------------------------------------------
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java?rev=1043131&r1=1043130&r2=1043131&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java Tue Dec 7 17:08:21 2010
@@ -33,7 +33,6 @@ import org.apache.camel.ProducerTemplate
import org.apache.camel.Service;
import org.apache.camel.component.bean.BeanProcessor;
import org.apache.camel.component.bean.ProxyHelper;
-import org.apache.camel.component.seda.CollectionProducer;
import org.apache.camel.processor.UnitOfWorkProcessor;
import org.apache.camel.processor.UnitOfWorkProducer;
import org.apache.camel.util.CamelContextHelper;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java?rev=1043131&r1=1043130&r2=1043131&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java Tue Dec 7 17:08:21 2010
@@ -39,12 +39,14 @@ import org.apache.camel.Route;
import org.apache.camel.Service;
import org.apache.camel.VetoCamelContextStartException;
import org.apache.camel.builder.ErrorHandlerBuilder;
+import org.apache.camel.component.bean.BeanProcessor;
import org.apache.camel.impl.DefaultCamelContextNameStrategy;
import org.apache.camel.impl.EventDrivenConsumerRoute;
import org.apache.camel.impl.ExplicitCamelContextNameStrategy;
import org.apache.camel.impl.ProducerCache;
import org.apache.camel.impl.ScheduledPollConsumer;
import org.apache.camel.impl.ThrottlingInflightRoutePolicy;
+import org.apache.camel.management.mbean.ManagedBeanProcessor;
import org.apache.camel.management.mbean.ManagedBrowsableEndpoint;
import org.apache.camel.management.mbean.ManagedCamelContext;
import org.apache.camel.management.mbean.ManagedComponent;
@@ -470,6 +472,8 @@ public class DefaultManagementLifecycleS
answer = new ManagedThrottler(context, (Throttler) target, definition);
} else if (target instanceof SendProcessor) {
answer = new ManagedSendProcessor(context, (SendProcessor) target, definition);
+ } else if (target instanceof BeanProcessor) {
+ answer = new ManagedBeanProcessor(context, (BeanProcessor) target, definition);
} else if (target instanceof ManagementAware) {
return ((ManagementAware) target).getManagedObject(processor);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxMBeanAssembler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxMBeanAssembler.java?rev=1043131&r1=1043130&r2=1043131&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxMBeanAssembler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/JmxMBeanAssembler.java Tue Dec 7 17:08:21 2010
@@ -39,7 +39,7 @@ import org.springframework.jmx.export.as
* @version $Revision$
*/
public class JmxMBeanAssembler {
- private final static Log LOG = LogFactory.getLog(JmxMBeanAssembler.class);
+ private static final Log LOG = LogFactory.getLog(JmxMBeanAssembler.class);
private final MetadataMBeanInfoAssembler assembler;
private final MBeanServer server;
@@ -55,9 +55,9 @@ public class JmxMBeanAssembler {
// prefer to use the managed instance if it has been annotated with Spring JMX annotations
if (obj instanceof ManagedInstance) {
Object custom = ((ManagedInstance) obj).getInstance();
- if (ObjectHelper.hasAnnotation(custom.getClass().getAnnotations(), ManagedResource.class)) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Assembling MBeanInfo for: " + name.toString() + " from custom @ManagedResource object: " + custom);
+ if (custom != null && ObjectHelper.hasAnnotation(custom.getClass().getAnnotations(), ManagedResource.class)) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Assembling MBeanInfo for: " + name.toString() + " from custom @ManagedResource object: " + custom);
}
// get the mbean info from the custom managed object
mbi = assembler.getMBeanInfo(custom, name.toString());
@@ -68,8 +68,8 @@ public class JmxMBeanAssembler {
if (mbi == null) {
// use the default provided mbean which has been annotated with Spring JMX annotations
- if (LOG.isDebugEnabled()) {
- LOG.debug("Assembling MBeanInfo for: " + name.toString() + " from @ManagedResource object: " + obj);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Assembling MBeanInfo for: " + name.toString() + " from @ManagedResource object: " + obj);
}
mbi = assembler.getMBeanInfo(obj, name.toString());
}
Added: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBeanProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBeanProcessor.java?rev=1043131&view=auto
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBeanProcessor.java (added)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedBeanProcessor.java Tue Dec 7 17:08:21 2010
@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.management.mbean;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.bean.BeanProcessor;
+import org.apache.camel.model.ProcessorDefinition;
+import org.springframework.jmx.export.annotation.ManagedResource;
+
+/**
+ * @version $Revision$
+ */
+@ManagedResource(description = "Managed Bean Processor")
+public class ManagedBeanProcessor extends ManagedProcessor {
+
+ public ManagedBeanProcessor(CamelContext context, BeanProcessor processor, ProcessorDefinition<?> definition) {
+ super(context, processor, definition);
+ }
+
+ @Override
+ public BeanProcessor getProcessor() {
+ return (BeanProcessor) super.getProcessor();
+ }
+
+ @Override
+ public Object getInstance() {
+ return getProcessor().getBean();
+ }
+}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterThrowExceptionInExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterThrowExceptionInExpressionTest.java?rev=1043131&r1=1043130&r2=1043131&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterThrowExceptionInExpressionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SplitterThrowExceptionInExpressionTest.java Tue Dec 7 17:08:21 2010
@@ -27,7 +27,7 @@ import org.apache.camel.builder.RouteBui
*/
public class SplitterThrowExceptionInExpressionTest extends ContextTestSupport {
- public void testSplitterAndVerifyMock () throws Exception {
+ public void testSplitterAndVerifyMock() throws Exception {
getMockEndpoint("mock:error").expectedMessageCount(0);
getMockEndpoint("mock:error2").expectedMessageCount(1);
getMockEndpoint("mock:split").expectedMessageCount(0);
Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCustomBeanTest.java (from r1043074, camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCustomBeanTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCustomBeanTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java&r1=1043074&r2=1043131&rev=1043131&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCustomBeanTest.java Tue Dec 7 17:08:21 2010
@@ -16,14 +16,14 @@
*/
package org.apache.camel.management;
+import java.util.Map;
import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
+import org.apache.camel.Headers;
import org.apache.camel.builder.RouteBuilder;
import org.springframework.jmx.export.annotation.ManagedAttribute;
import org.springframework.jmx.export.annotation.ManagedResource;
@@ -31,7 +31,7 @@ import org.springframework.jmx.export.an
/**
* @version $Revision: 950375 $
*/
-public class ManagedCustomProcessorTest extends ContextTestSupport {
+public class ManagedCustomBeanTest extends ContextTestSupport {
@Override
protected boolean useJmx() {
@@ -47,13 +47,13 @@ public class ManagedCustomProcessorTest
return context;
}
- public void testManageCustomProcessor() throws Exception {
+ public void testManageCustomBean() throws Exception {
MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=processors,name=\"custom\"");
getMockEndpoint("mock:result").expectedMessageCount(1);
getMockEndpoint("mock:result").expectedHeaderReceived("foo", "hey");
- template.sendBody("direct:start", "Hello World");
+ template.sendBody("direct:start", "World");
assertMockEndpointsSatisfied();
String foo = (String) mbeanServer.getAttribute(on, "Foo");
@@ -66,7 +66,7 @@ public class ManagedCustomProcessorTest
getMockEndpoint("mock:result").expectedMessageCount(1);
getMockEndpoint("mock:result").expectedHeaderReceived("foo", "changed");
- template.sendBody("direct:start", "Bye World");
+ template.sendBody("direct:start", "Camel");
assertMockEndpointsSatisfied();
}
@@ -76,15 +76,15 @@ public class ManagedCustomProcessorTest
@Override
public void configure() throws Exception {
from("direct:start").routeId("foo")
- .process(new MyCustomProcessor()).id("custom")
+ .bean(new MyCustomBean()).id("custom")
.to("mock:result");
}
};
}
// START SNIPPET: e1
- @ManagedResource("My Managed Component")
- public static class MyCustomProcessor implements Processor {
+ @ManagedResource("My Managed Bean")
+ public static class MyCustomBean {
private String foo = "hey";
@ManagedAttribute
@@ -97,8 +97,9 @@ public class ManagedCustomProcessorTest
this.foo = foo;
}
- public void process(Exchange exchange) throws Exception {
- exchange.getIn().setHeader("foo", getFoo());
+ public String doSomething(String body, @Headers Map headers) throws Exception {
+ headers.put("foo", foo);
+ return "Hello " + body;
}
}
// END SNIPPET: e1