Author: sgoeschl
Date: Wed May 23 01:45:11 2007
New Revision: 540887
URL: http://svn.apache.org/viewvc?view=rev&rev=540887
Log:
+) commons-lang-2.1.jar is not used at all
+) a logger is provided by the Avalon framework - no need to instantiate one
wihtin the service implementation
Modified:
jakarta/turbine/fulcrum/trunk/quartz/project.xml
jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/DefaultQuartzScheduler.java
jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/listener/ServiceableJobListener.java
jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/listener/impl/ServiceableJobListenerWrapper.java
Modified: jakarta/turbine/fulcrum/trunk/quartz/project.xml
URL:
http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/quartz/project.xml?view=diff&rev=540887&r1=540886&r2=540887
==============================================================================
--- jakarta/turbine/fulcrum/trunk/quartz/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/quartz/project.xml Wed May 23 01:45:11 2007
@@ -30,52 +30,40 @@
</version>
</versions>
<dependencies>
+ <!-- Service -->
+ <dependency>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.1.2</version>
+ <url>http://xstream.codehaus.org/</url>
+ </dependency>
+ <!-- QUARTZ -->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.1</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
</dependency>
-
- <dependency>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.1.2</version>
- <url>http://xstream.codehaus.org/</url>
- </dependency>
-
- <!-- QUARTZ -->
<dependency>
<groupId>quartz</groupId>
<artifactId>quartz</artifactId>
<version>1.5.1</version>
</dependency>
-
<!-- Needed only for testing -->
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
<version>1.0.5</version>
</dependency>
-
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.4</version>
</dependency>
-
-
</dependencies>
-
-
</project>
Modified:
jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/DefaultQuartzScheduler.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/DefaultQuartzScheduler.java?view=diff&rev=540887&r1=540886&r2=540887
==============================================================================
---
jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/DefaultQuartzScheduler.java
(original)
+++
jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/impl/DefaultQuartzScheduler.java
Wed May 23 01:45:11 2007
@@ -35,8 +35,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.fulcrum.quartz.QuartzScheduler;
import org.apache.fulcrum.quartz.listener.ServiceableJobListener;
import org.apache.fulcrum.quartz.listener.impl.ServiceableJobListenerWrapper;
@@ -60,8 +59,9 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Eric Pugh </a>
*
*/
-public class DefaultQuartzScheduler implements QuartzScheduler, Configurable,
Serviceable, Disposable, Initializable,
- ThreadSafe {
+public class DefaultQuartzScheduler
+ extends AbstractLogEnabled
+ implements QuartzScheduler, Configurable, Serviceable, Disposable,
Initializable, ThreadSafe {
private ServiceableJobListener wrapper;
@@ -69,8 +69,6 @@
private String globalJobListenerClassName;
- protected Log logger =
LogFactory.getLog(DefaultQuartzScheduler.class.getName());
-
private Scheduler scheduler;
private Configuration jobDetailsConf;
@@ -92,7 +90,6 @@
if (child != null) {
globalJobListenerClassName =
conf.getChild("globalJobListener").getAttribute("className");
}
-
}
/**
@@ -106,7 +103,7 @@
try {
scheduler = schedFact.getScheduler();
} catch (SchedulerException e) {
- throw new ServiceException("Error composing scheduler instance",
e);
+ throw new ServiceException("QuartzScheduler", "Error composing
scheduler instance", e);
}
}
@@ -142,7 +139,7 @@
for (Iterator iter = jobDetailsMap.keySet().iterator();
iter.hasNext();) {
String key = (String) iter.next();
JobDetail jobDetail = (JobDetail) jobDetailsMap.get(key);
- logger.debug("Adding job detail [" + jobDetail + "] to scheduler");
+ this.getLogger().debug("Adding job detail [" + jobDetail + "] to
scheduler");
scheduler.addJob(jobDetail, true);
}
@@ -150,6 +147,7 @@
if (globalJobListenerClassName != null) {
JobListener configuredjobListener = (JobListener)
Class.forName(globalJobListenerClassName).newInstance();
wrapper = new ServiceableJobListenerWrapper(configuredjobListener);
+
wrapper.enableLogging(this.getLogger().getChildLogger("ServiceableJobListener"));
wrapper.service(manager);
scheduler.addGlobalJobListener(wrapper);
}
@@ -163,7 +161,7 @@
Trigger t =
scheduler.getTrigger(trigger.getName(),trigger.getGroup());
if (t==null){
CronTrigger triggerToSchedule = new
CronTrigger(trigger.getName(),trigger.getGroup(),trigger.getJobName(),trigger.getJobGroup(),((CronTrigger)trigger).getCronExpression());
- logger.debug("Scheduling trigger [" +
triggerToSchedule.getFullName() + "] for job ["
+ this.getLogger().debug("Scheduling trigger [" +
triggerToSchedule.getFullName() + "] for job ["
+ triggerToSchedule.getFullJobName() + "] using
cron " + triggerToSchedule.getCronExpression());
triggerToSchedule.setDescription(trigger.getDescription());
@@ -180,7 +178,7 @@
}
scheduler.start();
- logger.debug("Quartz scheduler started !");
+ this.getLogger().debug("Quartz scheduler started !");
}
/**
@@ -190,7 +188,7 @@
try {
scheduler.shutdown();
} catch (SchedulerException e) {
- logger.warn("Problem shutting down scheduler ", e);
+ this.getLogger().warn("Problem shutting down scheduler ", e);
}
if(wrapper != null) {
wrapper.dispose();
Modified:
jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/listener/ServiceableJobListener.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/listener/ServiceableJobListener.java?view=diff&rev=540887&r1=540886&r2=540887
==============================================================================
---
jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/listener/ServiceableJobListener.java
(original)
+++
jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/listener/ServiceableJobListener.java
Wed May 23 01:45:11 2007
@@ -21,6 +21,7 @@
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.service.Serviceable;
+import org.apache.avalon.framework.logger.LogEnabled;
import org.quartz.JobListener;
/*
@@ -34,7 +35,8 @@
*
*/
public interface ServiceableJobListener
- extends JobListener,Serviceable,Disposable
+ extends JobListener,LogEnabled,Serviceable,Disposable
{
}
+
Modified:
jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/listener/impl/ServiceableJobListenerWrapper.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/listener/impl/ServiceableJobListenerWrapper.java?view=diff&rev=540887&r1=540886&r2=540887
==============================================================================
---
jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/listener/impl/ServiceableJobListenerWrapper.java
(original)
+++
jakarta/turbine/fulcrum/trunk/quartz/src/java/org/apache/fulcrum/quartz/listener/impl/ServiceableJobListenerWrapper.java
Wed May 23 01:45:11 2007
@@ -22,8 +22,7 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.fulcrum.quartz.listener.ServiceableJobListener;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
@@ -42,7 +41,7 @@
{
protected JobListener wrappedListener;
- protected Log logger =
LogFactory.getLog(ServiceableJobListener.class.getName());
+ protected Logger logger;
protected ServiceManager manager;
@@ -54,7 +53,13 @@
wrappedListener = listener;
}
- public void service(ServiceManager manager)
+
+ public void enableLogging(Logger logger)
+ {
+ this.logger = logger;
+ }
+
+ public void service(ServiceManager manager)
throws ServiceException
{
this.manager = manager;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
