Author: ningjiang
Date: Mon Jun 14 09:48:34 2010
New Revision: 954391

URL: http://svn.apache.org/viewvc?rev=954391&view=rev
Log:
CAMEL-2810 support to start camel-quartz component with a new camelContext 
after the scheduler is shutdown, also revert the camel-quartz change of my last 
commit

Modified:
    
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
    
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
    
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java
    
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextTest.java

Modified: 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java?rev=954391&r1=954390&r2=954391&view=diff
==============================================================================
--- 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
 (original)
+++ 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
 Mon Jun 14 09:48:34 2010
@@ -134,7 +134,8 @@ public class QuartzComponent extends Def
             if (number == 0) {
                 // no more jobs then shutdown the scheduler
                 LOG.info("There are no more jobs registered, so shutting down 
Quartz scheduler: " + scheduler.getSchedulerName());
-                scheduler.standby();               
+                scheduler.shutdown();
+                scheduler = null;
             }
         }
         super.doStop();
@@ -175,7 +176,7 @@ public class QuartzComponent extends Def
         if (scheduler == null) {
             scheduler = createScheduler();
         }
-        if (!scheduler.isStarted()) {
+        if (!scheduler.isStarted()) {            
             LOG.info("Starting Quartz scheduler: " + 
scheduler.getSchedulerName());
             scheduler.start();
         }

Modified: 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java?rev=954391&r1=954390&r2=954391&view=diff
==============================================================================
--- 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
 (original)
+++ 
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
 Mon Jun 14 09:48:34 2010
@@ -197,7 +197,6 @@ public class QuartzEndpoint extends Defa
         getLoadBalancer().removeProcessor(consumer.getProcessor());
         if (getLoadBalancer().getProcessors().isEmpty() && started) {
             removeTrigger(getTrigger());
-            System.out.println("Remove the trigger");
             started = false;
         }
     }

Modified: 
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java?rev=954391&r1=954390&r2=954391&view=diff
==============================================================================
--- 
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java
 (original)
+++ 
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java
 Mon Jun 14 09:48:34 2010
@@ -56,22 +56,6 @@ public class QuartzRouteTest extends Cam
         }
     }
     
-    @Test
-    public void testStartAndStopCamelContext() throws Exception {
-        System.out.println("Routes " + context.getRoutes());
-        System.out.println("The endpoints" + context.getEndpoints());
-        //context.stopRoute("myRoute");
-        context.stop();
-        System.out.println("Routes " + context.getRoutes());
-        Thread.sleep(2000);
-        
-        context.start();
-        System.out.println("Routes " + context.getRoutes());
-        context.addRoutes(createRouteBuilder());
-        
-        testQuartzRoute();
-        
-    }
 
     @Override
     protected RouteBuilder createRouteBuilder() {

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=954391&r1=954390&r2=954391&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
 Mon Jun 14 09:48:34 2010
@@ -20,18 +20,22 @@ import junit.framework.TestCase;
 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.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class QuartzTwoCamelContextTest extends TestCase {
+public class QuartzTwoCamelContextTest extends Assert {
 
     private DefaultCamelContext camel1;
     private DefaultCamelContext camel2;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
+        
         camel1 = new DefaultCamelContext();
         camel1.setName("camel-1");
         camel1.addRoutes(new RouteBuilder() {
@@ -53,25 +57,51 @@ public class QuartzTwoCamelContextTest e
         camel2.start();
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         camel1.stop();
         camel2.stop();
-        super.tearDown();
     }
 
+    @Test
     public void testTwoCamelContext() 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();
 
+        camel2.stop();        
+        
+    }
+    
+    @Test
+    public void testThirdCamelContext() throws Exception {
+        camel1.stop();
+        
         camel2.stop();
+                
+        DefaultCamelContext camel3 = new DefaultCamelContext();
+        camel3.setName("camel-3");
+        camel3.addRoutes(new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                
from("quartz://myThirdGroup/myThirdTimerName?cron=0/1+*+*+*+*+?").to("mock:three");
+            }
+        });
+        camel3.start();
+        
+        MockEndpoint mock3 = camel3.getEndpoint("mock:three", 
MockEndpoint.class);
+        mock3.expectedMinimumMessageCount(2);
+        
+        mock3.assertIsSatisfied();
+        camel3.stop();
+        
     }
 
 }


Reply via email to