Author: gk
Date: Tue Nov 27 16:33:21 2018
New Revision: 1847565
URL: http://svn.apache.org/viewvc?rev=1847565&view=rev
Log:
- add JSON service
- fix schedule service info
Modified:
turbine/core/trunk/src/site/site.xml
turbine/core/trunk/xdocs/services/index.xml
turbine/core/trunk/xdocs/services/scheduler-service.xml
Modified: turbine/core/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/site/site.xml?rev=1847565&r1=1847564&r2=1847565&view=diff
==============================================================================
--- turbine/core/trunk/src/site/site.xml (original)
+++ turbine/core/trunk/src/site/site.xml Tue Nov 27 16:33:21 2018
@@ -48,6 +48,7 @@
<item name="Factory Service"
href="http://turbine.apache.org/fulcrum/fulcrum-factory/"/>
<item name="Intake Service"
href="http://turbine.apache.org/fulcrum/fulcrum-intake/"/>
<item name="JSON-RPC Service"
href="/services/jsonrpc-service.html"/>
+ <item name="JSON Service"
href="http://turbine.apache.org/fulcrum/fulcrum-json/"/>
<item name="JSP Service" href="/services/jsp-service.html"/>
<item name="Localization Service"
href="http://turbine.apache.org/fulcrum/fulcrum-localization/"/>
<item name="MimeType Service"
href="http://turbine.apache.org/fulcrum/fulcrum-mimetype/"/>
Modified: turbine/core/trunk/xdocs/services/index.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/services/index.xml?rev=1847565&r1=1847564&r2=1847565&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/services/index.xml (original)
+++ turbine/core/trunk/xdocs/services/index.xml Tue Nov 27 16:33:21 2018
@@ -83,6 +83,12 @@ The JSON-RPC Service supports JavaScript
</li>
<li>
+<a href="/fulcrum/fulcrum-json/">JSON Service</a>
+<br/>
+The JSON Service provides a configurable integration of JSON De-/Serializers
with Jackson 2 (1) or GSON APIs (e.g. providing helpers for filtering, mixins
and other settings).
+</li>
+
+<li>
<a href="jsp-service.html">JSP Service</a>
<br/>
The JSP Service is the set of classes that process JSP files inside the
Modified: turbine/core/trunk/xdocs/services/scheduler-service.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/services/scheduler-service.xml?rev=1847565&r1=1847564&r2=1847565&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/services/scheduler-service.xml (original)
+++ turbine/core/trunk/xdocs/services/scheduler-service.xml Tue Nov 27 16:33:21
2018
@@ -31,8 +31,8 @@
<p>
The Scheduler is modeled after Unix Cron. The Scheduler runs as a
background
process that executes timed scheduled tasks independently of HTTP requests.
- Tasks are stored in the database in the TURBINE_SCHEDULED_JOB table and
once
- entered in the database are loaded automatically when Turbine initializes.
+ Tasks are either stored in the database in the TURBINE_SCHEDULED_JOB table
and once
+ entered in the database are loaded automatically when Turbine initializes
or as a non persistent service using TurbineNonPersistentSchedulerService.
</p>
<p>
@@ -46,9 +46,7 @@
The Scheduler Service should be accessed in one of two ways.
<ul>
<li>
- org.apache.turbine.services.schedule.TurbineScheduler - This class
- provides static methods to access the scheduler service. This is
the
- preferred method of access from within java code.
+ Get an instance of type
org.apache.turbine.services.schedule.ScheduleService (eihter using annnotation
@TurbineService or by using static call to
TurbineServices.getInstance().getService with parameter
ScheduleService.SERVICE_NAME) - This interface provides methods to access the
scheduler service. This is the preferred method of access from within java
code.
</li>
<li>
org.apache.turbine.services.schedule.SchedulerTool - This is a pull
@@ -74,7 +72,7 @@
# To specify properties of a service use the following syntax:
# service.[name].[property]=[value]
-services.SchedulerService.classname=org.apache.turbine.services.schedule.TurbineSchedulerService
+services.SchedulerService.classname=org.apache.turbine.services.schedule.QuartzSchedulerService
.
.
.
