Author: epugh
Date: Sat Jan 14 12:28:16 2006
New Revision: 369092
URL: http://svn.apache.org/viewcvs?rev=369092&view=rev
Log:
Bump to Quartz 1.5.1.
Modified:
jakarta/turbine/fulcrum/trunk/quartz/project.xml
jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/DefaultQuartzScheduler.java
jakarta/turbine/fulcrum/trunk/quartz/xdocs/changes.xml
Modified: jakarta/turbine/fulcrum/trunk/quartz/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/quartz/project.xml?rev=369092&r1=369091&r2=369092&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/quartz/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/quartz/project.xml Sat Jan 14 12:28:16 2006
@@ -37,9 +37,9 @@
<!-- QUARTZ -->
<dependency>
- <groupId>opensymphony</groupId>
+ <groupId>quartz</groupId>
<artifactId>quartz</artifactId>
- <version>1.5.0</version>
+ <version>1.5.1</version>
</dependency>
<!-- Needed only for testing -->
Modified:
jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/DefaultQuartzScheduler.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/DefaultQuartzScheduler.java?rev=369092&r1=369091&r2=369092&view=diff
==============================================================================
---
jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/DefaultQuartzScheduler.java
(original)
+++
jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/DefaultQuartzScheduler.java
Sat Jan 14 12:28:16 2006
@@ -74,8 +74,6 @@
private Configuration triggersConf;
- private Configuration scheduledJobs;
-
private Map jobDetailsMap;
private Map triggersMap;
@@ -87,7 +85,6 @@
jobDetailsConf = conf.getChild("jobDetails").getChild("list");
triggersConf = conf.getChild("triggers").getChild("list");
- scheduledJobs = conf.getChild("scheduledJobs");
Configuration child = conf.getChild("globalJobListener", false);
if (child != null) {
globalJobListenerClassName =
conf.getChild("globalJobListener").getAttribute("className");
@@ -160,6 +157,8 @@
Trigger trigger = (Trigger) triggersMap.get(key);
if (trigger instanceof CronTrigger) {
if (trigger.getJobGroup() != null & trigger.getJobName() !=
null) {
+ Trigger t =
scheduler.getTrigger(trigger.getName(),trigger.getGroup());
+ if (t==null){
CronTrigger triggerToSchedule = new
CronTrigger(trigger.getName(),trigger.getGroup(),trigger.getJobName(),trigger.getJobGroup(),((CronTrigger)trigger).getCronExpression());
logger.debug("Scheduling trigger [" +
triggerToSchedule.getFullName() + "] for job ["
+ triggerToSchedule.getFullJobName() + "] using
cron " + triggerToSchedule.getCronExpression());
@@ -168,6 +167,7 @@
// CronTrigger cronTrigger = new
CronTrigger("someTriggerCron", Scheduler.DEFAULT_GROUP,
// "simpleJob","DEFAULT_GROUP" ,"* * * * * ?");
scheduler.scheduleJob(triggerToSchedule);
+ }
/* Trigger rightNow = new SimpleTrigger("someTrigger",
Scheduler.DEFAULT_GROUP,
"notSoSimpleJob","DEFAULT_GROUP" ,new Date(),
null, 0,0L);
Modified: jakarta/turbine/fulcrum/trunk/quartz/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/fulcrum/trunk/quartz/xdocs/changes.xml?rev=369092&r1=369091&r2=369092&view=diff
==============================================================================
--- jakarta/turbine/fulcrum/trunk/quartz/xdocs/changes.xml (original)
+++ jakarta/turbine/fulcrum/trunk/quartz/xdocs/changes.xml Sat Jan 14 12:28:16
2006
@@ -8,6 +8,9 @@
<body>
<release version="1.1" date="">
<action dev="epugh" type="update">
+ Bump to Quartz 1.5.1.
+ </action>
+ <action dev="epugh" type="update">
Upgrade to Quartz 1.5, update for the new xstream xml format for
CronTrigger.
</action>
</release>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
