TAB-4700 : Remove update-checker feature

jsteinich · May 24, 2016 · e1f7846 · e1f7846
1 parent fb14850
commit e1f7846
Show file tree

Hide file tree

Showing 17 changed files with 0 additions and 537 deletions.
diff --git a/distribution/src/main/assembly/root/examples/example10/quartz.properties b/distribution/src/main/assembly/root/examples/example10/quartz.properties
@@ -6,8 +6,6 @@
 org.quartz.scheduler.instanceName: TestScheduler
 org.quartz.scheduler.instanceId: AUTO
 
-org.quartz.scheduler.skipUpdateCheck: true
-
 #============================================================================
 # Configure ThreadPool  
 #============================================================================
@@ -24,25 +22,6 @@ org.quartz.jobStore.misfireThreshold: 60000
 
 org.quartz.jobStore.class: org.quartz.simpl.RAMJobStore
 
-#org.quartz.jobStore.class: org.quartz.impl.jdbcjobstore.JobStoreTX
-#org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
-#org.quartz.jobStore.useProperties: false
-#org.quartz.jobStore.dataSource: myDS
-#org.quartz.jobStore.tablePrefix: QRTZ_
-#org.quartz.jobStore.isClustered: false
-
-#============================================================================
-# Configure Datasources  
-#============================================================================
-
-#org.quartz.dataSource.myDS.driver: org.postgresql.Driver
-#org.quartz.dataSource.myDS.URL: jdbc:postgresql://localhost/dev
-#org.quartz.dataSource.myDS.user: jhouse
-#org.quartz.dataSource.myDS.password: 
-#org.quartz.dataSource.myDS.maxConnections: 5
-
-
-
 #============================================================================
 # Configure Plugins 
 #============================================================================

diff --git a/distribution/src/main/assembly/root/examples/example11/quartz.properties b/distribution/src/main/assembly/root/examples/example11/quartz.properties
@@ -6,8 +6,6 @@
 org.quartz.scheduler.instanceName: TestScheduler
 org.quartz.scheduler.instanceId: AUTO
 
-org.quartz.scheduler.skipUpdateCheck: true
-
 #============================================================================
 # Configure ThreadPool  
 #============================================================================
@@ -23,21 +21,3 @@ org.quartz.threadPool.threadPriority: 5
 org.quartz.jobStore.misfireThreshold: 60000
 
 org.quartz.jobStore.class: org.quartz.simpl.RAMJobStore
-
-#org.quartz.jobStore.class: org.quartz.impl.jdbcjobstore.JobStoreTX
-#org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
-#org.quartz.jobStore.useProperties: false
-#org.quartz.jobStore.dataSource: myDS
-#org.quartz.jobStore.tablePrefix: QRTZ_
-#org.quartz.jobStore.isClustered: false
-
-#============================================================================
-# Configure Datasources  
-#============================================================================
-
-#org.quartz.dataSource.myDS.driver: org.postgresql.Driver
-#org.quartz.dataSource.myDS.URL: jdbc:postgresql://localhost/dev
-#org.quartz.dataSource.myDS.user: jhouse
-#org.quartz.dataSource.myDS.password: 
-#org.quartz.dataSource.myDS.maxConnections: 5
-
diff --git a/distribution/src/main/assembly/root/examples/example12/client.properties b/distribution/src/main/assembly/root/examples/example12/client.properties
@@ -6,7 +6,6 @@
 
 org.quartz.scheduler.instanceName: Sched1
 org.quartz.scheduler.logger: schedLogger
-org.quartz.scheduler.skipUpdateCheck: true
 org.quartz.scheduler.rmi.proxy: true
 org.quartz.scheduler.rmi.registryHost: localhost
 org.quartz.scheduler.rmi.registryPort: 1099
diff --git a/distribution/src/main/assembly/root/examples/example12/server.properties b/distribution/src/main/assembly/root/examples/example12/server.properties
@@ -8,8 +8,6 @@ org.quartz.scheduler.rmi.registryHost: localhost
 org.quartz.scheduler.rmi.registryPort: 1099
 org.quartz.scheduler.rmi.createRegistry: true
 
