You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by pa...@apache.org on 2018/10/11 18:32:26 UTC

[turbine-archetypes] branch master updated: Fix configuration to allow users to enable Quartz scheduler

This is an automated email from the ASF dual-hosted git repository.

painter pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git


The following commit(s) were added to refs/heads/master by this push:
     new 0746828  Fix configuration to allow users to enable Quartz scheduler
0746828 is described below

commit 0746828fc7863279d4d7e7739b37730095e889ba
Author: jlpainter <je...@gmail.com>
AuthorDate: Thu Oct 11 14:32:07 2018 -0400

    Fix configuration to allow users to enable Quartz scheduler
---
 .project                                                | 17 +++++++++++++++++
 .../webapp/WEB-INF/conf/TurbineResources.properties     | 16 ++++------------
 .../src/main/webapp/WEB-INF/conf/roleConfiguration.xml  |  8 +++++++-
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/.project b/.project
new file mode 100644
index 0000000..6271c1c
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>turbine-archetypes</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties
index 1120aa7..b4a2716 100644
--- a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties
+++ b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/TurbineResources.properties
@@ -352,9 +352,11 @@ services.ServletService.classname=org.apache.turbine.services.servlet.TurbineSer
 services.AssemblerBrokerService.classname=org.apache.turbine.services.assemblerbroker.TurbineAssemblerBrokerService
 services.PullService.classname=org.apache.turbine.services.pull.TurbinePullService
 services.TemplateService.classname=org.apache.turbine.services.template.TurbineTemplateService
+services.SecurityService.classname=org.apache.turbine.services.security.DefaultSecurityService
 services.UIService.classname = org.apache.turbine.services.ui.TurbineUIService
 services.VelocityService.classname=org.apache.turbine.services.velocity.TurbineVelocityService
 services.JsonRpcService.classname=org.apache.turbine.services.jsonrpc.TurbineJsonRpcService
+services.SchedulerService.classname=org.apache.turbine.services.schedule.QuartzSchedulerService
 
 # -------------------------------------------------------------------
 #
@@ -498,7 +500,7 @@ tool.request.intake=org.apache.turbine.services.intake.IntakeTool
 tool.request.related=${package}.services.pull.RelatedTool
 
 # This is a tool that allows access to the scheduler service.
-# tool.request.scheduler=org.apache.turbine.services.SchedulerTool
+# tool.request.scheduler=org.apache.turbine.services.schedule.SchedulerTool
 
 # The UITool will allow you to skin your Turbine application using simple
 # properties files that are located in the WEBAPP/resources/ directory
@@ -644,17 +646,7 @@ services.SecurityService.wrapper.class = ${package}.wrapper.TurbineUserWrapper
 # Components implementing the Avalon lifecycle interfaces can be loaded,
 # configured and initialized by Turbine
 # -------------------------------------------------------------------
-
-#
-# Name and location to the configuration file for the components.
-#
-services.AvalonComponentService.containerConfiguration = WEB-INF/conf/containerConfiguration.xml
-#
-# Name and location to the configuration file for the component roles.
-#
-#services.AvalonComponentService.componentRoles =  WEB-INF/conf/roleConfiguration.xml
-#
-#services.AvalonComponentService.componentConfiguration = WEB-INF/conf/componentConfiguration.xml
+services.AvalonComponentService.containerConfiguration = /WEB-INF/conf/containerConfiguration.xml
 
 # -------------------------------------------------------------------
 #
diff --git a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.xml b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.xml
index d4ea1a3..a21b16a 100644
--- a/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.xml
+++ b/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/roleConfiguration.xml
@@ -128,7 +128,13 @@
         shorthand="aclFactory"
         default-class="org.apache.fulcrum.security.model.turbine.TurbineACLFactory"/>
         
+    <!-- Service required for the QuartzSchedulerService -->
+    <role
+        name="org.apache.fulcrum.quartz.QuartzScheduler"
+        shorthand="quartz"
+        default-class="org.apache.fulcrum.quartz.impl.QuartzSchedulerImpl" />
 
     <!-- Add your services here -->
-        
+    
+                
 </role-list>
\ No newline at end of file