You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2015/07/25 21:22:58 UTC
svn commit: r1692637 [2/2] - in /turbine/core/trunk: conf/ conf/test/
src/changes/ src/java/org/apache/turbine/services/intake/
src/java/org/apache/turbine/services/schedule/
src/test-cactus/testapp/WEB-INF/conf/ src/torque/schema/
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java?rev=1692637&r1=1692636&r2=1692637&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java Sat Jul 25 19:22:57 2015
@@ -22,12 +22,8 @@ package org.apache.turbine.services.sche
import java.util.List;
import java.util.Vector;
-import javax.servlet.ServletConfig;
-
import org.apache.commons.configuration.Configuration;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.util.TurbineException;
@@ -68,11 +64,8 @@ import org.apache.turbine.util.TurbineEx
* @version $Id: TurbineNonPersistentSchedulerService.java 534527 2007-05-02 16:10:59Z tv $
*/
public class TurbineNonPersistentSchedulerService
- extends TurbineSchedulerService
+ extends TorqueSchedulerService
{
- /** Logging */
- private static Log log = LogFactory.getLog(ScheduleService.LOGGER_NAME);
-
/**
* Constructor.
*
@@ -128,7 +121,7 @@ public class TurbineNonPersistentSchedul
int wkday = conf.getInt(jobPrefix + ".WEEKDAY", -1);
int dayOfMonth = conf.getInt(jobPrefix + ".DAY_OF_MONTH", -1);
- JobEntry je = new JobEntry(
+ JobEntry je = new JobEntryNonPersistent(
sec,
min,
hr,
@@ -141,7 +134,7 @@ public class TurbineNonPersistentSchedul
}
}
- if (jobs != null && jobs.size() > 0)
+ if (jobs.size() > 0)
{
scheduleQueue.batchLoad(jobs);
}
@@ -153,31 +146,11 @@ public class TurbineNonPersistentSchedul
}
catch (Exception e)
{
- String errorMessage = "Could not initialize the scheduler service";
- log.error(errorMessage, e);
- throw new InitializationException(errorMessage, e);
+ throw new InitializationException("Could not initialize the scheduler service", e);
}
}
/**
- * Called the first time the Service is used.<br>
- *
- * Load all the jobs from cold storage. Add jobs to the queue
- * (sorted in ascending order by runtime) and start the scheduler
- * thread.
- *
- * @param config A ServletConfig.
- * @deprecated use init() instead.
- */
- @Deprecated
- @Override
- public void init(ServletConfig config)
- throws InitializationException
- {
- init();
- }
-
- /**
* This method returns the job element from the internal queue.
*
* @param oid The int id for the job.
@@ -188,7 +161,7 @@ public class TurbineNonPersistentSchedul
public JobEntry getJob(int oid)
throws TurbineException
{
- JobEntry je = new JobEntry();
+ JobEntry je = new JobEntryNonPersistent();
je.setJobId(oid);
return scheduleQueue.getJob(je);
}
@@ -239,9 +212,7 @@ public class TurbineNonPersistentSchedul
}
catch (Exception e)
{
- String errorMessage = "Problem updating Scheduled Job: " + je.getTask();
- log.error(errorMessage, e);
- throw new TurbineException(errorMessage, e);
+ throw new TurbineException("Problem updating Scheduled Job: " + je.getTask(), e);
}
}
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineScheduler.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineScheduler.java?rev=1692637&r1=1692636&r2=1692637&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineScheduler.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineScheduler.java Sat Jul 25 19:22:57 2015
@@ -91,7 +91,7 @@ public abstract class TurbineScheduler
*
* @return A Vector of jobs.
*/
- public static List<JobEntry> listJobs()
+ public static List<? extends JobEntry> listJobs()
{
return getService().listJobs();
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/WorkerThread.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/WorkerThread.java?rev=1692637&r1=1692636&r2=1692637&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/WorkerThread.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/WorkerThread.java Sat Jul 25 19:22:57 2015
@@ -56,6 +56,7 @@ public class WorkerThread
/**
* Run the job.
*/
+ @Override
public void run()
{
if (je == null || je.isActive())
@@ -75,7 +76,7 @@ public class WorkerThread
catch (Exception e)
{
log.error("Error in WorkerThread for scheduled job #" +
- je.getPrimaryKey() + ", task: " + je.getTask(), e);
+ je.getJobId() + ", task: " + je.getTask(), e);
}
finally
{
@@ -94,7 +95,7 @@ public class WorkerThread
*/
private final void logStateChange(String state)
{
- log.debug("Scheduled job #" + je.getPrimaryKey() + ' ' + state +
+ log.debug("Scheduled job #" + je.getJobId() + ' ' + state +
", task: " + je.getTask());
}
}
Modified: turbine/core/trunk/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties?rev=1692637&r1=1692636&r2=1692637&view=diff
==============================================================================
--- turbine/core/trunk/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties (original)
+++ turbine/core/trunk/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties Sat Jul 25 19:22:57 2015
@@ -307,7 +307,7 @@ services.AssemblerBrokerService.classnam
services.LocalizationService.classname=org.apache.turbine.services.localization.TurbineLocalizationService
services.MimeTypeService.classname=org.apache.turbine.services.mimetype.TurbineMimeTypeService
services.GlobalCacheService.classname=org.apache.turbine.services.cache.TurbineGlobalCacheService
-# services.SchedulerService.classname=org.apache.turbine.services.schedule.TurbineSchedulerService
+# services.SchedulerService.classname=org.apache.turbine.services.schedule.TorqueSchedulerService
services.UniqueIdService.classname=org.apache.turbine.services.uniqueid.TurbineUniqueIdService
services.UploadService.classname=org.apache.turbine.services.upload.TurbineUploadService
services.SecurityService.classname=org.apache.turbine.services.security.db.DBSecurityService
Modified: turbine/core/trunk/src/torque/schema/scheduler-schema.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/torque/schema/scheduler-schema.xml?rev=1692637&r1=1692636&r2=1692637&view=diff
==============================================================================
--- turbine/core/trunk/src/torque/schema/scheduler-schema.xml (original)
+++ turbine/core/trunk/src/torque/schema/scheduler-schema.xml Sat Jul 25 19:22:57 2015
@@ -40,7 +40,8 @@
http://db.apache.org/torque/4.0/templates/database.xsd">
- <table name="TURBINE_SCHEDULED_JOB" idMethod="idbroker" javaName="JobEntry">
+ <table name="TURBINE_SCHEDULED_JOB" idMethod="idbroker" javaName="JobEntryTorque"
+ baseClass="org.apache.turbine.services.schedule.AbstractJobEntry" >
<column name="JOB_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="SECOND" javaName="Second" default="-1"
required="true" type="INTEGER"/>