-org.quartz.scheduler.skipUpdateCheck: true
-
 #============================================================================
 # Configure ThreadPool  
 #============================================================================

diff --git a/distribution/src/main/assembly/root/examples/example13/instance1.properties b/distribution/src/main/assembly/root/examples/example13/instance1.properties
@@ -6,8 +6,6 @@
 org.quartz.scheduler.instanceName: TestScheduler
 org.quartz.scheduler.instanceId: instance_one
 
-org.quartz.scheduler.skipUpdateCheck: true
-
 #============================================================================
 # Configure ThreadPool  
 #============================================================================
@@ -29,21 +27,6 @@ org.quartz.jobStore.dataSource=myDS
 org.quartz.jobStore.tablePrefix=QRTZ_
 org.quartz.jobStore.isClustered=true
 
-#============================================================================
-# Other Example Delegates
-#============================================================================
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.DB2v6Delegate
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.DB2v7Delegate
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.DriverDelegate
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.HSQLDBDelegate
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.MSSQLDelegate
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.PointbaseDelegate
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.WebLogicDelegate
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.oracle.OracleDelegate
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.oracle.WebLogicOracleDelegate
-
 #============================================================================
 # Configure Datasources  
 #============================================================================
@@ -54,13 +37,3 @@ org.quartz.dataSource.myDS.user: quartz
 org.quartz.dataSource.myDS.password: quartz
 org.quartz.dataSource.myDS.maxConnections: 5
 org.quartz.dataSource.myDS.validationQuery: select 0
-
-#============================================================================
-# Configure Plugins 
-#============================================================================
-
-#org.quartz.plugin.shutdownHook.class: org.quartz.plugins.management.ShutdownHookPlugin
-#org.quartz.plugin.shutdownHook.cleanShutdown: true
-
-
-#org.quartz.plugin.triggHistory.class: org.quartz.plugins.history.LoggingJobHistoryPlugin
diff --git a/distribution/src/main/assembly/root/examples/example13/instance2.properties b/distribution/src/main/assembly/root/examples/example13/instance2.properties
@@ -6,8 +6,6 @@
 org.quartz.scheduler.instanceName: TestScheduler
 org.quartz.scheduler.instanceId: instance_two
 
-org.quartz.scheduler.skipUpdateCheck: true
-
 #============================================================================
 # Configure ThreadPool  
 #============================================================================
@@ -29,21 +27,6 @@ org.quartz.jobStore.dataSource=myDS
 org.quartz.jobStore.tablePrefix=QRTZ_
 org.quartz.jobStore.isClustered=true
 
-#============================================================================
-# Other Example Delegates
-#============================================================================
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.DB2v6Delegate
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.DB2v7Delegate
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.DriverDelegate
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.HSQLDBDelegate
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.MSSQLDelegate
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.PointbaseDelegate
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.WebLogicDelegate
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.oracle.OracleDelegate
-#org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.oracle.WebLogicOracleDelegate
-
 #============================================================================
 # Configure Datasources  
 #============================================================================
@@ -55,12 +38,3 @@ org.quartz.dataSource.myDS.password: quartz
 org.quartz.dataSource.myDS.maxConnections: 5
 org.quartz.dataSource.myDS.validationQuery: select 0
 
-#============================================================================
-# Configure Plugins 
-#============================================================================
-
-#org.quartz.plugin.shutdownHook.class: org.quartz.plugins.management.ShutdownHookPlugin
-#org.quartz.plugin.shutdownHook.cleanShutdown: true
-
-
-#org.quartz.plugin.triggHistory.class: org.quartz.plugins.history.LoggingJobHistoryPlugin
diff --git a/distribution/src/main/assembly/root/examples/example15/instance1.properties b/distribution/src/main/assembly/root/examples/example15/instance1.properties
@@ -6,8 +6,6 @@
 org.quartz.scheduler.instanceName: TestScheduler
 org.quartz.scheduler.instanceId: instance_one
 
