svn commit: r1202092 - in /sling/trunk/bundles/commons/scheduler: pom.xml src/main/java/org/apache/sling/commons/scheduler/impl/QuartzScheduler.java src/main/java/org/apache/sling/commons/scheduler/impl/WebConsolePrinter.java

[cziegeler]

Author: cziegeler
Date: Tue Nov 15 08:46:49 2011
New Revision: 1202092

URL: http://svn.apache.org/viewvc?rev=1202092&view=rev
Log:
SLING-2285 : Update to latest Quartz 2.1.1 

Modified:
    sling/trunk/bundles/commons/scheduler/pom.xml
    
sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/QuartzScheduler.java
    
sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/WebConsolePrinter.java

Modified: sling/trunk/bundles/commons/scheduler/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/pom.xml?rev=1202092&r1=1202091&r2=1202092&view=diff
==============================================================================
--- sling/trunk/bundles/commons/scheduler/pom.xml (original)
+++ sling/trunk/bundles/commons/scheduler/pom.xml Tue Nov 15 08:46:49 2011
@@ -117,7 +117,7 @@
         <dependency>
             <groupId>org.quartz-scheduler</groupId>
             <artifactId>quartz</artifactId>
-            <version>2.0.1</version>
+            <version>2.1.1</version>
         </dependency>
     </dependencies>
 </project>

Modified: 
sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/QuartzScheduler.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/QuartzScheduler.java?rev=1202092&r1=1202091&r2=1202092&view=diff
==============================================================================
--- 
sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/QuartzScheduler.java
 (original)
+++ 
sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/QuartzScheduler.java
 Tue Nov 15 08:46:49 2011
@@ -17,7 +17,6 @@
 package org.apache.sling.commons.scheduler.impl;
 
 import java.io.Serializable;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
@@ -333,14 +332,10 @@ public class QuartzScheduler implements 
                        final boolean canRunConcurrently)
     throws SchedulerException {
         final Trigger cronTrigger;
-        try {
-            cronTrigger = TriggerBuilder.newTrigger()
-                .withIdentity(name)
-                
.withSchedule(CronScheduleBuilder.cronSchedule(schedulingExpression))
-                .build();
-        } catch (final ParseException pe) {
-            throw new IllegalArgumentException("Error during parsing of cron 
'" + schedulingExpression + "' : " + pe.getMessage(), pe);
-        }
+        cronTrigger = TriggerBuilder.newTrigger()
+            .withIdentity(name)
+            
.withSchedule(CronScheduleBuilder.cronSchedule(schedulingExpression))
+            .build();
         this.scheduleJob(name, job, config, cronTrigger, canRunConcurrently);
     }
 

Modified: 
sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/WebConsolePrinter.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/WebConsolePrinter.java?rev=1202092&r1=1202091&r2=1202092&view=diff
==============================================================================
--- 
sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/WebConsolePrinter.java
 (original)
+++ 
sling/trunk/bundles/commons/scheduler/src/main/java/org/apache/sling/commons/scheduler/impl/WebConsolePrinter.java
 Tue Nov 15 08:46:49 2011
@@ -91,8 +91,7 @@ public class WebConsolePrinter {
                     pw.print  ("Group ");
                     pw.println(group);
                     
pw.println("---------------------------------------------------------------------------");
-                    @SuppressWarnings("unchecked")
-                    final Set<JobKey> keys = 
s.getJobKeys(GroupMatcher.groupEquals(group));
+                    final Set<JobKey> keys = 
s.getJobKeys(GroupMatcher.jobGroupEquals(group));
                     for(final JobKey key : keys) {
                         final JobDetail detail = s.getJobDetail(key);
                         pw.print("Job : ");