You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2008/05/14 10:05:17 UTC
svn commit: r656140 - in /incubator/sling/trunk:
commons/scheduler/src/main/java/org/apache/sling/commons/
commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/
commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/
comm...
Author: cziegeler
Date: Wed May 14 01:05:16 2008
New Revision: 656140
URL: http://svn.apache.org/viewvc?rev=656140&view=rev
Log:
SLING-446: Refactor classes to use the commons package.
Added:
incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/
incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/
incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Job.java
- copied, changed from r656136, incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/scheduler/Job.java
incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/JobContext.java
- copied, changed from r656136, incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/scheduler/JobContext.java
incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Scheduler.java
- copied, changed from r656136, incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/scheduler/Scheduler.java
incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/
- copied from r656136, incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/scheduler/impl/
Removed:
incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/scheduler/
Modified:
incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/QuartzJobExecutor.java
incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/QuartzScheduler.java
incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/TimedJobHandler.java
Copied: incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Job.java (from r656136, incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/scheduler/Job.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Job.java?p2=incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Job.java&p1=incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/scheduler/Job.java&r1=656136&r2=656140&rev=656140&view=diff
==============================================================================
--- incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/scheduler/Job.java (original)
+++ incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Job.java Wed May 14 01:05:16 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.scheduler;
+package org.apache.sling.commons.scheduler;
/**
* A job is executed by the {@link Scheduler} service.
Copied: incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/JobContext.java (from r656136, incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/scheduler/JobContext.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/JobContext.java?p2=incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/JobContext.java&p1=incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/scheduler/JobContext.java&r1=656136&r2=656140&rev=656140&view=diff
==============================================================================
--- incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/scheduler/JobContext.java (original)
+++ incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/JobContext.java Wed May 14 01:05:16 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.scheduler;
+package org.apache.sling.commons.scheduler;
import java.io.Serializable;
import java.util.Map;
Copied: incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Scheduler.java (from r656136, incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/scheduler/Scheduler.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Scheduler.java?p2=incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Scheduler.java&p1=incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/scheduler/Scheduler.java&r1=656136&r2=656140&rev=656140&view=diff
==============================================================================
--- incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/scheduler/Scheduler.java (original)
+++ incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/Scheduler.java Wed May 14 01:05:16 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.scheduler;
+package org.apache.sling.commons.scheduler;
import java.io.Serializable;
import java.util.Date;
Modified: incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/QuartzJobExecutor.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/QuartzJobExecutor.java?rev=656140&r1=656136&r2=656140&view=diff
==============================================================================
--- incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/QuartzJobExecutor.java (original)
+++ incubator/sling/trunk/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/QuartzJobExecutor.java Wed May 14 01:05:16 2008
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.scheduler.impl;
+package org.apache.sling.commons.scheduler.impl;
import java.io.Serializable;
import java.util.Map;
-import org.apache.sling.scheduler.JobContext;
+import org.apache.sling.commons.scheduler.JobContext;
import org.quartz.Job;
import org.quartz.JobDataMap;
import org.quartz.JobExecutionContext;
@@ -27,7 +27,7 @@
import org.slf4j.Logger;
/**
- * This component is resposible to launch a {@link org.apache.sling.scheduler.Job}
+ * This component is resposible to launch a {@link org.apache.sling.commons.scheduler.Job}
* or {@link Runnable} in a Quartz Scheduler.
*
*/
@@ -57,13 +57,13 @@
try {
logger.debug("Executing job {} with name {}", job, data.get(QuartzScheduler.DATA_MAP_NAME));
- if (job instanceof org.apache.sling.scheduler.Job) {
+ if (job instanceof org.apache.sling.commons.scheduler.Job) {
@SuppressWarnings("unchecked")
final Map<String, Serializable> configuration = (Map<String, Serializable>) data.get(QuartzScheduler.DATA_MAP_CONFIGURATION);
final String name = (String) data.get(QuartzScheduler.DATA_MAP_NAME);
final JobContext jobCtx = new JobContextImpl(name, configuration);
- ((org.apache.sling.scheduler.Job) job).execute(jobCtx);
+ ((org.apache.sling.commons.scheduler.Job) job).execute(jobCtx);
} else if (job instanceof Runnable) {
((Runnable) job).run();
} else {
@@ -101,14 +101,14 @@
}
/**
- * @see org.apache.sling.scheduler.JobContext#getConfiguration()
+ * @see org.apache.sling.commons.scheduler.JobContext#getConfiguration()
*/
public Map<String, Serializable> getConfiguration() {
return this.configuration;
}
/**
- * @see org.apache.sling.scheduler.JobContext#getName()
+ * @see org.apache.sling.commons.scheduler.JobContext#getName()
*/
public String getName() {
return this.name;
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=656140&r1=656136&r2=656140&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 Wed May 14 01:05:16 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sling.scheduler.impl;
+package org.apache.sling.commons.scheduler.impl;
import java.io.Serializable;
import java.text.ParseException;
@@ -25,10 +25,10 @@
import java.util.NoSuchElementException;
import java.util.UUID;
+import org.apache.sling.commons.scheduler.Job;
+import org.apache.sling.commons.scheduler.Scheduler;
import org.apache.sling.commons.threads.ThreadPool;
import org.apache.sling.commons.threads.ThreadPoolManager;
-import org.apache.sling.scheduler.Job;
-import org.apache.sling.scheduler.Scheduler;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.service.component.ComponentContext;
@@ -247,7 +247,7 @@
}
/**
- * @see org.apache.sling.scheduler.Scheduler#addJob(java.lang.String, java.lang.Object, java.util.Map, java.lang.String, boolean)
+ * @see org.apache.sling.commons.scheduler.Scheduler#addJob(java.lang.String, java.lang.Object, java.util.Map, java.lang.String, boolean)
*/
public void addJob(String name,
Object job,
@@ -266,7 +266,7 @@
}
/**
- * @see org.apache.sling.scheduler.Scheduler#addPeriodicJob(java.lang.String, java.lang.Object, java.util.Map, long, boolean)
+ * @see org.apache.sling.commons.scheduler.Scheduler#addPeriodicJob(java.lang.String, java.lang.Object, java.util.Map, long, boolean)
*/
public void addPeriodicJob(String name, Object job, Map<String, Serializable> config, long period, boolean canRunConcurrently)
throws Exception {
@@ -282,7 +282,7 @@
}
/**
- * @see org.apache.sling.scheduler.Scheduler#fireJob(java.lang.Object, java.util.Map)
+ * @see org.apache.sling.commons.scheduler.Scheduler#fireJob(java.lang.Object, java.util.Map)
*/
public void fireJob(Object job, Map<String, Serializable> config)
throws Exception {
@@ -297,7 +297,7 @@
}
/**
- * @see org.apache.sling.scheduler.Scheduler#fireJobAt(java.lang.String, java.lang.Object, java.util.Map, java.util.Date)
+ * @see org.apache.sling.commons.scheduler.Scheduler#fireJobAt(java.lang.String, java.lang.Object, java.util.Map, java.util.Date)
*/
public void fireJobAt(String name, Object job, Map<String, Serializable> config, Date date) throws Exception {
if ( name == null ) {
@@ -308,7 +308,7 @@
}
/**
- * @see org.apache.sling.scheduler.Scheduler#removeJob(java.lang.String)
+ * @see org.apache.sling.commons.scheduler.Scheduler#removeJob(java.lang.String)
*/
public void removeJob(String name) throws NoSuchElementException {
try {
Modified: incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/TimedJobHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/TimedJobHandler.java?rev=656140&r1=656139&r2=656140&view=diff
==============================================================================
--- incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/TimedJobHandler.java (original)
+++ incubator/sling/trunk/extensions/event/src/main/java/org/apache/sling/event/impl/TimedJobHandler.java Wed May 14 01:05:16 2008
@@ -40,10 +40,10 @@
import javax.jcr.query.QueryManager;
import org.apache.jackrabbit.util.Text;
+import org.apache.sling.commons.scheduler.Job;
+import org.apache.sling.commons.scheduler.JobContext;
+import org.apache.sling.commons.scheduler.Scheduler;
import org.apache.sling.event.EventUtil;
-import org.apache.sling.scheduler.Job;
-import org.apache.sling.scheduler.JobContext;
-import org.apache.sling.scheduler.Scheduler;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
@@ -434,7 +434,7 @@
}
/**
- * @see org.apache.sling.scheduler.Job#execute(org.apache.sling.scheduler.JobContext)
+ * @see org.apache.sling.commons.scheduler.Job#execute(org.apache.sling.commons.scheduler.JobContext)
*/
public void execute(JobContext context) {
final String topic = (String) context.getConfiguration().get(JOB_TOPIC);