-org.quartz.scheduler.skipUpdateCheck: true
-
 #============================================================================
 # Configure ThreadPool  
 #============================================================================
@@ -24,13 +22,3 @@ org.quartz.jobStore.misfireThreshold: 60000
 
 org.quartz.jobStore.class: org.terracotta.quartz.TerracottaJobStore
 org.quartz.jobStore.tcConfigUrl: localhost:9510
-
-#============================================================================
-# Configure Plugins 
-#============================================================================
-
-#org.quartz.plugin.shutdownHook.class: org.quartz.plugins.management.ShutdownHookPlugin
-#org.quartz.plugin.shutdownHook.cleanShutdown: true
-
-
-#org.quartz.plugin.triggHistory.class: org.quartz.plugins.history.LoggingJobHistoryPlugin
diff --git a/distribution/src/main/assembly/root/examples/example15/instance2.properties b/distribution/src/main/assembly/root/examples/example15/instance2.properties
@@ -6,8 +6,6 @@
 org.quartz.scheduler.instanceName: TestScheduler
 org.quartz.scheduler.instanceId: instance_two
 
-org.quartz.scheduler.skipUpdateCheck: true
-
 #============================================================================
 # Configure ThreadPool  
 #============================================================================
@@ -24,13 +22,3 @@ org.quartz.jobStore.misfireThreshold: 60000
 
 org.quartz.jobStore.class: org.terracotta.quartz.TerracottaJobStore
 org.quartz.jobStore.tcConfigUrl: localhost:9510
-
-#============================================================================
-# Configure Plugins 
-#============================================================================
-
-#org.quartz.plugin.shutdownHook.class: org.quartz.plugins.management.ShutdownHookPlugin
-#org.quartz.plugin.shutdownHook.cleanShutdown: true
-
-
-#org.quartz.plugin.triggHistory.class: org.quartz.plugins.history.LoggingJobHistoryPlugin
diff --git a/quartz-core/src/main/java/org/quartz/core/QuartzScheduler.java b/quartz-core/src/main/java/org/quartz/core/QuartzScheduler.java
@@ -34,7 +34,6 @@
 import java.util.Properties;
 import java.util.Random;
 import java.util.Set;
-import java.util.Timer;
 import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -67,7 +66,6 @@
 import org.quartz.Trigger.TriggerState;
 import org.quartz.core.jmx.QuartzSchedulerMBean;
 import org.quartz.impl.SchedulerRepository;
-import org.quartz.impl.StdSchedulerFactory;
 import org.quartz.impl.matchers.GroupMatcher;
 import org.quartz.listeners.SchedulerListenerSupport;
 import org.quartz.simpl.PropertySettingJobFactory;
@@ -76,7 +74,6 @@
 import org.quartz.spi.SchedulerPlugin;
 import org.quartz.spi.SchedulerSignaler;
 import org.quartz.spi.ThreadExecutor;
