Index: trunk/quartz-core/src/test/java/org/quartz/integrations/tests/QuartzMemoryTestSupport.java
===================================================================
diff -u -N -r2398 -r2454
--- trunk/quartz-core/src/test/java/org/quartz/integrations/tests/QuartzMemoryTestSupport.java (.../QuartzMemoryTestSupport.java) (revision 2398)
+++ trunk/quartz-core/src/test/java/org/quartz/integrations/tests/QuartzMemoryTestSupport.java (.../QuartzMemoryTestSupport.java) (revision 2454)
@@ -54,7 +54,7 @@
Properties properties = new Properties();
properties.put("org.quartz.scheduler.instanceName","TestScheduler");
properties.put("org.quartz.scheduler.instanceId","AUTO");
- properties.put("org.quartz.scheduler.skipUpdateCheck","true");
+ properties.put("org.quartz.scheduler.enableUpdateCheck","false");
properties.put("org.quartz.threadPool.class","org.quartz.simpl.SimpleThreadPool");
properties.put("org.quartz.threadPool.threadCount","12");
properties.put("org.quartz.threadPool.threadPriority","5");
Index: trunk/quartz-core/src/test/java/org/quartz/utils/PoolingConnectionProviderTest.java
===================================================================
diff -u -N -r2400 -r2454
--- trunk/quartz-core/src/test/java/org/quartz/utils/PoolingConnectionProviderTest.java (.../PoolingConnectionProviderTest.java) (revision 2400)
+++ trunk/quartz-core/src/test/java/org/quartz/utils/PoolingConnectionProviderTest.java (.../PoolingConnectionProviderTest.java) (revision 2454)
@@ -74,7 +74,7 @@
Properties properties = new Properties();
properties.put("org.quartz.scheduler.instanceName","TestScheduler");
properties.put("org.quartz.scheduler.instanceId","AUTO");
- properties.put("org.quartz.scheduler.skipUpdateCheck","true");
+ properties.put("org.quartz.scheduler.enableUpdateCheck","false");
properties.put("org.quartz.threadPool.class","org.quartz.simpl.SimpleThreadPool");
properties.put("org.quartz.threadPool.threadCount","12");
properties.put("org.quartz.threadPool.threadPriority","5");
Index: trunk/terracotta/bootstrap/src/main/java/org/terracotta/quartz/PlainTerracottaJobStore.java
===================================================================
diff -u -N -r2387 -r2454
--- trunk/terracotta/bootstrap/src/main/java/org/terracotta/quartz/PlainTerracottaJobStore.java (.../PlainTerracottaJobStore.java) (revision 2387)
+++ trunk/terracotta/bootstrap/src/main/java/org/terracotta/quartz/PlainTerracottaJobStore.java (.../PlainTerracottaJobStore.java) (revision 2454)
@@ -393,7 +393,7 @@
}
private void scheduleUpdateCheck() {
- if (!Boolean.getBoolean("org.terracotta.quartz.skipUpdateCheck")) {
+ if (!Boolean.getBoolean("org.terracotta.quartz.enableUpdateCheck")) {
updateCheckTimer = new Timer("Update Checker", true);
updateCheckTimer.scheduleAtFixedRate(new UpdateChecker(), 100, WEEKLY);
}
Index: trunk/quartz-core/pom.xml
===================================================================
diff -u -N -r2425 -r2454
--- trunk/quartz-core/pom.xml (.../pom.xml) (revision 2425)
+++ trunk/quartz-core/pom.xml (.../pom.xml) (revision 2454)
@@ -135,8 +135,8 @@
- org.quartz.scheduler.skipUpdateCheck
- true
+ org.quartz.scheduler.enableUpdateCheck
+ false
Index: trunk/terracotta/bootstrap/src/main/java/org/terracotta/quartz/UpdateChecker.java
===================================================================
diff -u -N -r2164 -r2454
--- trunk/terracotta/bootstrap/src/main/java/org/terracotta/quartz/UpdateChecker.java (.../UpdateChecker.java) (revision 2164)
+++ trunk/terracotta/bootstrap/src/main/java/org/terracotta/quartz/UpdateChecker.java (.../UpdateChecker.java) (revision 2454)
@@ -60,7 +60,7 @@
*/
public void checkForUpdate() {
try {
- if (!Boolean.getBoolean("org.terracotta.quartz.skipUpdateCheck")) {
+ if (!Boolean.getBoolean("org.terracotta.quartz.enableUpdateCheck")) {
doCheck();
}
} catch (Throwable t) {
Index: trunk/quartz-core/src/test/java/org/quartz/integrations/tests/QTZ336_MissSchedulingChangeSignalTest.java
===================================================================
diff -u -N -r2236 -r2454
--- trunk/quartz-core/src/test/java/org/quartz/integrations/tests/QTZ336_MissSchedulingChangeSignalTest.java (.../QTZ336_MissSchedulingChangeSignalTest.java) (revision 2236)
+++ trunk/quartz-core/src/test/java/org/quartz/integrations/tests/QTZ336_MissSchedulingChangeSignalTest.java (.../QTZ336_MissSchedulingChangeSignalTest.java) (revision 2454)
@@ -61,7 +61,7 @@
} finally {
propertiesIs.close();
}
- properties.setProperty("org.quartz.scheduler.skipUpdateCheck", "true");
+ properties.setProperty("org.quartz.scheduler.enableUpdateCheck", "false");
// Use a custom RAMJobStore to produce context switches leading to the race condition
properties.setProperty("org.quartz.jobStore.class", SlowRAMJobStore.class.getName());
SchedulerFactory sf = new StdSchedulerFactory(properties);
Index: trunk/distribution/examples/pom.xml
===================================================================
diff -u -N -r2388 -r2454
--- trunk/distribution/examples/pom.xml (.../branches/2.2.1-rc/distribution/examples/pom.xml) (revision 2388)
+++ trunk/distribution/examples/pom.xml (.../trunk/distribution/examples/pom.xml) (revision 2454)
@@ -6,7 +6,7 @@
org.quartz-scheduler
quartz-parent
- 2.2.1
+ 2.2.2-SNAPSHOT
../../pom.xml
@@ -128,7 +128,7 @@
-Dlog4j.configuration=file:${project.build.outputDirectory}/log4j.xml
-Dorg.quartz.properties=${example12}/server.properties
- -Dorg.quartz.scheduler.skipUpdateCheck=true
+ -Dorg.quartz.scheduler.enableUpdateCheck=false
-cp
${serverClass}
@@ -143,7 +143,7 @@
-Dlog4j.configuration=file:${project.build.outputDirectory}/log4j.xml
-Dorg.quartz.properties=${example12}/client.properties
- -Dorg.quartz.scheduler.skipUpdateCheck=true
+ -Dorg.quartz.scheduler.enableUpdateCheck=false
-cp
${clientClass}
@@ -173,7 +173,7 @@
${java.home}/bin/java
-Dlog4j.configuration=file:${project.build.outputDirectory}/log4j.xml
- -Dorg.quartz.scheduler.skipUpdateCheck=true
+ -Dorg.quartz.scheduler.enableUpdateCheck=false
-cp
${mainClass}
Index: trunk/quartz-core/src/main/java/org/quartz/impl/StdSchedulerFactory.java
===================================================================
diff -u -N -r2399 -r2454
--- trunk/quartz-core/src/main/java/org/quartz/impl/StdSchedulerFactory.java (.../StdSchedulerFactory.java) (revision 2399)
+++ trunk/quartz-core/src/main/java/org/quartz/impl/StdSchedulerFactory.java (.../StdSchedulerFactory.java) (revision 2454)
@@ -121,7 +121,7 @@
public static final String PROP_SCHED_THREAD_NAME = "org.quartz.scheduler.threadName";
- public static final String PROP_SCHED_SKIP_UPDATE_CHECK = "org.quartz.scheduler.skipUpdateCheck";
+ public static final String PROP_SCHED_ENABLE_UPDATE_CHECK = "org.quartz.scheduler.enableUpdateCheck";
public static final String PROP_SCHED_BATCH_TIME_WINDOW = "org.quartz.scheduler.batchTriggerAcquisitionFireAheadTimeWindow";
@@ -659,7 +659,7 @@
boolean threadsInheritInitalizersClassLoader =
cfg.getBooleanProperty(PROP_SCHED_SCHEDULER_THREADS_INHERIT_CONTEXT_CLASS_LOADER_OF_INITIALIZING_THREAD);
- boolean skipUpdateCheck = cfg.getBooleanProperty(PROP_SCHED_SKIP_UPDATE_CHECK, false);
+ boolean enableUpdateCheck = cfg.getBooleanProperty(PROP_SCHED_ENABLE_UPDATE_CHECK, false);
long batchTimeWindow = cfg.getLongProperty(PROP_SCHED_BATCH_TIME_WINDOW, 0L);
int maxBatchSize = cfg.getIntProperty(PROP_SCHED_MAX_BATCH_SIZE, 1);
@@ -1240,7 +1240,7 @@
rsrcs.setJobRunShellFactory(jrsf);
rsrcs.setMakeSchedulerThreadDaemon(makeSchedulerThreadDaemon);
rsrcs.setThreadsInheritInitializersClassLoadContext(threadsInheritInitalizersClassLoader);
- rsrcs.setRunUpdateCheck(!skipUpdateCheck);
+ rsrcs.setRunUpdateCheck(enableUpdateCheck);
rsrcs.setBatchTimeWindow(batchTimeWindow);
rsrcs.setMaxBatchSize(maxBatchSize);
rsrcs.setInterruptJobsOnShutdown(interruptJobsOnShutdown);
Index: trunk/quartz-core/src/test/java/org/quartz/integrations/tests/QTZ283_IgnoreMisfirePolicyJdbcStore_Test.java
===================================================================
diff -u -N -r2123 -r2454
--- trunk/quartz-core/src/test/java/org/quartz/integrations/tests/QTZ283_IgnoreMisfirePolicyJdbcStore_Test.java (.../QTZ283_IgnoreMisfirePolicyJdbcStore_Test.java) (revision 2123)
+++ trunk/quartz-core/src/test/java/org/quartz/integrations/tests/QTZ283_IgnoreMisfirePolicyJdbcStore_Test.java (.../QTZ283_IgnoreMisfirePolicyJdbcStore_Test.java) (revision 2454)
@@ -66,7 +66,7 @@
properties.put("org.quartz.scheduler.instanceName","TestScheduler");
properties.put("org.quartz.scheduler.instanceId","AUTO");
- properties.put("org.quartz.scheduler.skipUpdateCheck","true");
+ properties.put("org.quartz.scheduler.enableUpdateCheck","false");
properties.put("org.quartz.threadPool.class","org.quartz.simpl.SimpleThreadPool");
properties.put("org.quartz.threadPool.threadCount","12");
properties.put("org.quartz.threadPool.threadPriority","5");
Index: trunk/quartz-core/src/test/java/org/quartz/integrations/tests/QTZ179_TriggerLostAfterDbRestart_Test.java
===================================================================
diff -u -N -r2123 -r2454
--- trunk/quartz-core/src/test/java/org/quartz/integrations/tests/QTZ179_TriggerLostAfterDbRestart_Test.java (.../QTZ179_TriggerLostAfterDbRestart_Test.java) (revision 2123)
+++ trunk/quartz-core/src/test/java/org/quartz/integrations/tests/QTZ179_TriggerLostAfterDbRestart_Test.java (.../QTZ179_TriggerLostAfterDbRestart_Test.java) (revision 2454)
@@ -69,7 +69,7 @@
properties.put("org.quartz.scheduler.instanceName","TestScheduler");
properties.put("org.quartz.scheduler.instanceId","AUTO");
- properties.put("org.quartz.scheduler.skipUpdateCheck","true");
+ properties.put("org.quartz.scheduler.enableUpdateCheck","false");
properties.put("org.quartz.threadPool.class","org.quartz.simpl.SimpleThreadPool");
properties.put("org.quartz.threadPool.threadCount","12");
properties.put("org.quartz.threadPool.threadPriority","5");
Index: trunk/quartz-jobs/pom.xml
===================================================================
diff -u -N -r2388 -r2454
--- trunk/quartz-jobs/pom.xml (.../branches/2.2.1-rc/quartz-jobs/pom.xml) (revision 2388)
+++ trunk/quartz-jobs/pom.xml (.../trunk/quartz-jobs/pom.xml) (revision 2454)
@@ -4,7 +4,7 @@
org.quartz-scheduler
quartz-parent
- 2.2.1
+ 2.2.2-SNAPSHOT
org.quartz-scheduler
@@ -103,7 +103,7 @@
maven-surefire-plugin
2.14.1
- -Dorg.terracotta.quartz.skipUpdateCheck=true
+ -Dorg.terracotta.quartz.enableUpdateCheck=false
false
Index: trunk/quartz-core/src/test/java/org/quartz/integrations/tests/QuartzDatabaseTestSupport.java
===================================================================
diff -u -N -r2398 -r2454
--- trunk/quartz-core/src/test/java/org/quartz/integrations/tests/QuartzDatabaseTestSupport.java (.../QuartzDatabaseTestSupport.java) (revision 2398)
+++ trunk/quartz-core/src/test/java/org/quartz/integrations/tests/QuartzDatabaseTestSupport.java (.../QuartzDatabaseTestSupport.java) (revision 2454)
@@ -85,7 +85,7 @@
Properties properties = new Properties();
properties.put("org.quartz.scheduler.instanceName","TestScheduler");
properties.put("org.quartz.scheduler.instanceId","AUTO");
- properties.put("org.quartz.scheduler.skipUpdateCheck","true");
+ properties.put("org.quartz.scheduler.enableUpdateCheck","false");
properties.put("org.quartz.threadPool.class","org.quartz.simpl.SimpleThreadPool");
properties.put("org.quartz.threadPool.threadCount","12");
properties.put("org.quartz.threadPool.threadPriority","5");
Index: trunk/quartz-core/src/main/java/org/quartz/core/QuartzSchedulerResources.java
===================================================================
diff -u -N -r2256 -r2454
--- trunk/quartz-core/src/main/java/org/quartz/core/QuartzSchedulerResources.java (.../QuartzSchedulerResources.java) (revision 2256)
+++ trunk/quartz-core/src/main/java/org/quartz/core/QuartzSchedulerResources.java (.../QuartzSchedulerResources.java) (revision 2454)
@@ -89,7 +89,7 @@
private ThreadExecutor threadExecutor;
- private boolean runUpdateCheck = true;
+ private boolean runUpdateCheck = false;
private long batchTimeWindow = 0;
Index: trunk/quartz-core/src/main/java/org/quartz/core/QuartzScheduler.java
===================================================================
diff -u -N -r2441 -r2454
--- trunk/quartz-core/src/main/java/org/quartz/core/QuartzScheduler.java (.../QuartzScheduler.java) (revision 2441)
+++ trunk/quartz-core/src/main/java/org/quartz/core/QuartzScheduler.java (.../QuartzScheduler.java) (revision 2454)
@@ -330,7 +330,7 @@
private boolean shouldRunUpdateCheck() {
if(resources.isRunUpdateCheck() && !Boolean.getBoolean(StdSchedulerFactory.PROP_SCHED_SKIP_UPDATE_CHECK) &&
- !Boolean.getBoolean("org.terracotta.quartz.skipUpdateCheck")) {
+ Boolean.getBoolean("org.terracotta.quartz.enableUpdateCheck")) {
return true;
}
return false;