Author: henning
Date: Tue Aug 30 00:44:51 2005
New Revision: 264723
URL: http://svn.apache.org/viewcvs?rev=264723&view=rev
Log:
Quartz now uses commons-logging everywhere (good decision!). Remove
all logger related code.
Modified:
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/scheduler/Scheduler.java
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/scheduler/SchedulerConfig.java
jakarta/turbine/stratum/trunk/src/test-conf/Scheduler.xml
Modified:
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/scheduler/Scheduler.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/scheduler/Scheduler.java?rev=264723&r1=264722&r2=264723&view=diff
==============================================================================
---
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/scheduler/Scheduler.java
(original)
+++
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/scheduler/Scheduler.java
Tue Aug 30 00:44:51 2005
@@ -123,14 +123,20 @@
}
catch (NullPointerException ex)
{
- log.error("Error loading properties to initialize" + "
Scheduler Factory. Please make sure the following"
- + " elements are properly filled out in the" + " Scheduler
.xml config file:\n"
- + " <instanceName></instanceName>\n" + "
<loggerName></loggerName>\n" + " <threadPoolConfig>\n"
- + " <className></className>\n" + "
<threadCount></threadCount>\n"
- + " <threadPriority></threadPriority>\n" + "
<loggerName></loggerName>\n" + " </threadPoolConfig>\n"
- + " <jobStoreConfig>\n" + "
<className></className>\n" + " <loggerName></loggerName>\n"
- + " </jobStoreConfig>");
-
+ log.error("Error loading properties to initialize"
+ + " Scheduler Factory. Please make sure the following"
+ + " elements are properly filled out in the"
+ + " Scheduler .xml config file:\n"
+ + " <instanceName></instanceName>\n"
+ + " <threadPoolConfig>\n"
+ + " <className></className>\n"
+ + " <threadCount></threadCount>\n"
+ + " <threadPriority></threadPriority>\n"
+ + " </threadPoolConfig>\n"
+ + " <jobStoreConfig>\n"
+ + " <className></className>\n"
+ + " </jobStoreConfig>");
+
return;
}
@@ -201,34 +207,14 @@
Properties props = new Properties();
props.put("org.quartz.scheduler.instanceName",
schdConf.getInstanceName());
- props.put("org.quartz.scheduler.logger", schdConf.getLoggerName());
-
- // configure loggers
- List loggers = schdConf.getLoggerConfigs();
-
- for (int i = 0; i < loggers.size(); i++)
- {
- LoggerConfig logger = (LoggerConfig) loggers.get(i);
- String loggerName = "org.quartz.logger." + logger.getName();
- props.put(loggerName + ".class", logger.getClassName());
- props.put(loggerName + ".loggingPriority", logger.getPriority());
- props.put(loggerName + ".outputFile", logger.getOutputFile());
-
- if (logger.getCategory() != null)
- {
- props.put(loggerName + ".categoryName", logger.getCategory());
- }
- }
ThreadPoolConfig threadPool = schdConf.getThreadPoolConfig();
props.put("org.quartz.threadPool.class", threadPool.getClassName());
props.put("org.quartz.threadPool.threadCount",
threadPool.getThreadCount());
props.put("org.quartz.threadPool.threadPriority",
threadPool.getThreadPriority());
- props.put("org.quartz.threadPool.logger", threadPool.getLoggerName());
JobStoreConfig jobStore = schdConf.getJobStoreConfig();
props.put("org.quartz.jobStore.class", jobStore.getClassName());
- props.put("org.quartz.jobStore.logger", jobStore.getLoggerName());
return props;
}
Modified:
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/scheduler/SchedulerConfig.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/scheduler/SchedulerConfig.java?rev=264723&r1=264722&r2=264723&view=diff
==============================================================================
---
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/scheduler/SchedulerConfig.java
(original)
+++
jakarta/turbine/stratum/trunk/src/java/org/apache/stratum/scheduler/SchedulerConfig.java
Tue Aug 30 00:44:51 2005
@@ -31,15 +31,9 @@
/** Scheduler reference name */
private String instanceName;
- /** Scheduler logger name */
- private String loggerName;
-
/** List of job configurations */
private List jobConfigs;
- /** List of loggers */
- private List loggerConfigs;
-
/** List of triggers */
private List triggerConfigs;
@@ -55,7 +49,6 @@
public SchedulerConfig()
{
jobConfigs = new ArrayList();
- loggerConfigs = new ArrayList();
triggerConfigs = new ArrayList();
}
@@ -80,26 +73,6 @@
}
/**
- * Set the logger name for the scheduler
- *
- * @param s loggerName
- */
- public void setLoggerName(String s)
- {
- this.loggerName = s;
- }
-
- /**
- * Return the logger name
- *
- * @return logger name
- */
- public String getLoggerName()
- {
- return this.loggerName;
- }
-
- /**
* Add a Job Configuraton to Scheduler Config
*
* @param jconf Job configuration
@@ -117,26 +90,6 @@
public List getJobConfigs()
{
return this.jobConfigs;
- }
-
- /**
- * Add a logger Scheduler Config
- *
- * @param logger
- */
- public void addLoggerConfig(LoggerConfig logger)
- {
- loggerConfigs.add(logger);
- }
-
- /**
- * Return a list of loggers
- *
- * @return List of job configs
- */
- public List getLoggerConfigs()
- {
- return this.loggerConfigs;
}
/**
Modified: jakarta/turbine/stratum/trunk/src/test-conf/Scheduler.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/stratum/trunk/src/test-conf/Scheduler.xml?rev=264723&r1=264722&r2=264723&view=diff
==============================================================================
--- jakarta/turbine/stratum/trunk/src/test-conf/Scheduler.xml (original)
+++ jakarta/turbine/stratum/trunk/src/test-conf/Scheduler.xml Tue Aug 30
00:44:51 2005
@@ -24,29 +24,16 @@
http://www.part.net/quartz_documentation.html
-->
<instanceName>scheduler1</instanceName>
- <loggerName>schedLogger</loggerName>
<threadPoolConfig>
<className>org.quartz.simpl.SimpleThreadPool</className>
<threadCount>15</threadCount>
<threadPriority>4</threadPriority>
- <loggerName>schedLogger</loggerName>
</threadPoolConfig>
<jobStoreConfig>
<className>org.quartz.simpl.RAMJobStore</className>
- <loggerName>schedLogger</loggerName>
</jobStoreConfig>
-
- <loggerConfigs>
- <loggerConfig>
- <name>schedLogger</name>
- <className>org.quartz.simpl.SimpleLogger</className>
- <priority>3</priority>
- <outputFile>xmltest.txt</outputFile>
- <!--category>testCat</category-->
- </loggerConfig>
- </loggerConfigs>
<jobConfigs>
<jobConfig>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
