You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2011/09/12 22:48:06 UTC
svn commit: r1169916 - in /turbine/fulcrum/trunk/quartz: pom.xml
src/java/org/apache/fulcrum/quartz/impl/QuartzSchedulerImpl.java
src/site/xdoc/changes.xml
src/test/org/apache/fulcrum/quartz/DefaultQuartzSchedulerImplTest.java
src/test/quartz.xml
Author: tv
Date: Mon Sep 12 20:48:05 2011
New Revision: 1169916
URL: http://svn.apache.org/viewvc?rev=1169916&view=rev
Log:
Update dependency to quartz-2.0.0
Modified:
turbine/fulcrum/trunk/quartz/pom.xml
turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/QuartzSchedulerImpl.java
turbine/fulcrum/trunk/quartz/src/site/xdoc/changes.xml
turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/DefaultQuartzSchedulerImplTest.java
turbine/fulcrum/trunk/quartz/src/test/quartz.xml
Modified: turbine/fulcrum/trunk/quartz/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/pom.xml?rev=1169916&r1=1169915&r2=1169916&view=diff
==============================================================================
--- turbine/fulcrum/trunk/quartz/pom.xml (original)
+++ turbine/fulcrum/trunk/quartz/pom.xml Mon Sep 12 20:48:05 2011
@@ -90,7 +90,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>1.8.3</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
Modified: turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/QuartzSchedulerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/QuartzSchedulerImpl.java?rev=1169916&r1=1169915&r2=1169916&view=diff
==============================================================================
--- turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/QuartzSchedulerImpl.java (original)
+++ turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/QuartzSchedulerImpl.java Mon Sep 12 20:48:05 2011
@@ -19,6 +19,12 @@
package org.apache.fulcrum.quartz.impl;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Startable;
@@ -37,13 +43,13 @@ import org.quartz.Job;
import org.quartz.JobDetail;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
+import org.quartz.JobKey;
import org.quartz.JobListener;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.quartz.Trigger;
import org.quartz.impl.StdSchedulerFactory;
-
-import java.util.Properties;
+import org.quartz.impl.matchers.GroupMatcher;
/**
* Avalon service wrapping the QuartzScheduler.
@@ -118,14 +124,14 @@ public class QuartzSchedulerImpl
}
else
{
- getLogger().info("Using Quartz default configuration since no user-supplied configuration was found");
+ getLogger().info("Using Quartz default configuration since no user-supplied configuration was found");
schedulerFactory.initialize();
}
-
+
this.scheduler = schedulerFactory.getScheduler();
// add this service instance as JobListener to allow basic monitoring
- getScheduler().addGlobalJobListener(this);
+ getScheduler().getListenerManager().addJobListener(this, new ArrayList());
}
public void start() throws Exception
@@ -220,14 +226,14 @@ public class QuartzSchedulerImpl
{
if (ex != null)
{
- String msg = "Executing the job '" + context.getJobDetail().getFullName() + "' failed";
+ String msg = "Executing the job '" + context.getJobDetail().getKey() + "' failed";
getLogger().error(msg, ex.getCause());
}
else
{
if (getLogger().isDebugEnabled())
{
- getLogger().debug("Executing the job '" + context.getJobDetail().getFullName() + "' took " + context.getJobRunTime() + " ms");
+ getLogger().debug("Executing the job '" + context.getJobDetail().getKey() + "' took " + context.getJobRunTime() + " ms");
}
}
}
@@ -244,25 +250,26 @@ public class QuartzSchedulerImpl
private void logSchedulerConfiguration() throws SchedulerException
{
- String[] jobGroups = getScheduler().getJobGroupNames();
- for (int i = 0; i < jobGroups.length; i++)
+ List jobGroups = getScheduler().getJobGroupNames();
+ for (Iterator i = jobGroups.iterator(); i.hasNext();)
{
- String jobGroup = jobGroups[i];
- String[] jobsInGroup = getScheduler().getJobNames(jobGroup);
- getLogger().info("Job Group: " + jobGroup + " contains the following number of jobs : " + jobsInGroup.length);
- for (int j = 0; j < jobsInGroup.length; j++)
+ String jobGroup = (String)i.next();
+ Set jobsInGroup = getScheduler().getJobKeys(GroupMatcher.groupEquals(jobGroup));
+ getLogger().info("Job Group: " + jobGroup + " contains the following number of jobs : " + jobsInGroup.size());
+ for (Iterator j = jobsInGroup.iterator(); j.hasNext();)
{
StringBuffer buffer = new StringBuffer();
- String jobName = jobsInGroup[j];
- JobDetail jobDetail = getScheduler().getJobDetail(jobName, jobGroup);
- Trigger[] jobTriggers = getScheduler().getTriggersOfJob(jobName, jobGroup);
- buffer.append(jobDetail.getFullName());
+ JobKey jobKey = (JobKey)j.next();
+ JobDetail jobDetail = getScheduler().getJobDetail(jobKey);
+ List jobTriggers = getScheduler().getTriggersOfJob(jobKey);
+ buffer.append(jobDetail.getKey());
buffer.append(" => ");
- if(jobTriggers != null && jobTriggers.length > 0)
+ if(jobTriggers != null && !jobTriggers.isEmpty())
{
- buffer.append(jobTriggers[0].getFullName());
+ Trigger jt = (Trigger)jobTriggers.get(0);
+ buffer.append(jt.getKey());
buffer.append(" (");
- buffer.append(jobTriggers[0].getNextFireTime());
+ buffer.append(jt.getNextFireTime());
buffer.append(")");
}
else
@@ -272,6 +279,6 @@ public class QuartzSchedulerImpl
getLogger().info(buffer.toString());
}
- }
+ }
}
}
Modified: turbine/fulcrum/trunk/quartz/src/site/xdoc/changes.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/src/site/xdoc/changes.xml?rev=1169916&r1=1169915&r2=1169916&view=diff
==============================================================================
--- turbine/fulcrum/trunk/quartz/src/site/xdoc/changes.xml (original)
+++ turbine/fulcrum/trunk/quartz/src/site/xdoc/changes.xml Mon Sep 12 20:48:05 2011
@@ -24,7 +24,10 @@
</properties>
<body>
- <release version="1.1.0-SNAPSHOT" date="in svn">
+ <release version="1.1.0" date="in svn">
+ <action dev="tv" type="update" date="2011-09-12">
+ Update dependency to quartz-2.0.0
+ </action>
<action dev="sgoeschl" type="update" date="2010-08-09">
Injecting Avalon logger into a job instance if "LogEnabled"
is implemented by this job instance.
Modified: turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/DefaultQuartzSchedulerImplTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/DefaultQuartzSchedulerImplTest.java?rev=1169916&r1=1169915&r2=1169916&view=diff
==============================================================================
--- turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/DefaultQuartzSchedulerImplTest.java (original)
+++ turbine/fulcrum/trunk/quartz/src/test/org/apache/fulcrum/quartz/DefaultQuartzSchedulerImplTest.java Mon Sep 12 20:48:05 2011
@@ -19,15 +19,21 @@
package org.apache.fulcrum.quartz;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
import org.apache.fulcrum.quartz.test.NotSoSimpleJob;
import org.apache.fulcrum.quartz.test.SimpleJob;
+import org.quartz.DateBuilder;
import org.quartz.JobDetail;
+import org.quartz.JobKey;
import org.quartz.Scheduler;
-import org.quartz.SimpleTrigger;
+import org.quartz.SimpleScheduleBuilder;
import org.quartz.Trigger;
-import org.quartz.TriggerUtils;
-
-import java.util.Date;
+import org.quartz.TriggerBuilder;
+import org.quartz.TriggerKey;
+import org.quartz.impl.matchers.GroupMatcher;
/**
* @author <a href="mailto:leandro@ibnetwork.com.br">Leandro Rodrigo Saad Cruz</a>
@@ -54,8 +60,8 @@ public class DefaultQuartzSchedulerImplT
{
Scheduler scheduler = quartz.getScheduler();
assertNotNull(scheduler);
- String[] jobNames = scheduler.getJobNames("TURBINE");
- assertEquals("Expected two registered jobs", 2, jobNames.length);
+ Set jobNames = scheduler.getJobKeys(GroupMatcher.groupEquals("TURBINE"));
+ assertEquals("Expected two registered jobs", 2, jobNames.size());
}
/**
@@ -64,9 +70,9 @@ public class DefaultQuartzSchedulerImplT
*/
public void testJobDetailMap() throws Exception
{
- JobDetail jobDetail = quartz.getScheduler().getJobDetail("simpleJob", "TURBINE");
+ JobDetail jobDetail = quartz.getScheduler().getJobDetail(JobKey.jobKey("simpleJob", "TURBINE"));
assertNotNull(jobDetail);
- assertEquals("simpleJob", jobDetail.getName());
+ assertEquals("simpleJob", jobDetail.getKey().getName());
assertNotNull(jobDetail.getJobDataMap());
assertEquals(2, jobDetail.getJobDataMap().size());
}
@@ -76,9 +82,9 @@ public class DefaultQuartzSchedulerImplT
*/
public void testGetTriggersOfJob() throws Exception
{
- Trigger triggers[] = quartz.getScheduler().getTriggersOfJob("notSoSimpleJob", "TURBINE");
- assertEquals(1, triggers.length);
- assertEquals("cronTrigger", triggers[0].getName());
+ List triggers = quartz.getScheduler().getTriggersOfJob(JobKey.jobKey("notSoSimpleJob", "TURBINE"));
+ assertEquals(1, triggers.size());
+ assertEquals("cronTrigger", ((Trigger)triggers.get(0)).getKey().getName());
}
/**
@@ -88,13 +94,25 @@ public class DefaultQuartzSchedulerImplT
public void testAddRemoveTrigger() throws Exception
{
Scheduler scheduler = quartz.getScheduler();
- Date date = TriggerUtils.getDateOf(0, 0, 0, 1, 1, 2099);
- Trigger someDay = new SimpleTrigger("someTrigger", "TURBINE", "simpleJob", "TURBINE", date, null, 0, 0L);
+ TriggerKey triggerKey = TriggerKey.triggerKey("someTrigger", "TURBINE");
+
+ Date date = DateBuilder.dateOf(0, 0, 0, 1, 1, 2099);
+
+ Trigger someDay = TriggerBuilder.newTrigger()
+ .withIdentity(triggerKey)
+ .forJob("simpleJob", "TURBINE")
+ .withSchedule(SimpleScheduleBuilder.simpleSchedule()
+ .withIntervalInHours(1)
+ .repeatForever())
+ .startAt(date)
+ .build();
+
scheduler.scheduleJob(someDay);
- Trigger trigger = scheduler.getTrigger("someTrigger", "TURBINE");
+
+ Trigger trigger = scheduler.getTrigger(triggerKey);
assertNotNull(trigger);
- scheduler.unscheduleJob("someTrigger", "TURBINE");
- trigger = scheduler.getTrigger("someTrigger", "TURBINE");
+ scheduler.unscheduleJob(triggerKey);
+ trigger = scheduler.getTrigger(triggerKey);
assertNull(trigger);
}
Modified: turbine/fulcrum/trunk/quartz/src/test/quartz.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/src/test/quartz.xml?rev=1169916&r1=1169915&r2=1169916&view=diff
==============================================================================
--- turbine/fulcrum/trunk/quartz/src/test/quartz.xml (original)
+++ turbine/fulcrum/trunk/quartz/src/test/quartz.xml Mon Sep 12 20:48:05 2011
@@ -17,8 +17,8 @@
-->
<job-scheduling-data xmlns="http://www.quartz-scheduler.org/xml/JobSchedulingData"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.quartz-scheduler.org/xml/JobSchedulingData http://www.quartz-scheduler.org/xml/job_scheduling_data_1_8.xsd"
- version="1.8">
+ xsi:schemaLocation="http://www.quartz-scheduler.org/xml/JobSchedulingData http://www.quartz-scheduler.org/xml/job_scheduling_data_2_0.xsd"
+ version="2.0">
<pre-processing-commands>
<delete-jobs-in-group>*</delete-jobs-in-group>
<!-- clear all jobs in scheduler -->
@@ -71,7 +71,6 @@
<group>TURBINE</group>
<job-name>simpleJob</job-name>
<job-group>TURBINE</job-group>
- <volatility>true</volatility>
<start-time>2010-08-01T00:00:00</start-time>
<misfire-instruction>MISFIRE_INSTRUCTION_RESCHEDULE_NOW_WITH_EXISTING_REPEAT_COUNT</misfire-instruction>
<repeat-count>-1</repeat-count>