You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/10/17 05:59:06 UTC
svn commit: r585354 - in
/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron:
QuartzDriverDelegate.java QuartzJobScheduler.java QuartzJobStoreCMT.java
QuartzJobStoreTX.java ServiceableCronJob.java
Author: vgritsenko
Date: Tue Oct 16 20:59:05 2007
New Revision: 585354
URL: http://svn.apache.org/viewvc?rev=585354&view=rev
Log:
AbstractLogEnabled switch
Modified:
cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzDriverDelegate.java
cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java
cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzJobStoreCMT.java
cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzJobStoreTX.java
cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/ServiceableCronJob.java
Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzDriverDelegate.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzDriverDelegate.java?rev=585354&r1=585353&r2=585354&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzDriverDelegate.java (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzDriverDelegate.java Tue Oct 16 20:59:05 2007
@@ -16,10 +16,18 @@
*/
package org.apache.cocoon.components.cron;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Set;
+
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.cocoon.util.avalon.CLLoggerWrapper;
+
import org.quartz.Calendar;
import org.quartz.CronTrigger;
import org.quartz.JobDataMap;
@@ -31,12 +39,6 @@
import org.quartz.utils.Key;
import org.quartz.utils.TriggerStatus;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Set;
-
/**
* Wrapper around another DriverDelegate instance.
*
@@ -53,14 +55,14 @@
* @version $Id$
* @since 2.1.6
*/
-public class QuartzDriverDelegate implements DriverDelegate {
- private Logger logger;
+public class QuartzDriverDelegate extends AbstractLogEnabled
+ implements DriverDelegate {
+
private ServiceManager manager;
private Context context;
private DriverDelegate delegate;
- public QuartzDriverDelegate(Logger logger, ServiceManager manager, Context context, DriverDelegate delegate) {
- this.logger = logger;
+ public QuartzDriverDelegate(ServiceManager manager, Context context, DriverDelegate delegate) {
this.manager = manager;
this.context = context;
this.delegate = delegate;
@@ -87,7 +89,7 @@
private void removeTransientData(JobDetail job) {
JobDataMap map = job.getJobDataMap();
if (map != null) {
- this.logger.debug("QuartzDriverDelegate: Removing transient data");
+ getLogger().debug("QuartzDriverDelegate: Removing transient data");
map.remove(QuartzJobScheduler.DATA_MAP_LOGGER);
map.remove(QuartzJobScheduler.DATA_MAP_MANAGER);
map.remove(QuartzJobScheduler.DATA_MAP_CONTEXT);
@@ -102,8 +104,8 @@
if (job != null) {
JobDataMap map = job.getJobDataMap();
if (map != null) {
- this.logger.debug("QuartzDriverDelegate: Adding transient data");
- map.put(QuartzJobScheduler.DATA_MAP_LOGGER, this.logger);
+ getLogger().debug("QuartzDriverDelegate: Adding transient data");
+ map.put(QuartzJobScheduler.DATA_MAP_LOGGER, new CLLoggerWrapper(getLogger()));
map.put(QuartzJobScheduler.DATA_MAP_MANAGER, this.manager);
map.put(QuartzJobScheduler.DATA_MAP_CONTEXT, this.context);
}
Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java?rev=585354&r1=585353&r2=585354&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java Tue Oct 16 20:59:05 2007
@@ -32,24 +32,26 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
+
import org.apache.cocoon.thread.RunnableManager;
import org.apache.cocoon.thread.ThreadPool;
+import org.apache.cocoon.util.AbstractLogEnabled;
+
import org.quartz.CronTrigger;
import org.quartz.Job;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.quartz.SimpleTrigger;
import org.quartz.Trigger;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
import org.quartz.impl.DirectSchedulerFactory;
import org.quartz.impl.jdbcjobstore.InvalidConfigurationException;
import org.quartz.impl.jdbcjobstore.JobStoreSupport;
@@ -598,8 +600,7 @@
blockPolicy,
m_shutdownGraceful,
shutdownWaitTimeMs);
- final QuartzThreadPool pool = new QuartzThreadPool(this.executor);
- return pool;
+ return new QuartzThreadPool(this.executor);
}
/**
@@ -642,11 +643,11 @@
return new RAMJobStore();
}
- JobStoreSupport store = null;
+ JobStoreSupport store;
if (type.equals("tx")) {
- store = new QuartzJobStoreTX(getLogger(), this.manager, this.context);
+ store = new QuartzJobStoreTX(this.manager, this.context);
} else if (type.equals("cmt")) {
- store = new QuartzJobStoreCMT(getLogger(), this.manager, this.context);
+ store = new QuartzJobStoreCMT(this.manager, this.context);
} else {
throw new ConfigurationException("Unknown store type: " + type);
}
@@ -742,7 +743,8 @@
*
* @version $Id$
*/
- private static class QuartzThreadPool extends AbstractLogEnabled implements org.quartz.spi.ThreadPool {
+ private static class QuartzThreadPool extends AbstractLogEnabled
+ implements org.quartz.spi.ThreadPool {
/** Our executor thread pool */
private ThreadPool executor;
Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzJobStoreCMT.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzJobStoreCMT.java?rev=585354&r1=585353&r2=585354&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzJobStoreCMT.java (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzJobStoreCMT.java Tue Oct 16 20:59:05 2007
@@ -17,7 +17,6 @@
package org.apache.cocoon.components.cron;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
import org.quartz.impl.jdbcjobstore.DriverDelegate;
@@ -32,20 +31,18 @@
*/
public class QuartzJobStoreCMT extends JobStoreCMT {
- private final Logger logger;
private final ServiceManager manager;
private final Context context;
private DriverDelegate delegate;
- public QuartzJobStoreCMT(Logger logger, ServiceManager manager, Context context) {
- this.logger = logger;
+ public QuartzJobStoreCMT(ServiceManager manager, Context context) {
this.manager = manager;
this.context = context;
}
protected DriverDelegate getDelegate() throws NoSuchDelegateException {
if (delegate == null) {
- delegate = new QuartzDriverDelegate(this.logger, this.manager, this.context, super.getDelegate());
+ delegate = new QuartzDriverDelegate(this.manager, this.context, super.getDelegate());
}
return delegate;
Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzJobStoreTX.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzJobStoreTX.java?rev=585354&r1=585353&r2=585354&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzJobStoreTX.java (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/QuartzJobStoreTX.java Tue Oct 16 20:59:05 2007
@@ -17,11 +17,10 @@
package org.apache.cocoon.components.cron;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
-import org.quartz.impl.jdbcjobstore.JobStoreTX;
import org.quartz.impl.jdbcjobstore.DriverDelegate;
+import org.quartz.impl.jdbcjobstore.JobStoreTX;
import org.quartz.impl.jdbcjobstore.NoSuchDelegateException;
/**
@@ -32,20 +31,18 @@
*/
public class QuartzJobStoreTX extends JobStoreTX {
- private final Logger logger;
private final ServiceManager manager;
private final Context context;
private DriverDelegate delegate;
- public QuartzJobStoreTX(Logger logger, ServiceManager manager, Context context) {
- this.logger = logger;
+ public QuartzJobStoreTX(ServiceManager manager, Context context) {
this.manager = manager;
this.context = context;
}
protected DriverDelegate getDelegate() throws NoSuchDelegateException {
if (delegate == null) {
- delegate = new QuartzDriverDelegate(this.logger, this.manager, this.context, super.getDelegate());
+ delegate = new QuartzDriverDelegate(this.manager, this.context, super.getDelegate());
}
return delegate;
Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/ServiceableCronJob.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/ServiceableCronJob.java?rev=585354&r1=585353&r2=585354&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/ServiceableCronJob.java (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/src/main/java/org/apache/cocoon/components/cron/ServiceableCronJob.java Tue Oct 16 20:59:05 2007
@@ -16,22 +16,21 @@
*/
package org.apache.cocoon.components.cron;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
+import org.apache.cocoon.util.AbstractLogEnabled;
+
/**
* Serviceable CronJob
*
- * @version $Id$
- *
* @since 2.1.4
+ * @version $Id$
*/
public abstract class ServiceableCronJob extends AbstractLogEnabled
- implements CronJob, Serviceable {
-
+ implements CronJob, Serviceable {
/** The service manager */
protected ServiceManager manager;
@@ -40,6 +39,4 @@
public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
}
-
-
}