From c2900fb8aab1de70b806f90d88de07d3cc83d6d6 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 5 Jan 2018 16:21:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2/org/quartz/core/QuartzScheduler.java | 4 +- .../v2/org/quartz/core/mbeans-descriptors.xml | 64 ++++++------ .../jboss/JBoss4RMIRemoteMBeanScheduler.java | 4 +- .../ee/servlet/QuartzInitializerListener.java | 2 +- .../ee/servlet/QuartzInitializerServlet.java | 2 +- .../org/quartz/impl/StdSchedulerFactory.java | 98 +++++++++---------- .../SystemPropertyInstanceIdGenerator.java | 2 +- .../org/quartz/utils/DBConnectionManager.java | 2 +- 8 files changed, 89 insertions(+), 89 deletions(-) diff --git a/fine-quartz/src/com/fr/third/v2/org/quartz/core/QuartzScheduler.java b/fine-quartz/src/com/fr/third/v2/org/quartz/core/QuartzScheduler.java index 0a58afb00..ab9e91f09 100644 --- a/fine-quartz/src/com/fr/third/v2/org/quartz/core/QuartzScheduler.java +++ b/fine-quartz/src/com/fr/third/v2/org/quartz/core/QuartzScheduler.java @@ -275,7 +275,7 @@ public class QuartzScheduler implements RemotableQuartzScheduler { // (!MGMT_SVR_BY_BIND.containsKey(managementRESTServiceConfiguration.getBind())) // { // Class managementServerImplClass = - // Class.forName("org.quartz.management.ManagementServerImpl"); + // Class.forName("com.fr.third.v2.org.quartz.management.ManagementServerImpl"); // Class managementRESTServiceConfigurationClass[] = new Class[] { // managementRESTServiceConfiguration.getClass() }; // Constructor managementRESTServiceConfigurationConstructor = @@ -331,7 +331,7 @@ public class QuartzScheduler implements RemotableQuartzScheduler { private boolean shouldRunUpdateCheck() { if(resources.isRunUpdateCheck() && !Boolean.getBoolean(StdSchedulerFactory.PROP_SCHED_SKIP_UPDATE_CHECK) && - !Boolean.getBoolean("org.terracotta.quartz.skipUpdateCheck")) { + !Boolean.getBoolean("com.fr.third.v2.org.terracotta.quartz.skipUpdateCheck")) { return true; } return false; diff --git a/fine-quartz/src/com/fr/third/v2/org/quartz/core/mbeans-descriptors.xml b/fine-quartz/src/com/fr/third/v2/org/quartz/core/mbeans-descriptors.xml index addfc6e31..1a27c3557 100644 --- a/fine-quartz/src/com/fr/third/v2/org/quartz/core/mbeans-descriptors.xml +++ b/fine-quartz/src/com/fr/third/v2/org/quartz/core/mbeans-descriptors.xml @@ -30,45 +30,45 @@ - + - + - + - + - + - + - + - + @@ -76,109 +76,109 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/fine-quartz/src/com/fr/third/v2/org/quartz/ee/jmx/jboss/JBoss4RMIRemoteMBeanScheduler.java b/fine-quartz/src/com/fr/third/v2/org/quartz/ee/jmx/jboss/JBoss4RMIRemoteMBeanScheduler.java index 3e36ab150..1fcd5aeb5 100644 --- a/fine-quartz/src/com/fr/third/v2/org/quartz/ee/jmx/jboss/JBoss4RMIRemoteMBeanScheduler.java +++ b/fine-quartz/src/com/fr/third/v2/org/quartz/ee/jmx/jboss/JBoss4RMIRemoteMBeanScheduler.java @@ -96,8 +96,8 @@ public class JBoss4RMIRemoteMBeanScheduler extends RemoteMBeanScheduler { */ protected Properties getContextProperties() { Properties props = new Properties(); - props.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory"); - props.put(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces"); + props.put(Context.INITIAL_CONTEXT_FACTORY, "com.fr.third.v2.org.jnp.interfaces.NamingContextFactory"); + props.put(Context.URL_PKG_PREFIXES, "com.fr.third.v2.org.jboss.naming:org.jnp.interfaces"); props.put(Context.PROVIDER_URL, providerURL); return props; diff --git a/fine-quartz/src/com/fr/third/v2/org/quartz/ee/servlet/QuartzInitializerListener.java b/fine-quartz/src/com/fr/third/v2/org/quartz/ee/servlet/QuartzInitializerListener.java index 907b64915..f36294f5f 100644 --- a/fine-quartz/src/com/fr/third/v2/org/quartz/ee/servlet/QuartzInitializerListener.java +++ b/fine-quartz/src/com/fr/third/v2/org/quartz/ee/servlet/QuartzInitializerListener.java @@ -125,7 +125,7 @@ import org.slf4j.LoggerFactory; */ public class QuartzInitializerListener implements ServletContextListener { - public static final String QUARTZ_FACTORY_KEY = "org.quartz.impl.StdSchedulerFactory.KEY"; + public static final String QUARTZ_FACTORY_KEY = "com.fr.third.v2.org.quartz.impl.StdSchedulerFactory.KEY"; private boolean performShutdown = true; private boolean waitOnShutdown = false; diff --git a/fine-quartz/src/com/fr/third/v2/org/quartz/ee/servlet/QuartzInitializerServlet.java b/fine-quartz/src/com/fr/third/v2/org/quartz/ee/servlet/QuartzInitializerServlet.java index cb3f69967..f07fc80bd 100644 --- a/fine-quartz/src/com/fr/third/v2/org/quartz/ee/servlet/QuartzInitializerServlet.java +++ b/fine-quartz/src/com/fr/third/v2/org/quartz/ee/servlet/QuartzInitializerServlet.java @@ -144,7 +144,7 @@ public class QuartzInitializerServlet extends HttpServlet { */ private static final long serialVersionUID = 1L; - public static final String QUARTZ_FACTORY_KEY = "org.quartz.impl.StdSchedulerFactory.KEY"; + public static final String QUARTZ_FACTORY_KEY = "com.fr.third.v2.org.quartz.impl.StdSchedulerFactory.KEY"; private boolean performShutdown = true; private boolean waitOnShutdown = false; diff --git a/fine-quartz/src/com/fr/third/v2/org/quartz/impl/StdSchedulerFactory.java b/fine-quartz/src/com/fr/third/v2/org/quartz/impl/StdSchedulerFactory.java index e8937f382..9e3b1f626 100644 --- a/fine-quartz/src/com/fr/third/v2/org/quartz/impl/StdSchedulerFactory.java +++ b/fine-quartz/src/com/fr/third/v2/org/quartz/impl/StdSchedulerFactory.java @@ -122,76 +122,76 @@ public class StdSchedulerFactory implements SchedulerFactory { * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - public static final String PROPERTIES_FILE = "org.quartz.properties"; + public static final String PROPERTIES_FILE = "com.fr.third.v2.org.quartz.properties"; - public static final String PROP_SCHED_INSTANCE_NAME = "org.quartz.scheduler.instanceName"; + public static final String PROP_SCHED_INSTANCE_NAME = "com.fr.third.v2.org.quartz.scheduler.instanceName"; - public static final String PROP_SCHED_INSTANCE_ID = "org.quartz.scheduler.instanceId"; + public static final String PROP_SCHED_INSTANCE_ID = "com.fr.third.v2.org.quartz.scheduler.instanceId"; - public static final String PROP_SCHED_INSTANCE_ID_GENERATOR_PREFIX = "org.quartz.scheduler.instanceIdGenerator"; + public static final String PROP_SCHED_INSTANCE_ID_GENERATOR_PREFIX = "com.fr.third.v2.org.quartz.scheduler.instanceIdGenerator"; public static final String PROP_SCHED_INSTANCE_ID_GENERATOR_CLASS = PROP_SCHED_INSTANCE_ID_GENERATOR_PREFIX + ".class"; - public static final String PROP_SCHED_THREAD_NAME = "org.quartz.scheduler.threadName"; + public static final String PROP_SCHED_THREAD_NAME = "com.fr.third.v2.org.quartz.scheduler.threadName"; - public static final String PROP_SCHED_SKIP_UPDATE_CHECK = "org.quartz.scheduler.skipUpdateCheck"; + public static final String PROP_SCHED_SKIP_UPDATE_CHECK = "com.fr.third.v2.org.quartz.scheduler.skipUpdateCheck"; - public static final String PROP_SCHED_BATCH_TIME_WINDOW = "org.quartz.scheduler.batchTriggerAcquisitionFireAheadTimeWindow"; + public static final String PROP_SCHED_BATCH_TIME_WINDOW = "com.fr.third.v2.org.quartz.scheduler.batchTriggerAcquisitionFireAheadTimeWindow"; - public static final String PROP_SCHED_MAX_BATCH_SIZE = "org.quartz.scheduler.batchTriggerAcquisitionMaxCount"; + public static final String PROP_SCHED_MAX_BATCH_SIZE = "com.fr.third.v2.org.quartz.scheduler.batchTriggerAcquisitionMaxCount"; - public static final String PROP_SCHED_JMX_EXPORT = "org.quartz.scheduler.jmx.export"; + public static final String PROP_SCHED_JMX_EXPORT = "com.fr.third.v2.org.quartz.scheduler.jmx.export"; - public static final String PROP_SCHED_JMX_OBJECT_NAME = "org.quartz.scheduler.jmx.objectName"; + public static final String PROP_SCHED_JMX_OBJECT_NAME = "com.fr.third.v2.org.quartz.scheduler.jmx.objectName"; - public static final String PROP_SCHED_JMX_PROXY = "org.quartz.scheduler.jmx.proxy"; + public static final String PROP_SCHED_JMX_PROXY = "com.fr.third.v2.org.quartz.scheduler.jmx.proxy"; - public static final String PROP_SCHED_JMX_PROXY_CLASS = "org.quartz.scheduler.jmx.proxy.class"; + public static final String PROP_SCHED_JMX_PROXY_CLASS = "com.fr.third.v2.org.quartz.scheduler.jmx.proxy.class"; - public static final String PROP_SCHED_RMI_EXPORT = "org.quartz.scheduler.rmi.export"; + public static final String PROP_SCHED_RMI_EXPORT = "com.fr.third.v2.org.quartz.scheduler.rmi.export"; - public static final String PROP_SCHED_RMI_PROXY = "org.quartz.scheduler.rmi.proxy"; + public static final String PROP_SCHED_RMI_PROXY = "com.fr.third.v2.org.quartz.scheduler.rmi.proxy"; - public static final String PROP_SCHED_RMI_HOST = "org.quartz.scheduler.rmi.registryHost"; + public static final String PROP_SCHED_RMI_HOST = "com.fr.third.v2.org.quartz.scheduler.rmi.registryHost"; - public static final String PROP_SCHED_RMI_PORT = "org.quartz.scheduler.rmi.registryPort"; + public static final String PROP_SCHED_RMI_PORT = "com.fr.third.v2.org.quartz.scheduler.rmi.registryPort"; - public static final String PROP_SCHED_RMI_SERVER_PORT = "org.quartz.scheduler.rmi.serverPort"; + public static final String PROP_SCHED_RMI_SERVER_PORT = "com.fr.third.v2.org.quartz.scheduler.rmi.serverPort"; - public static final String PROP_SCHED_RMI_CREATE_REGISTRY = "org.quartz.scheduler.rmi.createRegistry"; + public static final String PROP_SCHED_RMI_CREATE_REGISTRY = "com.fr.third.v2.org.quartz.scheduler.rmi.createRegistry"; - public static final String PROP_SCHED_RMI_BIND_NAME = "org.quartz.scheduler.rmi.bindName"; + public static final String PROP_SCHED_RMI_BIND_NAME = "com.fr.third.v2.org.quartz.scheduler.rmi.bindName"; - public static final String PROP_SCHED_WRAP_JOB_IN_USER_TX = "org.quartz.scheduler.wrapJobExecutionInUserTransaction"; + public static final String PROP_SCHED_WRAP_JOB_IN_USER_TX = "com.fr.third.v2.org.quartz.scheduler.wrapJobExecutionInUserTransaction"; - public static final String PROP_SCHED_USER_TX_URL = "org.quartz.scheduler.userTransactionURL"; + public static final String PROP_SCHED_USER_TX_URL = "com.fr.third.v2.org.quartz.scheduler.userTransactionURL"; - public static final String PROP_SCHED_IDLE_WAIT_TIME = "org.quartz.scheduler.idleWaitTime"; + public static final String PROP_SCHED_IDLE_WAIT_TIME = "com.fr.third.v2.org.quartz.scheduler.idleWaitTime"; - public static final String PROP_SCHED_DB_FAILURE_RETRY_INTERVAL = "org.quartz.scheduler.dbFailureRetryInterval"; + public static final String PROP_SCHED_DB_FAILURE_RETRY_INTERVAL = "com.fr.third.v2.org.quartz.scheduler.dbFailureRetryInterval"; - public static final String PROP_SCHED_MAKE_SCHEDULER_THREAD_DAEMON = "org.quartz.scheduler.makeSchedulerThreadDaemon"; + public static final String PROP_SCHED_MAKE_SCHEDULER_THREAD_DAEMON = "com.fr.third.v2.org.quartz.scheduler.makeSchedulerThreadDaemon"; - public static final String PROP_SCHED_SCHEDULER_THREADS_INHERIT_CONTEXT_CLASS_LOADER_OF_INITIALIZING_THREAD = "org.quartz.scheduler.threadsInheritContextClassLoaderOfInitializer"; + public static final String PROP_SCHED_SCHEDULER_THREADS_INHERIT_CONTEXT_CLASS_LOADER_OF_INITIALIZING_THREAD = "com.fr.third.v2.org.quartz.scheduler.threadsInheritContextClassLoaderOfInitializer"; - public static final String PROP_SCHED_CLASS_LOAD_HELPER_CLASS = "org.quartz.scheduler.classLoadHelper.class"; + public static final String PROP_SCHED_CLASS_LOAD_HELPER_CLASS = "com.fr.third.v2.org.quartz.scheduler.classLoadHelper.class"; - public static final String PROP_SCHED_JOB_FACTORY_CLASS = "org.quartz.scheduler.jobFactory.class"; + public static final String PROP_SCHED_JOB_FACTORY_CLASS = "com.fr.third.v2.org.quartz.scheduler.jobFactory.class"; - public static final String PROP_SCHED_JOB_FACTORY_PREFIX = "org.quartz.scheduler.jobFactory"; + public static final String PROP_SCHED_JOB_FACTORY_PREFIX = "com.fr.third.v2.org.quartz.scheduler.jobFactory"; - public static final String PROP_SCHED_INTERRUPT_JOBS_ON_SHUTDOWN = "org.quartz.scheduler.interruptJobsOnShutdown"; + public static final String PROP_SCHED_INTERRUPT_JOBS_ON_SHUTDOWN = "com.fr.third.v2.org.quartz.scheduler.interruptJobsOnShutdown"; - public static final String PROP_SCHED_INTERRUPT_JOBS_ON_SHUTDOWN_WITH_WAIT = "org.quartz.scheduler.interruptJobsOnShutdownWithWait"; + public static final String PROP_SCHED_INTERRUPT_JOBS_ON_SHUTDOWN_WITH_WAIT = "com.fr.third.v2.org.quartz.scheduler.interruptJobsOnShutdownWithWait"; - public static final String PROP_SCHED_CONTEXT_PREFIX = "org.quartz.context.key"; + public static final String PROP_SCHED_CONTEXT_PREFIX = "com.fr.third.v2.org.quartz.context.key"; - public static final String PROP_THREAD_POOL_PREFIX = "org.quartz.threadPool"; + public static final String PROP_THREAD_POOL_PREFIX = "com.fr.third.v2.org.quartz.threadPool"; - public static final String PROP_THREAD_POOL_CLASS = "org.quartz.threadPool.class"; + public static final String PROP_THREAD_POOL_CLASS = "com.fr.third.v2.org.quartz.threadPool.class"; - public static final String PROP_JOB_STORE_PREFIX = "org.quartz.jobStore"; + public static final String PROP_JOB_STORE_PREFIX = "com.fr.third.v2.org.quartz.jobStore"; public static final String PROP_JOB_STORE_LOCK_HANDLER_PREFIX = PROP_JOB_STORE_PREFIX + ".lockHandler"; @@ -201,11 +201,11 @@ public class StdSchedulerFactory implements SchedulerFactory { public static final String PROP_SCHED_NAME = "schedName"; - public static final String PROP_JOB_STORE_CLASS = "org.quartz.jobStore.class"; + public static final String PROP_JOB_STORE_CLASS = "com.fr.third.v2.org.quartz.jobStore.class"; - public static final String PROP_JOB_STORE_USE_PROP = "org.quartz.jobStore.useProperties"; + public static final String PROP_JOB_STORE_USE_PROP = "com.fr.third.v2.org.quartz.jobStore.useProperties"; - public static final String PROP_DATASOURCE_PREFIX = "org.quartz.dataSource"; + public static final String PROP_DATASOURCE_PREFIX = "com.fr.third.v2.org.quartz.dataSource"; public static final String PROP_CONNECTION_PROVIDER_CLASS = "connectionProvider.class"; @@ -257,13 +257,13 @@ public class StdSchedulerFactory implements SchedulerFactory { public static final String PROP_DATASOURCE_JNDI_CREDENTIALS = "java.naming.security.credentials"; - public static final String PROP_PLUGIN_PREFIX = "org.quartz.plugin"; + public static final String PROP_PLUGIN_PREFIX = "com.fr.third.v2.org.quartz.plugin"; public static final String PROP_PLUGIN_CLASS = "class"; - public static final String PROP_JOB_LISTENER_PREFIX = "org.quartz.jobListener"; + public static final String PROP_JOB_LISTENER_PREFIX = "com.fr.third.v2.org.quartz.jobListener"; - public static final String PROP_TRIGGER_LISTENER_PREFIX = "org.quartz.triggerListener"; + public static final String PROP_TRIGGER_LISTENER_PREFIX = "com.fr.third.v2.org.quartz.triggerListener"; public static final String PROP_LISTENER_CLASS = "class"; @@ -271,15 +271,15 @@ public class StdSchedulerFactory implements SchedulerFactory { public static final String AUTO_GENERATE_INSTANCE_ID = "AUTO"; - public static final String PROP_THREAD_EXECUTOR = "org.quartz.threadExecutor"; + public static final String PROP_THREAD_EXECUTOR = "com.fr.third.v2.org.quartz.threadExecutor"; - public static final String PROP_THREAD_EXECUTOR_CLASS = "org.quartz.threadExecutor.class"; + public static final String PROP_THREAD_EXECUTOR_CLASS = "com.fr.third.v2.org.quartz.threadExecutor.class"; public static final String SYSTEM_PROPERTY_AS_INSTANCE_ID = "SYS_PROP"; - public static final String MANAGEMENT_REST_SERVICE_ENABLED = "org.quartz.managementRESTService.enabled"; + public static final String MANAGEMENT_REST_SERVICE_ENABLED = "com.fr.third.v2.org.quartz.managementRESTService.enabled"; - public static final String MANAGEMENT_REST_SERVICE_HOST_PORT = "org.quartz.managementRESTService.bind"; + public static final String MANAGEMENT_REST_SERVICE_HOST_PORT = "com.fr.third.v2.org.quartz.managementRESTService.bind"; /* * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -633,12 +633,12 @@ public class StdSchedulerFactory implements SchedulerFactory { autoId = true; instanceIdGeneratorClass = cfg.getStringProperty( PROP_SCHED_INSTANCE_ID_GENERATOR_CLASS, - "org.quartz.simpl.SimpleInstanceIdGenerator"); + "com.fr.third.v2.org.quartz.simpl.SimpleInstanceIdGenerator"); } else if (schedInstId.equals(SYSTEM_PROPERTY_AS_INSTANCE_ID)) { autoId = true; instanceIdGeneratorClass = - "org.quartz.simpl.SystemPropertyInstanceIdGenerator"; + "com.fr.third.v2.org.quartz.simpl.SystemPropertyInstanceIdGenerator"; } userTXLocation = cfg.getStringProperty(PROP_SCHED_USER_TX_URL, @@ -649,7 +649,7 @@ public class StdSchedulerFactory implements SchedulerFactory { classLoadHelperClass = cfg.getStringProperty( PROP_SCHED_CLASS_LOAD_HELPER_CLASS, - "org.quartz.simpl.CascadingClassLoadHelper"); + "com.fr.third.v2.org.quartz.simpl.CascadingClassLoadHelper"); wrapJobInTx = cfg.getBooleanProperty(PROP_SCHED_WRAP_JOB_IN_USER_TX, wrapJobInTx); @@ -659,7 +659,7 @@ public class StdSchedulerFactory implements SchedulerFactory { idleWaitTime = cfg.getLongProperty(PROP_SCHED_IDLE_WAIT_TIME, idleWaitTime); if(idleWaitTime > -1 && idleWaitTime < 1000) { - throw new SchedulerException("org.quartz.scheduler.idleWaitTime of less than 1000ms is not legal."); + throw new SchedulerException("com.fr.third.v2.org.quartz.scheduler.idleWaitTime of less than 1000ms is not legal."); } dbFailureRetry = cfg.getLongProperty(PROP_SCHED_DB_FAILURE_RETRY_INTERVAL, dbFailureRetry); @@ -1218,7 +1218,7 @@ public class StdSchedulerFactory implements SchedulerFactory { } } - if (js.getClass().getName().startsWith("org.terracotta.quartz")) { + if (js.getClass().getName().startsWith("com.fr.third.v2.org.terracotta.quartz")) { try { String uuid = (String) js.getClass().getMethod("getUUID").invoke(js); if(schedInstId.equals(DEFAULT_INSTANCE_ID)) { diff --git a/fine-quartz/src/com/fr/third/v2/org/quartz/simpl/SystemPropertyInstanceIdGenerator.java b/fine-quartz/src/com/fr/third/v2/org/quartz/simpl/SystemPropertyInstanceIdGenerator.java index eca733e5c..b5b9d1abc 100644 --- a/fine-quartz/src/com/fr/third/v2/org/quartz/simpl/SystemPropertyInstanceIdGenerator.java +++ b/fine-quartz/src/com/fr/third/v2/org/quartz/simpl/SystemPropertyInstanceIdGenerator.java @@ -20,7 +20,7 @@ public class SystemPropertyInstanceIdGenerator implements InstanceIdGenerator { /** * System property to read the instanceId from */ - public static final String SYSTEM_PROPERTY = "org.quartz.scheduler.instanceId"; + public static final String SYSTEM_PROPERTY = "com.fr.third.v2.org.quartz.scheduler.instanceId"; private String prepend = null; private String postpend = null; diff --git a/fine-quartz/src/com/fr/third/v2/org/quartz/utils/DBConnectionManager.java b/fine-quartz/src/com/fr/third/v2/org/quartz/utils/DBConnectionManager.java index e654e0042..b98d5d8c3 100644 --- a/fine-quartz/src/com/fr/third/v2/org/quartz/utils/DBConnectionManager.java +++ b/fine-quartz/src/com/fr/third/v2/org/quartz/utils/DBConnectionManager.java @@ -48,7 +48,7 @@ public class DBConnectionManager { * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - public static final String DB_PROPS_PREFIX = "org.quartz.db."; + public static final String DB_PROPS_PREFIX = "com.fr.third.v2.org.quartz.db."; /* * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~