Author: cziegeler
Date: Tue May 27 07:34:31 2008
New Revision: 660531
URL: http://svn.apache.org/viewvc?rev=660531&view=rev
Log:
Use constants for configuration properties.
Modified:
incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Scheduler.java
incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/QuartzScheduler.java
Modified:
incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Scheduler.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Scheduler.java?rev=660531&r1=660530&r2=660531&view=diff
==============================================================================
---
incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Scheduler.java
(original)
+++
incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Scheduler.java
Tue May 27 07:34:31 2008
@@ -29,6 +29,19 @@
*/
public interface Scheduler {
+ /** Name of the configuration property to define the period for a job. */
+ String PROPERTY_SCHEDULER_PERIOD = "scheduler.period";
+
+ /** Name of the configuration property to define the cron expression for a
job. */
+ String PROPERTY_SCHEDULER_EXPRESSION = "scheduler.expression";
+
+ /** Name of the configuration property to define if the job can be run
concurrently. */
+ String PROPERTY_SCHEDULER_CONCURRENT = "scheduler.concurrent";
+
+ /** Name of the configuration property to define the job name. */
+ String PROPERTY_SCHEDULER_NAME = "scheduler.name";
+
+
/**
* Schedule a time based job.
* Note that if a job with the same name has already beed added, the old
job is cancelled and this new job replaces
Modified:
incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/QuartzScheduler.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/QuartzScheduler.java?rev=660531&r1=660530&r2=660531&view=diff
==============================================================================
---
incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/QuartzScheduler.java
(original)
+++
incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/QuartzScheduler.java
Tue May 27 07:34:31 2008
@@ -323,17 +323,17 @@
final Object job = this.context.locateService(type, ref);
if ( ref != null ) {
this.checkJob(job);
- String name = (String)ref.getProperty("scheduler.name");
+ String name =
(String)ref.getProperty(Scheduler.PROPERTY_SCHEDULER_NAME);
if ( name == null ) {
name = (String)ref.getProperty(Constants.SERVICE_PID);
}
if ( name != null ) {
- final Boolean concurrent =
(Boolean)ref.getProperty("scheduler.concurrent");
- final String expression =
(String)ref.getProperty("scheduler.expression");
+ final Boolean concurrent =
(Boolean)ref.getProperty(Scheduler.PROPERTY_SCHEDULER_CONCURRENT);
+ final String expression =
(String)ref.getProperty(Scheduler.PROPERTY_SCHEDULER_EXPRESSION);
if ( expression != null ) {
this.addJob(name, job, null, expression, (concurrent !=
null ? concurrent : true));
} else {
- final Long period =
(Long)ref.getProperty("scheduler.period");
+ final Long period =
(Long)ref.getProperty(Scheduler.PROPERTY_SCHEDULER_PERIOD);
if ( period != null ) {
this.addPeriodicJob(name, job, null, period,
(concurrent != null ? concurrent : true));
}
@@ -345,7 +345,7 @@
}
protected void unregister(ServiceReference ref) {
- String name = (String)ref.getProperty("scheduler.name");
+ String name =
(String)ref.getProperty(Scheduler.PROPERTY_SCHEDULER_NAME);
if ( name == null ) {
name = (String)ref.getProperty(Constants.SERVICE_PID);
}
