svn commit: r612837 - in /incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl: QuartzJobExecutor.java QuartzScheduler.java

[cz...@apache.org]

Author: cziegeler
Date: Thu Jan 17 06:54:17 2008
New Revision: 612837

URL: http://svn.apache.org/viewvc?rev=612837&view=rev
Log:
Add more debug logging and add missing BundleContext to job data map.

Modified:
    incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzJobExecutor.java
    incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzScheduler.java

Modified: incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzJobExecutor.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzJobExecutor.java?rev=612837&r1=612836&r2=612837&view=diff
==============================================================================
--- incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzJobExecutor.java (original)
+++ incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzJobExecutor.java Thu Jan 17 06:54:17 2008
@@ -26,6 +26,7 @@
 import org.quartz.JobDataMap;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
+import org.slf4j.Logger;
 
 /**
  * This component is resposible to launch a {@link org.apache.sling.scheduler.Job}
@@ -53,10 +54,11 @@
 
         this.setup(data);
 
-
         final Object job = data.get(QuartzScheduler.DATA_MAP_OBJECT);
+        final Logger logger = (Logger)data.get(QuartzScheduler.DATA_MAP_LOGGER);
 
         try {
+            logger.debug("Executing job {} with name {}", job, data.get(QuartzScheduler.DATA_MAP_NAME));
             if (job instanceof org.apache.sling.scheduler.Job) {
                 final BundleContext bundleContext = (BundleContext)data.get(QuartzScheduler.DATA_MAP_BUNDLE_CONTEXT);
                 final ServiceLocatorImpl serviceLocator = new ServiceLocatorImpl(bundleContext);

Modified: incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzScheduler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzScheduler.java?rev=612837&r1=612836&r2=612837&view=diff
==============================================================================
--- incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzScheduler.java (original)
+++ incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzScheduler.java Thu Jan 17 06:54:17 2008
@@ -74,6 +74,9 @@
     /** Map key for the bundle context. */
     static final String DATA_MAP_BUNDLE_CONTEXT = "QuartzJobScheduler.BundleContext";
 
+    /** Map key for the logger. */
+    static final String DATA_MAP_LOGGER = "QuartzJobScheduler.Logger";
+
     protected org.quartz.Scheduler scheduler;
 
     protected final List<Object[]> registeredJobs = new ArrayList<Object[]>();
@@ -175,6 +178,7 @@
 
         final JobDetail detail = this.createJobDetail(name, jobDataMap);
 
+        this.logger.debug("Scheduling job {} with name {} and trigger {}", new Object[] {job, name, trigger});
         this.scheduler.scheduleJob(detail, trigger);
     }
 
@@ -196,6 +200,8 @@
 
         jobDataMap.put(DATA_MAP_NAME, jobName);
         jobDataMap.put(DATA_MAP_RUN_CONCURRENT, (concurent? Boolean.TRUE: Boolean.FALSE));
+        jobDataMap.put(DATA_MAP_BUNDLE_CONTEXT, this.context.getBundleContext());
+        jobDataMap.put(DATA_MAP_LOGGER, this.logger);
         if ( config != null ) {
             jobDataMap.put(DATA_MAP_CONFIGURATION, config);
         }