Author: gk
Date: Thu Sep 14 11:59:33 2017
New Revision: 1808329
URL: http://svn.apache.org/viewvc?rev=1808329&view=rev
Log:
- minor fixes
- update version slf4j in pom
- expose Quartz scheduler and add method for custom job
Modified:
turbine/core/trunk/pom.xml
turbine/core/trunk/src/changes/changes.xml
turbine/core/trunk/src/java/org/apache/turbine/om/OMTool.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/QuartzSchedulerService.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TorqueSchedulerService.java
Modified: turbine/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1808329&r1=1808328&r2=1808329&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Thu Sep 14 11:59:33 2017
@@ -980,19 +980,19 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.10</version>
+ <version>${slf4j.version}</version>
<optional>true</optional>
</dependency>
<dependency> <!-- delegate slf4j to log4j -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.10</version>
+ <version>${slf4j.version}</version>
<optional>true</optional>
</dependency>
<dependency> <!-- redirect JCL to slf4j -->
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.10</version>
+ <version>${slf4j.version}</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -1092,6 +1092,7 @@
<properties>
<!-- TODO: Change for release -->
<turbine.site.path>turbine/development/turbine-4.0</turbine.site.path>
+ <slf4j.version>1.7.25</slf4j.version>
</properties>
</project>
Modified: turbine/core/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/changes/changes.xml?rev=1808329&r1=1808328&r2=1808329&view=diff
==============================================================================
--- turbine/core/trunk/src/changes/changes.xml (original)
+++ turbine/core/trunk/src/changes/changes.xml Thu Sep 14 11:59:33 2017
@@ -50,7 +50,7 @@
Improve performance of AnnotationProcessor by caching annotations. Add
performance test.
</action>
<action type="update" dev="tv">
- Replace synchronized array in TurbinePipeline with CopyOnWriteList
(20% faster). Add performance test.
+ Replace synchronized array in TurbinePipeline with
CopyOnWriteArrayList (20% faster). Add performance test.
</action>
<action type="update" dev="tv">
Replace several synchronized maps with ConcurrentMaps
Modified: turbine/core/trunk/src/java/org/apache/turbine/om/OMTool.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/om/OMTool.java?rev=1808329&r1=1808328&r2=1808329&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/om/OMTool.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/om/OMTool.java Thu Sep 14
11:59:33 2017
@@ -35,7 +35,7 @@ import org.apache.turbine.services.pull.
*/
public class OMTool implements ApplicationTool, Recyclable
{
- protected ConcurrentHashMap<String, Object> omMap;
+ protected ConcurrentMap<String, Object> omMap;
// note the following could be a static attribute to reduce memory
// footprint. Might require a service to front load the
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/QuartzSchedulerService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/QuartzSchedulerService.java?rev=1808329&r1=1808328&r2=1808329&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/QuartzSchedulerService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/QuartzSchedulerService.java
Thu Sep 14 11:59:33 2017
@@ -60,7 +60,7 @@ public class QuartzSchedulerService
private Scheduler scheduler;
/**
- * Initializes the SchedulerService.
+ * Initializes the SchedulerService. Retrieves the Quartz {@link
#scheduler} from the Fulcrum {@link QuartzScheduler} service.
*
* @throws InitializationException Something went wrong in the init
* stage
@@ -386,5 +386,30 @@ public class QuartzSchedulerService
throw new TurbineException("Invalid job type for this scheduler "
+ je.getClass());
}
}
+
+ /**
+ * Exposing the Quartz scheduler to handle jobs/triggers in more detail.
+ *
+ * @return the {@link Scheduler} of this service.
+ */
+ public Scheduler getScheduler()
+ {
+ return scheduler;
+ }
+
+ /**
+ * Builds a {@link JobEntryQuartz} from Quartz trigger/job.
+ *
+ * The developer should be aware to set identity/context properly, i.e.
to
+ * {@value JobEntryQuartz#DEFAULT_JOB_GROUP_NAME}, if adding triggers/jobs.
+ *
+ * @param trigger a Quartz {@link Trigger}.
+ * @param jd a Quartz {@link JobDetail} (built from a {@link Job} with
{@link JobBuilder}).
+ * @return A JobEntryQuartz.
+ */
+ public JobEntryQuartz buildJobEntry(Trigger trigger, JobDetail jd) {
+ JobEntryQuartz job = new JobEntryQuartz(trigger, jd);
+ return job;
+ }
}
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TorqueSchedulerService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TorqueSchedulerService.java?rev=1808329&r1=1808328&r2=1808329&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TorqueSchedulerService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TorqueSchedulerService.java
Thu Sep 14 11:59:33 2017
@@ -32,7 +32,7 @@ import org.apache.turbine.util.TurbineEx
* @author <a href="mailto:[email protected]";>Quinton McCombs</a>
* @version $Id: TorqueSchedulerService.java 534527 2007-05-02 16:10:59Z tv $
*
- * @deprecated Use QuartzSchedulerService instead
+ * @deprecated Use {@link QuartzSchedulerService} instead
*/
@Deprecated
public class TorqueSchedulerService extends AbstractSchedulerService
