quintonm 2003/01/20 13:58:54
Modified: conf TurbineResources.properties
conf/master TurbineResources.master
Log:
- Added definition of pull tool for Scheduler - commented out!
- Added earlyInit setting for scheduler service
- more documentation for scheduler service settings.
Revision Changes Path
1.32 +33 -21 jakarta-turbine-2/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/TurbineResources.properties,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- TurbineResources.properties 15 Jan 2003 15:59:25 -0000 1.31
+++ TurbineResources.properties 20 Jan 2003 21:58:53 -0000 1.32
@@ -77,7 +77,7 @@
# module named "Login", then you would specify the path to your
# modules before the others.
#
-# Note: org.apache.turbine.modules will always be added to the search
+# Note: org.apache.turbine.modules will always be added to the search
# path. If it is not explictly added here, it will be added to the
# end.
#
@@ -115,9 +115,9 @@
template.homepage=Index.vm
# This is the default screen to show to people when they first access
-# the system. This is only used if there is no value for
-# template.homepage. This is for use when you are not using a
-# templating system such as Velocity or JSP.
+# the system. This is only used if there is no value for
+# template.homepage. This is for use when you are not using a
+# templating system such as Velocity or JSP.
#
# Default: Login
@@ -132,9 +132,9 @@
template.login=Login.vm
# This is the page that is shown on an incorrect login attempt. It is
-# referenced in the LoginUser action. This is only used if there is no value
-# for template.login. This is for use when you are not using a
-# templating system such as Velocity or JSP.
+# referenced in the LoginUser action. This is only used if there is no value
+# for template.login. This is for use when you are not using a
+# templating system such as Velocity or JSP.
#
# Default: Login
@@ -170,15 +170,15 @@
default.doctype=Html40Transitional
-# This is the default action to log a user in. If you write your own
-# implementation of the login action, make sure that you change this
-# to reflect the new name.
+# This is the default action to log a user in. If you write your own
+# implementation of the login action, make sure that you change this
+# to reflect the new name.
action.login=LoginUser
-# This is the default action to log a user out. If you write your own
-# implementation of the logout action, make sure that you change this
-# to reflect the new name.
+# This is the default action to log a user out. If you write your own
+# implementation of the logout action, make sure that you change this
+# to reflect the new name.
action.logout=LogoutUser
@@ -458,6 +458,9 @@
#tool.request.om=org.apache.turbine.om.OMTool
#tool.request.intake=org.apache.turbine.services.intake.IntakeTool
+# This is a tool that allows access to the scheduler service.
+#tool.request.scheduler=org.apache.turbine.services.SchedulerTool
+
tool.global.ui=org.apache.turbine.services.pull.util.UIManager
# The UI Manager will allow you to skin your Turbine
@@ -601,11 +604,20 @@
# -------------------------------------------------------------------
#
-# Set enabled to true to start the scheduler.
+# Set enabled to true to start the scheduler. The scheduler can be
+# stopped and started after Turbine has been intialized. See the
+# javadocs for org.apache.turbine.services.schedule.TurbineScheduler
+# for the methods calls.
#
# Default = false
#
-scheduler.enabled=false
+
+services.SchedulerService.enabled=false
+
+# Determines if the scheduler service should be initialized early. This
+# Should always be set to true!!!!
+
+services.SchedulerService.earlyInit=true
# -------------------------------------------------------------------
#
@@ -615,7 +627,7 @@
#
# Standard Unix crypt(3) password encryption.
-#
+#
services.CryptoService.algorithm.unix =
org.apache.turbine.services.crypto.provider.UnixCrypt
#
# This providers allows access to the Java Message Digest encryption algorithms
@@ -647,7 +659,7 @@
#
# This is the class that implements the UserManager interface to
# manage User objects. Default is the UserManager from the
-# DBSecurityService.
+# DBSecurityService.
# Override this setting if you want your User information stored
# on a different medium (LDAP directory is a good example).
#
@@ -658,7 +670,7 @@
#
# These are the default classes used by the Security Service to
-# provide User, Group, Role and Permission objects.
+# provide User, Group, Role and Permission objects.
# You want to override this setting only if you want your
# implementation to provide application specific addtional
# functionality.
@@ -987,14 +999,14 @@
# The location of the xml file specifying valid inputs
#
-# If you need to define multiple definition files, you can should
+# If you need to define multiple definition files, you can should
# seperate them with commas.
#
# Default: WEB-INF/conf/intake.xml
#
services.IntakeService.xml.path=WEB-INF/conf/intake.xml
-# This file is used to cache the XML definitions after they are
+# This file is used to cache the XML definitions after they are
# parsed. It provides for a small performance gain on startup.
#
# Note: Even if you have multiple XML definition files, you will
1.31 +33 -21 jakarta-turbine-2/conf/master/TurbineResources.master
Index: TurbineResources.master
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/master/TurbineResources.master,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- TurbineResources.master 15 Jan 2003 15:59:25 -0000 1.30
+++ TurbineResources.master 20 Jan 2003 21:58:54 -0000 1.31
@@ -77,7 +77,7 @@
# module named "Login", then you would specify the path to your
# modules before the others.
#
-# Note: org.apache.turbine.modules will always be added to the search
+# Note: org.apache.turbine.modules will always be added to the search
# path. If it is not explictly added here, it will be added to the
# end.
#
@@ -115,9 +115,9 @@
template.homepage=@TEMPLATE_HOMEPAGE@
# This is the default screen to show to people when they first access
-# the system. This is only used if there is no value for
-# template.homepage. This is for use when you are not using a
-# templating system such as Velocity or JSP.
+# the system. This is only used if there is no value for
+# template.homepage. This is for use when you are not using a
+# templating system such as Velocity or JSP.
#
# Default: Login
@@ -132,9 +132,9 @@
template.login=@TEMPLATE_LOGIN@
# This is the page that is shown on an incorrect login attempt. It is
-# referenced in the LoginUser action. This is only used if there is no value
-# for template.login. This is for use when you are not using a
-# templating system such as Velocity or JSP.
+# referenced in the LoginUser action. This is only used if there is no value
+# for template.login. This is for use when you are not using a
+# templating system such as Velocity or JSP.
#
# Default: Login
@@ -170,15 +170,15 @@
default.doctype=Html40Transitional
-# This is the default action to log a user in. If you write your own
-# implementation of the login action, make sure that you change this
-# to reflect the new name.
+# This is the default action to log a user in. If you write your own
+# implementation of the login action, make sure that you change this
+# to reflect the new name.
action.login=@ACTION_LOGIN@
-# This is the default action to log a user out. If you write your own
-# implementation of the logout action, make sure that you change this
-# to reflect the new name.
+# This is the default action to log a user out. If you write your own
+# implementation of the logout action, make sure that you change this
+# to reflect the new name.
action.logout=@ACTION_LOGOUT@
@@ -458,6 +458,9 @@
#tool.request.om=org.apache.turbine.om.OMTool
#tool.request.intake=org.apache.turbine.services.intake.IntakeTool
+# This is a tool that allows access to the scheduler service.
+#tool.request.scheduler=org.apache.turbine.services.SchedulerTool
+
tool.global.ui=org.apache.turbine.services.pull.util.UIManager
# The UI Manager will allow you to skin your Turbine
@@ -601,11 +604,20 @@
# -------------------------------------------------------------------
#
-# Set enabled to true to start the scheduler.
+# Set enabled to true to start the scheduler. The scheduler can be
+# stopped and started after Turbine has been intialized. See the
+# javadocs for org.apache.turbine.services.schedule.TurbineScheduler
+# for the methods calls.
#
# Default = false
#
-scheduler.enabled=false
+
+services.SchedulerService.enabled=false
+
+# Determines if the scheduler service should be initialized early. This
+# Should always be set to true!!!!
+
+services.SchedulerService.earlyInit=true
# -------------------------------------------------------------------
#
@@ -615,7 +627,7 @@
#
# Standard Unix crypt(3) password encryption.
-#
+#
services.CryptoService.algorithm.unix =
org.apache.turbine.services.crypto.provider.UnixCrypt
#
# This providers allows access to the Java Message Digest encryption algorithms
@@ -647,7 +659,7 @@
#
# This is the class that implements the UserManager interface to
# manage User objects. Default is the UserManager from the
-# DBSecurityService.
+# DBSecurityService.
# Override this setting if you want your User information stored
# on a different medium (LDAP directory is a good example).
#
@@ -658,7 +670,7 @@
#
# These are the default classes used by the Security Service to
-# provide User, Group, Role and Permission objects.
+# provide User, Group, Role and Permission objects.
# You want to override this setting only if you want your
# implementation to provide application specific addtional
# functionality.
@@ -987,14 +999,14 @@
# The location of the xml file specifying valid inputs
#
-# If you need to define multiple definition files, you can should
+# If you need to define multiple definition files, you can should
# seperate them with commas.
#
# Default: WEB-INF/conf/intake.xml
#
services.IntakeService.xml.path=WEB-INF/conf/intake.xml
-# This file is used to cache the XML definitions after they are
+# This file is used to cache the XML definitions after they are
# parsed. It provides for a small performance gain on startup.
#
# Note: Even if you have multiple XML definition files, you will
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
