Author: davsclaus
Date: Fri Jun 25 05:47:02 2010
New Revision: 957810
URL: http://svn.apache.org/viewvc?rev=957810&view=rev
Log:
CAMEL-2844: quartz should keep jobs on shutdown. And only remove if the job if
its volatile.
Added:
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextRestartTest.java
(with props)
Modified:
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextTest.java
Added:
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextRestartTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextRestartTest.java?rev=957810&view=auto
==============================================================================
---
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextRestartTest.java
(added)
+++
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextRestartTest.java
Fri Jun 25 05:47:02 2010
@@ -0,0 +1,85 @@
+/**
+ * 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.component.quartz;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @version $Revision$
+ */
+public class QuartzTwoCamelContextRestartTest {
+
+ private DefaultCamelContext camel1;
+ private DefaultCamelContext camel2;
+
+ @Before
+ public void setUp() throws Exception {
+ camel1 = new DefaultCamelContext();
+ camel1.setName("camel-1");
+ camel1.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+
from("quartz://myGroup/myTimerName?cron=0/1+*+*+*+*+?").to("mock:one");
+ }
+ });
+ camel1.start();
+
+ camel2 = new DefaultCamelContext();
+ camel2.setName("camel-2");
+ camel2.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+
from("quartz://myOtherGroup/myOtherTimerName?cron=0/1+*+*+*+*+?").to("mock:two");
+ }
+ });
+ camel2.start();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ camel1.stop();
+ camel2.stop();
+ }
+
+ @Test
+ public void testTwoCamelContextRestart() throws Exception {
+ MockEndpoint mock1 = camel1.getEndpoint("mock:one",
MockEndpoint.class);
+ mock1.expectedMinimumMessageCount(2);
+
+ MockEndpoint mock2 = camel2.getEndpoint("mock:two",
MockEndpoint.class);
+ mock2.expectedMinimumMessageCount(6);
+ mock1.assertIsSatisfied();
+
+ camel1.stop();
+
+ mock2.assertIsSatisfied();
+
+ // should resume triggers when we start camel 1 again
+ mock1.reset();
+ mock1.expectedMinimumMessageCount(2);
+ camel1.start();
+
+ mock1.assertIsSatisfied();
+ }
+
+
+}
Propchange:
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextRestartTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextRestartTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextTest.java?rev=957810&r1=957809&r2=957810&view=diff
==============================================================================
---
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextTest.java
(original)
+++
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextTest.java
Fri Jun 25 05:47:02 2010
@@ -34,7 +34,6 @@ public class QuartzTwoCamelContextTest e
@Before
public void setUp() throws Exception {
-
camel1 = new DefaultCamelContext();
camel1.setName("camel-1");
camel1.addRoutes(new RouteBuilder() {
@@ -76,7 +75,6 @@ public class QuartzTwoCamelContextTest e
mock2.assertIsSatisfied();
camel2.stop();
-
}
@Test
@@ -100,7 +98,6 @@ public class QuartzTwoCamelContextTest e
mock3.assertIsSatisfied();
camel3.stop();
-
}
}
