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 2012/06/05 09:27:11 UTC
svn commit: r1346267 - in
/camel/branches/camel-2.9.x/components/camel-quartz/src:
main/java/org/apache/camel/component/quartz/
test/java/org/apache/camel/component/quartz/
test/resources/org/apache/camel/component/quartz/
Author: davsclaus
Date: Tue Jun 5 07:27:11 2012
New Revision: 1346267
URL: http://svn.apache.org/viewvc?rev=1346267&view=rev
Log:
CAMEL-5259: reverted 1345933 as configuration of managementName is not available until Camel 2.10.
Removed:
camel/branches/camel-2.9.x/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzTwoCamelContextSameNameClashTest.java
Modified:
camel/branches/camel-2.9.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
camel/branches/camel-2.9.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzConstants.java
camel/branches/camel-2.9.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
camel/branches/camel-2.9.x/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartTest.xml
camel/branches/camel-2.9.x/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.xml
Modified: camel/branches/camel-2.9.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java?rev=1346267&r1=1346266&r2=1346267&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java (original)
+++ camel/branches/camel-2.9.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java Tue Jun 5 07:27:11 2012
@@ -53,6 +53,7 @@ import org.slf4j.LoggerFactory;
*/
public class QuartzComponent extends DefaultComponent implements StartupListener {
private static final transient Logger LOG = LoggerFactory.getLogger(QuartzComponent.class);
+ private final AtomicInteger jobs = new AtomicInteger();
private Scheduler scheduler;
private final List<JobToAdd> jobsToAdd = new ArrayList<JobToAdd>();
private SchedulerFactory factory;
@@ -164,8 +165,7 @@ public class QuartzComponent extends Def
public void onCamelContextStarted(CamelContext camelContext, boolean alreadyStarted) throws Exception {
if (scheduler != null) {
// register current camel context to scheduler so we can look it up when jobs is being triggered
- // must use management name as it should be unique in the same JVM
- scheduler.getContext().put(QuartzConstants.QUARTZ_CAMEL_CONTEXT + "-" + getCamelContext().getManagementName(), getCamelContext());
+ scheduler.getContext().put(QuartzConstants.QUARTZ_CAMEL_CONTEXT + "-" + getCamelContext().getName(), getCamelContext());
}
// if not configure to auto start then don't start it
@@ -191,9 +191,9 @@ public class QuartzComponent extends Def
super.doStop();
if (scheduler != null) {
- AtomicInteger number = (AtomicInteger) scheduler.getContext().get("CamelJobs");
- if (number != null && number.get() > 0) {
- LOG.info("Cannot shutdown Quartz scheduler: " + scheduler.getSchedulerName() + " as there are still " + number.get() + " jobs registered.");
+ int number = jobs.get();
+ if (number > 0) {
+ LOG.info("Cannot shutdown Quartz scheduler: " + scheduler.getSchedulerName() + " as there are still " + number + " jobs registered.");
} else {
// no more jobs then shutdown the scheduler
LOG.info("There are no more jobs registered, so shutting down Quartz scheduler: " + scheduler.getSchedulerName());
@@ -214,7 +214,7 @@ public class QuartzComponent extends Def
}
private void doAddJob(JobDetail job, Trigger trigger) throws SchedulerException {
- incrementJobCounter(getScheduler());
+ jobs.incrementAndGet();
Trigger existingTrigger = getScheduler().getTrigger(trigger.getName(), trigger.getGroup());
if (existingTrigger == null) {
@@ -254,7 +254,7 @@ public class QuartzComponent extends Def
}
public void pauseJob(Trigger trigger) throws SchedulerException {
- decrementJobCounter(getScheduler());
+ jobs.decrementAndGet();
if (isClustered()) {
// do not pause jobs which are clustered, as we want the jobs to continue running on the other nodes
@@ -470,31 +470,8 @@ public class QuartzComponent extends Def
}
// register current camel context to scheduler so we can look it up when jobs is being triggered
- // must use management name as it should be unique in the same JVM
- scheduler.getContext().put(QuartzConstants.QUARTZ_CAMEL_CONTEXT + "-" + getCamelContext().getManagementName(), getCamelContext());
-
- // store Camel job counter
- AtomicInteger number = (AtomicInteger) scheduler.getContext().get("CamelJobs");
- if (number == null) {
- number = new AtomicInteger(0);
- scheduler.getContext().put("CamelJobs", number);
- }
-
+ scheduler.getContext().put(QuartzConstants.QUARTZ_CAMEL_CONTEXT + "-" + getCamelContext().getName(), getCamelContext());
return scheduler;
}
- private static void decrementJobCounter(Scheduler scheduler) throws SchedulerException {
- AtomicInteger number = (AtomicInteger) scheduler.getContext().get("CamelJobs");
- if (number != null) {
- number.decrementAndGet();
- }
- }
-
- private static void incrementJobCounter(Scheduler scheduler) throws SchedulerException {
- AtomicInteger number = (AtomicInteger) scheduler.getContext().get("CamelJobs");
- if (number != null) {
- number.incrementAndGet();
- }
- }
-
}
Modified: camel/branches/camel-2.9.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzConstants.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzConstants.java?rev=1346267&r1=1346266&r2=1346267&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzConstants.java (original)
+++ camel/branches/camel-2.9.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzConstants.java Tue Jun 5 07:27:11 2012
@@ -23,7 +23,6 @@ public final class QuartzConstants {
public static final String QUARTZ_ENDPOINT_URI = "CamelQuartzEndpoint";
- // Note: using the CamelContext management name to ensure its unique in the JVM
public static final String QUARTZ_CAMEL_CONTEXT_NAME = "CamelQuartzCamelContextName";
public static final String QUARTZ_CAMEL_CONTEXT = "CamelQuartzCamelContext";
Modified: camel/branches/camel-2.9.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java?rev=1346267&r1=1346266&r2=1346267&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java (original)
+++ camel/branches/camel-2.9.x/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java Tue Jun 5 07:27:11 2012
@@ -70,8 +70,7 @@ public class QuartzEndpoint extends Defa
trigger.setStartTime(new Date());
}
detail.getJobDataMap().put(QuartzConstants.QUARTZ_ENDPOINT_URI, getEndpointUri());
- // must use management name as it should be unique in the same JVM
- detail.getJobDataMap().put(QuartzConstants.QUARTZ_CAMEL_CONTEXT_NAME, getCamelContext().getManagementName());
+ detail.getJobDataMap().put(QuartzConstants.QUARTZ_CAMEL_CONTEXT_NAME, getCamelContext().getName());
if (detail.getJobClass() == null) {
detail.setJobClass(isStateful() ? StatefulCamelJob.class : CamelJob.class);
}
Modified: camel/branches/camel-2.9.x/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartTest.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartTest.xml?rev=1346267&r1=1346266&r2=1346267&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartTest.xml (original)
+++ camel/branches/camel-2.9.x/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreRestartTest.xml Tue Jun 5 07:27:11 2012
@@ -56,7 +56,7 @@
</property>
</bean>
- <camelContext id="camelContext" managementNamePattern="#name#" xmlns="http://camel.apache.org/schema/spring">
+ <camelContext id="camelContext" xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="quartz://app/test?trigger.repeatInterval=1000&trigger.repeatCount=-1&stateful=true"/>
<to uri="log:trigger"/>
Modified: camel/branches/camel-2.9.x/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.xml?rev=1346267&r1=1346266&r2=1346267&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.xml (original)
+++ camel/branches/camel-2.9.x/components/camel-quartz/src/test/resources/org/apache/camel/component/quartz/SpringQuartzPersistentStoreTest.xml Tue Jun 5 07:27:11 2012
@@ -56,7 +56,7 @@
</property>
</bean>
- <camelContext id="camelContext" managementNamePattern="#name#" xmlns="http://camel.apache.org/schema/spring">
+ <camelContext id="camelContext" xmlns="http://camel.apache.org/schema/spring">
<route id="myRoute">
<from uri="quartz://app/test?trigger.repeatInterval=1000&trigger.repeatCount=-1&stateful=true"/>
<to uri="log:trigger"/>