|
From: Marko L. <la...@us...> - 2007-12-01 20:37:12
|
Update of /cvsroot/springnet/Spring.Net.Integration/projects/Spring.Scheduling.Quartz/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv24740/Scheduling/Quartz Modified Files: CronTriggerObject.cs JobDetailObject.cs MethodInvokingJobDetailFactoryObject.cs SchedulerFactoryObject.cs SimpleTriggerObject.cs Log Message: Upgraded to Quartz 0.9 Index: CronTriggerObject.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net.Integration/projects/Spring.Scheduling.Quartz/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/CronTriggerObject.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CronTriggerObject.cs 12 Sep 2007 18:40:46 -0000 1.3 --- CronTriggerObject.cs 1 Dec 2007 20:37:08 -0000 1.4 *************** *** 55,59 **** private JobDetail jobDetail; private string objectName; ! private readonly Constants constants = new Constants(typeof(MisfirePolicy.CronTrigger), typeof(MisfirePolicy)); --- 55,59 ---- private JobDetail jobDetail; private string objectName; ! private readonly Constants constants = new Constants(typeof(MisfireInstruction.CronTrigger), typeof(MisfireInstruction)); *************** *** 74,82 **** /// Set the misfire instruction via the name of the corresponding /// constant in the CronTrigger class. ! /// Default is <code>MISFIRE_INSTRUCTION_SMART_POLICY</code>. /// </summary> ! /// <seealso cref="MisfirePolicy.CronTrigger.FireOnceNow" /> ! /// <seealso cref="MisfirePolicy.CronTrigger.DoNothing" /> ! /// <seealso cref="MisfirePolicy.SmartPolicy" /> public virtual string MisfireInstructionName { --- 74,82 ---- /// Set the misfire instruction via the name of the corresponding /// constant in the CronTrigger class. ! /// Default is <see cref="MisfireInstruction.SmartPolicy" />. /// </summary> ! /// <seealso cref="MisfireInstruction.CronTrigger.FireOnceNow" /> ! /// <seealso cref="MisfireInstruction.CronTrigger.DoNothing" /> ! /// <seealso cref="MisfireInstruction.SmartPolicy" /> public virtual string MisfireInstructionName { *************** *** 155,159 **** if (Group == null) { ! Group = SchedulerConstants.DEFAULT_GROUP; } if (StartTimeUtc == DateTime.MinValue) --- 155,159 ---- if (Group == null) { ! Group = SchedulerConstants.DefaultGroup; } if (StartTimeUtc == DateTime.MinValue) Index: SchedulerFactoryObject.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net.Integration/projects/Spring.Scheduling.Quartz/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SchedulerFactoryObject.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SchedulerFactoryObject.cs 12 Sep 2007 18:40:46 -0000 1.3 --- SchedulerFactoryObject.cs 1 Dec 2007 20:37:08 -0000 1.4 *************** *** 680,689 **** if (taskExecutor != null) { ! mergedProps[StdSchedulerFactory.PROP_THREAD_POOL_CLASS] = typeof (LocalTaskExecutorThreadPool).FullName; } else { ! mergedProps.Set(StdSchedulerFactory.PROP_THREAD_POOL_CLASS, typeof (SimpleThreadPool).Name); mergedProps[PROP_THREAD_COUNT] = Convert.ToString(DEFAULT_THREAD_COUNT); } --- 680,689 ---- if (taskExecutor != null) { ! mergedProps[StdSchedulerFactory.PropertyThreadPoolType] = typeof (LocalTaskExecutorThreadPool).FullName; } else { ! mergedProps.Set(StdSchedulerFactory.PropertyThreadPoolType, typeof(SimpleThreadPool).Name); mergedProps[PROP_THREAD_COUNT] = Convert.ToString(DEFAULT_THREAD_COUNT); } *************** *** 716,720 **** if (schedulerName != null) { ! mergedProps.Add(StdSchedulerFactory.PROP_SCHED_INSTANCE_NAME, schedulerName); } --- 716,720 ---- if (schedulerName != null) { ! mergedProps.Add(StdSchedulerFactory.PropertySchedulerInstanceName, schedulerName); } Index: JobDetailObject.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net.Integration/projects/Spring.Scheduling.Quartz/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/JobDetailObject.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JobDetailObject.cs 12 Sep 2007 18:40:46 -0000 1.2 --- JobDetailObject.cs 1 Dec 2007 20:37:08 -0000 1.3 *************** *** 34,38 **** /// <seealso cref="JobDetail.Name" /> /// <seealso cref="JobDetail.Group" /> ! /// <seealso cref="SchedulerConstants.DEFAULT_GROUP" /> public class JobDetailObject : JobDetail, IObjectNameAware, IApplicationContextAware, IInitializingObject { --- 34,38 ---- /// <seealso cref="JobDetail.Name" /> /// <seealso cref="JobDetail.Group" /> ! /// <seealso cref="SchedulerConstants.DefaultGroup" /> public class JobDetailObject : JobDetail, IObjectNameAware, IApplicationContextAware, IInitializingObject { *************** *** 201,205 **** if (Group == null) { ! Group = SchedulerConstants.DEFAULT_GROUP; } if (applicationContextJobDataKey != null) --- 201,205 ---- if (Group == null) { ! Group = SchedulerConstants.DefaultGroup; } if (applicationContextJobDataKey != null) Index: MethodInvokingJobDetailFactoryObject.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net.Integration/projects/Spring.Scheduling.Quartz/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/MethodInvokingJobDetailFactoryObject.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MethodInvokingJobDetailFactoryObject.cs 12 Sep 2007 18:40:46 -0000 1.3 --- MethodInvokingJobDetailFactoryObject.cs 1 Dec 2007 20:37:08 -0000 1.4 *************** *** 66,70 **** public MethodInvokingJobDetailFactoryObject() { ! group = SchedulerConstants.DEFAULT_GROUP; } --- 66,70 ---- public MethodInvokingJobDetailFactoryObject() { ! group = SchedulerConstants.DefaultGroup; } *************** *** 85,89 **** /// </summary> /// <seealso cref="JobDetail.Group" /> ! /// <seealso cref="SchedulerConstants.DEFAULT_GROUP" /> public virtual string Group { --- 85,89 ---- /// </summary> /// <seealso cref="JobDetail.Group" /> ! /// <seealso cref="SchedulerConstants.DefaultGroup" /> public virtual string Group { Index: SimpleTriggerObject.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net.Integration/projects/Spring.Scheduling.Quartz/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SimpleTriggerObject.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SimpleTriggerObject.cs 12 Sep 2007 18:40:46 -0000 1.3 --- SimpleTriggerObject.cs 1 Dec 2007 20:37:08 -0000 1.4 *************** *** 55,59 **** private JobDetail jobDetail; private string objectName; ! private readonly Constants constants = new Constants(typeof(MisfirePolicy.SimpleTrigger), typeof(MisfirePolicy)); /// <summary> --- 55,59 ---- private JobDetail jobDetail; private string objectName; ! private readonly Constants constants = new Constants(typeof(MisfireInstruction.SimpleTrigger), typeof(MisfireInstruction)); /// <summary> *************** *** 62,66 **** public SimpleTriggerObject() { ! RepeatCount = REPEAT_INDEFINITELY; } --- 62,66 ---- public SimpleTriggerObject() { ! RepeatCount = RepeatIndefinitely; } *************** *** 81,92 **** /// Set the misfire instruction via the name of the corresponding /// constant in the SimpleTrigger class. ! /// Default is <see cref="MisfirePolicy.SmartPolicy" />. /// </summary> ! /// <seealso cref="MisfirePolicy.SimpleTrigger.FireNow" /> ! /// <seealso cref="MisfirePolicy.SimpleTrigger.RescheduleNextWithExistingCount" /> ! /// <seealso cref="MisfirePolicy.SimpleTrigger.RescheduleNextWithRemainingCount" /> ! /// <seealso cref="MisfirePolicy.SimpleTrigger.RescheduleNowWithExistingRepeatCount" /> ! /// <seealso cref="MisfirePolicy.SimpleTrigger.RescheduleNowWithRemainingRepeatCount" /> ! /// <seealso cref="MisfirePolicy.SmartPolicy" /> public virtual string MisfireInstructionName { --- 81,92 ---- /// Set the misfire instruction via the name of the corresponding /// constant in the SimpleTrigger class. ! /// Default is <see cref="MisfireInstruction.SmartPolicy" />. /// </summary> ! /// <seealso cref="MisfireInstruction.SimpleTrigger.FireNow" /> ! /// <seealso cref="MisfireInstruction.SimpleTrigger.RescheduleNextWithExistingCount" /> ! /// <seealso cref="MisfireInstruction.SimpleTrigger.RescheduleNextWithRemainingCount" /> ! /// <seealso cref="MisfireInstruction.SimpleTrigger.RescheduleNowWithExistingRepeatCount" /> ! /// <seealso cref="MisfireInstruction.SimpleTrigger.RescheduleNowWithRemainingRepeatCount" /> ! /// <seealso cref="MisfireInstruction.SmartPolicy" /> public virtual string MisfireInstructionName { *************** *** 180,184 **** if (Group == null) { ! Group = SchedulerConstants.DEFAULT_GROUP; } if (StartTimeUtc == DateTime.MinValue) --- 180,184 ---- if (Group == null) { ! Group = SchedulerConstants.DefaultGroup; } if (StartTimeUtc == DateTime.MinValue) |
