Checkout Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merge 2371 from trunk
fixed JDK 1.5 compilation error as OpenType hasn't been genericized before 1.6
merge 1799

disabled
fork always
Backport QTZ-197 fixes and its related file changes.
    • -1
    • +8
    ./src/test/java/org/quartz/JobDataMapTest.java
    • -39
    • +41
    ./src/main/java/org/quartz/TriggerBuilder.java
    • -32
    • +29
    ./src/main/java/org/quartz/JobBuilder.java
    • binary
    ./src/test/resources/org/quartz/JobDataMap-2.1.ser
    • -127
    • +136
    ./src/main/java/org/quartz/utils/DirtyFlagMap.java
    • -3
    • +4
    ./src/main/java/org/quartz/JobDataMap.java
Fixed QTZ-194 - Using ThreadExecutor to execute MisfireHandler and ClusterManager threads.
Clean up more on java format and warnings for Quartz601Test
    • -6
    • +4
    ./src/test/java/org/quartz/Quartz601Test.java
Re-added old DriverDelegate#selectTriggerToAcquire method for compatibility reason. It is marked as deprecated.
Added batch maxCount and windowTime feature in JobStoreTX.

Added the same DisallowedConcurrentExecution check in JobStoreTx during acquireNextTrigger.

Updated DriverDelegate interface for selectAcquireTrigger with maxCount instead of old hardcoded impl.

Improved test class. Removed STDOUT output noise, and renamed a fixture class to avoid word Test that cause potentially maven test runner.
    • -7
    • +7
    ./src/test/java/org/quartz/Quartz601Test.java
Realized there is duplicated RAMJobStoreTest, so I removed the recent one, and added the new tests in existing one.
    • -1
    • +123
    ./src/test/java/org/quartz/simpl/RAMJobStoreTest.java
Removed println in DailyTimeIntervalTriggerImplTest
Added RAMJobStoreTest to test acquireNextTriggers.
    • -0
    • +154
    ./src/test/java/org/quartz/impl/RAMJobStoreTest.java
merger 1478

  1. … 2 more files in changeset.
merge 1553

  1. … 2 more files in changeset.
merge 1558

  1. … 2 more files in changeset.
merge 1575,1576,1577

    • -0
    • +30
    ./src/test/resources/org/quartz/xml/simple-job-trigger.xml
    • -0
    • +157
    ./src/test/java/org/quartz/xml/XMLSchedulingDataProcessorTest.java
    • -0
    • +1
    ./src/test/resources/org/quartz/xml/quartz-test.properties
  1. … 2 more files in changeset.
merge 1611

  1. … 3 more files in changeset.
merge 1552

  1. … 3 more files in changeset.
merge 1479

  1. … 3 more files in changeset.
integrate 1612

  1. … 2 more files in changeset.
Fixed QTZ-202 on RAMJobStore. Added new DisallowConcurrentExecutionJobTest for the fix as well.
integrate 1608 : QTZ-161

  1. … 2 more files in changeset.
Fixed QTZ-205. Ensure to check for trigger final fireTimes after it's vetoed.
    • -0
    • +168
    ./src/test/java/org/quartz/Qtz205SchedulerListenerTest.java
Added DailyTimeIntervalTriggerPersistenceDelegate for QTZ-196
Added DailyTimeIntervalTrigger impl for QTZ-196
    • -0
    • +119
    ./src/main/java/org/quartz/DailyTimeIntervalTrigger.java
    • -0
    • +182
    ./src/main/java/org/quartz/TimeOfDay.java
    • -0
    • +111
    ./src/test/java/org/quartz/DailyTimeIntervalScheduleBuilderTest.java
integrate 1598, QTZ-200 : Scheduler#shutdown(false) waits for all currently executing jobs to complete

    • -0
    • +3
    ./src/test/java/org/quartz/SchedulerTest.java
  1. … 2 more files in changeset.
integrate 1596 : QTZ-192 : Threads are still running after calling Scheduler#shutdown( true )

    • -6
    • +18
    ./src/test/java/org/quartz/SchedulerTest.java
  1. … 2 more files in changeset.
integrate 1542 , QTZ-174

  1. … 2 more files in changeset.