Author: olamy
Date: Sat Jul 28 20:56:25 2012
New Revision: 1366772
URL: http://svn.apache.org/viewvc?rev=1366772&view=rev
Log:
[REDBACK-296] interface Scheduler the method schedulJob takes an
implementation, not a interface
Submitted by Adrien Lecharpentier.
Modified:
archiva/redback/redback-components/trunk/spring-quartz/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java
archiva/redback/redback-components/trunk/spring-quartz/src/main/java/org/apache/archiva/redback/components/scheduler/Scheduler.java
Modified:
archiva/redback/redback-components/trunk/spring-quartz/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-quartz/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java?rev=1366772&r1=1366771&r2=1366772&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-quartz/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java
(original)
+++
archiva/redback/redback-components/trunk/spring-quartz/src/main/java/org/apache/archiva/redback/components/scheduler/DefaultScheduler.java
Sat Jul 28 20:56:25 2012
@@ -19,6 +19,7 @@ package org.apache.archiva.redback.compo
* under the License.
*/
+import org.quartz.JobDetail;
import org.quartz.JobKey;
import org.quartz.JobListener;
import org.quartz.Matcher;
@@ -47,18 +48,19 @@ public class DefaultScheduler
private StdScheduler scheduler;
- public void scheduleJob( JobDetailImpl jobDetail, Trigger trigger )
+ public void scheduleJob( JobDetail jobDetail, Trigger trigger )
throws SchedulerException
{
- if ( jobDetail == null || jobDetail.getName() == null )
+
+ if ( jobDetail == null || jobDetail.getKey() == null ||
jobDetail.getKey().getName() == null )
{
throw new SchedulerException( "No job or no job name - cannot
schedule this job" );
}
- if ( jobExists( jobDetail.getName(), jobDetail.getGroup() ) )
+ if ( jobExists( jobDetail.getKey() ) )
{
- log.warn( "Will not schedule this job as a job {" +
jobDetail.getName() + ":" + jobDetail.getGroup()
- + "} already exists." );
+ log.warn( "Will not schedule this job as a job {" +
jobDetail.getKey().getName() + ":"
+ + jobDetail.getKey().getGroup() + "} already
exists." );
return;
}
@@ -89,7 +91,8 @@ public class DefaultScheduler
scheduler.getListenerManager().addTriggerListener( listener, new
AllMatch() );
}
- private static class AllMatch<R extends Key<?>> implements Matcher<R>
+ private static class AllMatch<R extends Key<?>>
+ implements Matcher<R>
{
public boolean isMatch( R key )
{
@@ -153,7 +156,13 @@ public class DefaultScheduler
throws SchedulerException
{
- return ( scheduler.getJobDetail( new JobKey( jobName, jobGroup ) ) !=
null );
+ return jobExists( new JobKey( jobName, jobGroup ) );
+ }
+
+ private boolean jobExists( JobKey jobKey )
+ throws SchedulerException
+ {
+ return scheduler.getJobDetail( jobKey ) != null;
}
public void shutdown( boolean waitForJobsToComplete )
Modified:
archiva/redback/redback-components/trunk/spring-quartz/src/main/java/org/apache/archiva/redback/components/scheduler/Scheduler.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-quartz/src/main/java/org/apache/archiva/redback/components/scheduler/Scheduler.java?rev=1366772&r1=1366771&r2=1366772&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-quartz/src/main/java/org/apache/archiva/redback/components/scheduler/Scheduler.java
(original)
+++
archiva/redback/redback-components/trunk/spring-quartz/src/main/java/org/apache/archiva/redback/components/scheduler/Scheduler.java
Sat Jul 28 20:56:25 2012
@@ -19,6 +19,7 @@ package org.apache.archiva.redback.compo
* under the License.
*/
+import org.quartz.JobDetail;
import org.quartz.JobListener;
import org.quartz.SchedulerException;
import org.quartz.Trigger;
@@ -30,7 +31,7 @@ import java.util.Properties;
public interface Scheduler
{
- void scheduleJob( JobDetailImpl jobDetail, Trigger trigger )
+ void scheduleJob( JobDetail jobDetail, Trigger trigger )
throws SchedulerException;
/**
