Updated Quartz to 2.1.5 [IMMUTANT-136] [TORQUE-953]

jobs/src/main/java/org/projectodd/polyglot/jobs/BaseJob.java

@@ -23,10 +23,12 @@
 import java.util.List;
 
 import org.quartz.JobExecutionContext;
+import org.quartz.JobKey;
+
 
 public class BaseJob {
-    public BaseJob(String jobName) {
-        this.jobName = jobName;
+    public BaseJob(JobKey jobKey) {
+        this.jobKey = jobKey;
     }
 
     public void addListener(JobListener listener) {
@@ -57,10 +59,10 @@ public void notifyInterrupted() {
         }
     }
 
-    public String getJobName() {
-        return jobName;
+    public JobKey getJobKey() {
+        return jobKey;
     }
 
-    protected String jobName;
+    protected JobKey jobKey;
     private List<JobListener> listeners = new ArrayList<JobListener>();
 }

jobs/src/main/java/org/projectodd/polyglot/jobs/BaseScheduledJob.java

@@ -31,8 +31,11 @@
 import org.jboss.msc.value.InjectedValue;
 import org.projectodd.polyglot.core.util.TimeInterval;
 import org.quartz.CronTrigger;
+import org.quartz.impl.triggers.CronTriggerImpl;
+import static org.quartz.TriggerKey.*;
 import org.quartz.Job;
-import org.quartz.JobDetail;
+import org.quartz.JobKey;
+import org.quartz.impl.JobDetailImpl;
 import org.quartz.Scheduler;
 import org.quartz.SchedulerException;
 
@@ -79,15 +82,15 @@ public void stop(StopContext context) {
     }
 
     public synchronized void start() throws ParseException, SchedulerException {
-        this.jobDetail = new JobDetail();
+        this.jobDetail = new JobDetailImpl();
         this.jobDetail.setGroup( this.group );
         this.jobDetail.setName( this.name );
         this.jobDetail.setDescription( this.description );
         this.jobDetail.setJobClass( this.jobClass );
         this.jobDetail.setRequestsRecovery( true );
         this.jobDetail.getJobDataMap().put("timeout", timeout);
 
-        CronTrigger trigger = new CronTrigger( getTriggerName(), this.group, this.cronExpression );
+        CronTrigger trigger = new CronTriggerImpl( getTriggerName(), this.group, this.cronExpression );
 
         Scheduler scheduler = getScheduler();
 
@@ -97,7 +100,7 @@ public synchronized void start() throws ParseException, SchedulerException {
 
     public synchronized void stop() {
         try {
-            getScheduler().unscheduleJob( getTriggerName(), this.group );
+            getScheduler().unscheduleJob( triggerKey(getTriggerName(), this.group) );
         } catch (SchedulerException ex) {
             log.warn( "An error occurred stoping job " + this.name, ex );
         } 
@@ -141,6 +144,10 @@ public String getName() {
         return this.name;
     }
 
+    public JobKey getKey() {
+        return this.jobDetail.getKey();
+    }
+
     public String getDescription() {
         return this.description;
     }
@@ -179,7 +186,7 @@ public void setTimeout(long timeout) {
     private String cronExpression;
     private TimeInterval timeout;
 
-    private JobDetail jobDetail;
+    private JobDetailImpl jobDetail;
     private boolean singleton;
 
     private static final Logger log = Logger.getLogger( "org.projectodd.polyglot.jobs" );

jobs/src/main/java/org/projectodd/polyglot/jobs/TimeoutListener.java

@@ -48,7 +48,7 @@ public void run() {
                     try {
                         ((InterruptableJob) context.getJobInstance()).interrupt();
                     } catch (Exception e) {
-                        log.error("Failed to interrupt job " + job.getJobName(), e);
+                        log.error("Failed to interrupt job " + job.getJobKey(), e);
                     }
 
 

pom.xml

@@ -71,7 +71,7 @@
   <properties>
     <version.junit>4.7</version.junit>
     <version.mockito>1.8.4</version.mockito>
-    <version.org.quartz-scheduler>1.8.5</version.org.quartz-scheduler>
+    <version.org.quartz-scheduler>2.1.5</version.org.quartz-scheduler>
     <version.org.slf4j>1.5.10</version.org.slf4j>
   </properties>