-import org.quartz.utils.UpdateChecker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -185,9 +182,6 @@ public class QuartzScheduler implements RemotableQuartzScheduler {
     private QuartzSchedulerMBean jmxBean = null;
 
     private Date initialStart = null;
-
-    /** Update timer that must be cancelled upon shutdown. */
-    private final Timer updateTimer;
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 
@@ -232,11 +226,6 @@ public QuartzScheduler(QuartzSchedulerResources resources, long idleWaitTime, @D
 
         signaler = new SchedulerSignalerImpl(this, this.schedThread);
 
-        if(shouldRunUpdateCheck()) 
-            updateTimer = scheduleUpdateCheck();
-        else
-            updateTimer = null;
-
         getLog().info("Quartz Scheduler v." + getVersion() + " created.");
     }
 
@@ -328,14 +317,6 @@ public static String getVersionMajor() {
         return VERSION_MAJOR;
     }
 
-    private boolean shouldRunUpdateCheck() {
-        if(resources.isRunUpdateCheck() && !Boolean.getBoolean(StdSchedulerFactory.PROP_SCHED_SKIP_UPDATE_CHECK) &&
-                !Boolean.getBoolean("org.terracotta.quartz.skipUpdateCheck")) {
-            return true;
-        }
-        return false;
-    }
-
     public static String getVersionMinor() {
         return VERSION_MINOR;
     }
@@ -352,15 +333,6 @@ public Logger getLog() {
         return log;
     }
 
-    /**
-     * Update checker scheduler - fires every week
-     */
-    private Timer scheduleUpdateCheck() {
-        Timer rval = new Timer(true);
-        rval.scheduleAtFixedRate(new UpdateChecker(), 1000, 7 * 24 * 60 * 60 * 1000L);
-        return rval;
-    }
-
     /**
      * Register the scheduler in the local MBeanServer.
      */
@@ -764,9 +736,6 @@ public void shutdown(boolean waitForJobsToComplete) {
         SchedulerRepository.getInstance().remove(resources.getName());
 
         holdToPreventGC.clear();
-
-        if(updateTimer != null)
-            updateTimer.cancel();
 
         getLog().info(
                 "Scheduler " + resources.getUniqueIdentifier()

diff --git a/quartz-core/src/main/java/org/quartz/core/QuartzSchedulerResources.java b/quartz-core/src/main/java/org/quartz/core/QuartzSchedulerResources.java
@@ -89,8 +89,6 @@ public class QuartzSchedulerResources {
 
     private ThreadExecutor threadExecutor;
 
-    private boolean runUpdateCheck = false;
-
     private long batchTimeWindow = 0;
 
     private int maxBatchSize = 1;
@@ -542,14 +540,6 @@ public static String generateJMXObjectName(String schedName, String schedInstId)
             + ",instance=" + schedInstId;
     }
 
-    public boolean isRunUpdateCheck() {
-        return runUpdateCheck;
-    }
-
-    public void setRunUpdateCheck(boolean runUpdateCheck) {
-        this.runUpdateCheck = runUpdateCheck;
-    }
-
     public long getBatchTimeWindow() {
         return batchTimeWindow;
     }

diff --git a/quartz-core/src/main/java/org/quartz/impl/StdSchedulerFactory.java b/quartz-core/src/main/java/org/quartz/impl/StdSchedulerFactory.java
@@ -121,8 +121,6 @@ public class StdSchedulerFactory implements SchedulerFactory {
 
     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_BATCH_TIME_WINDOW = "org.quartz.scheduler.batchTriggerAcquisitionFireAheadTimeWindow";
 
     public static final String PROP_SCHED_MAX_BATCH_SIZE = "org.quartz.scheduler.batchTriggerAcquisitionMaxCount";
@@ -659,7 +657,6 @@ else if (schedInstId.equals(SYSTEM_PROPERTY_AS_INSTANCE_ID)) {
         boolean threadsInheritInitalizersClassLoader =
             cfg.getBooleanProperty(PROP_SCHED_SCHEDULER_THREADS_INHERIT_CONTEXT_CLASS_LOADER_OF_INITIALIZING_THREAD);
 
-        boolean skipUpdateCheck = cfg.getBooleanProperty(PROP_SCHED_SKIP_UPDATE_CHECK, true);
         long batchTimeWindow = cfg.getLongProperty(PROP_SCHED_BATCH_TIME_WINDOW, 0L);
         int maxBatchSize = cfg.getIntProperty(PROP_SCHED_MAX_BATCH_SIZE, 1);
 
@@ -1240,7 +1237,6 @@ else if (schedInstId.equals(SYSTEM_PROPERTY_AS_INSTANCE_ID)) {
             rsrcs.setJobRunShellFactory(jrsf);
             rsrcs.setMakeSchedulerThreadDaemon(makeSchedulerThreadDaemon);
             rsrcs.setThreadsInheritInitializersClassLoadContext(threadsInheritInitalizersClassLoader);
-            rsrcs.setRunUpdateCheck(!skipUpdateCheck);
             rsrcs.setBatchTimeWindow(batchTimeWindow);
             rsrcs.setMaxBatchSize(maxBatchSize);
             rsrcs.setInterruptJobsOnShutdown(interruptJobsOnShutdown);