Author: ningjiang
Date: Tue Oct 23 05:58:12 2012
New Revision: 1401168
URL: http://svn.apache.org/viewvc?rev=1401168&view=rev
Log:
CAMEL-5734 Added reststart method to Camel JMX with thanks to Daniel
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextRestartTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java?rev=1401168&r1=1401167&r2=1401168&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java
Tue Oct 23 05:58:12 2012
@@ -84,6 +84,9 @@ public interface ManagedCamelContextMBea
@ManagedOperation(description = "Stop Camel (shutdown)")
void stop() throws Exception;
+ @ManagedOperation(description = "Restart Camel (stop and then start)")
+ void restart() throws Exception;
+
@ManagedOperation(description = "Suspend Camel")
void suspend() throws Exception;
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=1401168&r1=1401167&r2=1401168&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
Tue Oct 23 05:58:12 2012
@@ -152,6 +152,11 @@ public class ManagedCamelContext extends
context.stop();
}
+ public void restart() throws Exception {
+ context.stop();
+ context.start();
+ }
+
public void suspend() throws Exception {
context.suspend();
}
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextRestartTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextRestartTest.java?rev=1401168&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextRestartTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextRestartTest.java
Tue Oct 23 05:58:12 2012
@@ -0,0 +1,107 @@
+/**
+ * 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;
+
+import java.util.EventObject;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.support.EventNotifierSupport;
+
+/**
+ * @version
+ */
+public class ManagedCamelContextRestartTest extends ManagementTestSupport {
+
+ private int starts = 0;
+ private int stops = 0;
+
+ @Override
+ protected void setUp() throws Exception {
+
+ super.setUp();
+
+ context.getManagementStrategy().addEventNotifier(new
EventNotifierSupport() {
+ @Override
+ public void notify(EventObject event) throws Exception {
+ // Empty.
+ }
+ @Override
+ public boolean isEnabled(EventObject event) {
+ return true;
+ }
+ @Override
+ protected void doStart() throws Exception {
+ starts++;
+ }
+ @Override
+ protected void doStop() throws Exception {
+ stops++;
+ }
+ });
+ }
+
+ public void testManagedCamelContext() throws Exception {
+ MBeanServer mbeanServer = getMBeanServer();
+
+ 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, "CamelId");
+ assertEquals("camel-1", name);
+
+ String uptime = (String) mbeanServer.getAttribute(on, "Uptime");
+ assertNotNull(uptime);
+
+ String status = (String) mbeanServer.getAttribute(on, "State");
+ assertEquals("Started", status);
+
+ // invoke operations
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedBodiesReceived("Hello World");
+
+ Object reply = mbeanServer.invoke(on, "requestBody", new
Object[]{"direct:foo", "Hello World"}, new String[]{"java.lang.String",
"java.lang.Object"});
+ assertEquals("Bye World", reply);
+
+ // restart Camel
+ assertEquals(0, starts);
+ assertEquals(0, stops);
+ mbeanServer.invoke(on, "restart", null, null);
+ assertEquals(1, starts);
+ assertEquals(1, stops);
+
+ status = (String) mbeanServer.getAttribute(on, "State");
+ assertEquals("Started", status);
+
+ reply = mbeanServer.invoke(on, "requestBody", new
Object[]{"direct:foo", "Hello Camel"}, new String[]{"java.lang.String",
"java.lang.Object"});
+ assertEquals("Bye World", reply);
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:foo").transform(constant("Bye World"));
+ }
+ };
+ }
+
+}
