You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by mp...@apache.org on 2002/02/08 16:05:26 UTC

cvs commit: jakarta-turbine-2/conf TurbineResources.properties

mpoeschl    02/02/08 07:05:25

  Modified:    conf/master TurbineResources.master
               conf     TurbineResources.properties
  Log:
  add properties for subsystem initialization
  
  Revision  Changes    Path
  1.8       +81 -63    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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TurbineResources.master	29 Nov 2001 10:41:34 -0000	1.7
  +++ TurbineResources.master	8 Feb 2002 15:05:25 -0000	1.8
  @@ -1,15 +1,15 @@
   # -------------------------------------------------------------------
  -# $Id: TurbineResources.master,v 1.7 2001/11/29 10:41:34 mpoeschl Exp $
  +# $Id: TurbineResources.master,v 1.8 2002/02/08 15:05:25 mpoeschl Exp $
   #
   # This is the configuration file for Turbine.
   #
  -# Note that strings containing "," (comma) characters must backslash 
  +# Note that strings containing "," (comma) characters must backslash
   # escape the comma (i.e. '\,')
   #
   # -------------------------------------------------------------------
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  L O G S
   #
   # -------------------------------------------------------------------
  @@ -75,7 +75,7 @@
   services.LoggingService.remote.level=INFO
   
   # An example configuration for sending error reports as email with Log4Java
  -# notes: 
  +# notes:
   # * uses 'mail.server' as SMTP server to send mail through
   # * log4j will send the email when an ERROR is logged, with
   #   'buffer.size' previous (non-ERROR) logs included in the email
  @@ -89,8 +89,8 @@
   services.LoggingService.email.level=INFO
   
   # -------------------------------------------------------------------
  -# 
  -#  M A I L  S E R V E R 
  +#
  +#  M A I L  S E R V E R
   #
   # -------------------------------------------------------------------
   # Your mail server for outgoing email.
  @@ -104,7 +104,7 @@
   # SMTP-From header for your outgoing messages
   #
   # All failed delivery messages will be returned to this address.
  -# If unset, these messages will be sent to the address in the 
  +# If unset, these messages will be sent to the address in the
   # From header (standard behaviour)
   #
   # Default: null
  @@ -113,7 +113,7 @@
   mail.smtp.from=@MAIL_SMTP_FROM@
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  M O D U L E  C A C H I N G
   #
   # -------------------------------------------------------------------
  @@ -136,7 +136,7 @@
   scheduledjob.cache.size=10
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  M O D U L E  P A C K A G E S
   #
   # -------------------------------------------------------------------
  @@ -155,7 +155,7 @@
   module.packages=@MODULE_PACKAGES@
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  D A T A B A S E  S E T T I N G S
   #
   # -------------------------------------------------------------------
  @@ -191,7 +191,7 @@
   
   database.connectionWaitTimeout=10000
   
  -# The interval (in milliseconds) between which the PoolBrokerService logs 
  +# The interval (in milliseconds) between which the PoolBrokerService logs
   # the status of it's ConnectionPools.
   #
   # Default: No logging = 0 = 0 * 1000
  @@ -220,7 +220,7 @@
   database.idbroker.prefetch=true
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  F R A M E W O R K  S E T T I N G S
   #
   # -------------------------------------------------------------------
  @@ -238,13 +238,13 @@
   
   # This is the default screen to show to people when they first access
   # the system. Specify one of the template screens such as VelocityScreen
  -# to use a template system. 
  +# to use a template system.
   #
   # Default: Login
   
   screen.homepage=@SCREEN_HOMEPAGE@
   
  -# This is the template that is shown on an incorrect login attempt. 
  +# This is the template that is shown on an incorrect login attempt.
   # Setting this property will override any value of screen.login specfied
   # below.
   #
  @@ -260,8 +260,8 @@
   
   screen.login=@SCREEN_LOGIN@
   
  -# This is the template that is used by the respective Template based 
  -# ErrorScreen for displaying the error. If you are not using a Template based 
  +# This is the template that is used by the respective Template based
  +# ErrorScreen for displaying the error. If you are not using a Template based
   # ErrorScreen, then this is ignored.
   #
   # Default: /Error.vm
  @@ -317,7 +317,7 @@
   action.accesscontroller=@ACTION_ACCESS_CONTROLLER@
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  J N D I  C O N T E X T S
   #
   # -------------------------------------------------------------------
  @@ -343,7 +343,7 @@
   # context.name.java.naming.factory.initial=com.sun.jndi.rmi.registry.RegistryContextFactory
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  P E E R S
   #
   # -------------------------------------------------------------------
  @@ -356,11 +356,11 @@
   database.maps.builder=org.apache.turbine.util.db.map.TurbineMapBuilder
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  M E S S A G E S
   #
   # -------------------------------------------------------------------
  -# Note that strings containing "," (comma) characters must backslash 
  +# Note that strings containing "," (comma) characters must backslash
   # escape the comma (i.e. '\,')
   
   # The message that can be displayed before a user logs in.
  @@ -381,7 +381,7 @@
   logout.message=Thank you for using the system. Please come back soon.
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  S E C U R E  S O C K E T S  L A Y E R
   #
   # -------------------------------------------------------------------
  @@ -394,7 +394,7 @@
   use.ssl=true
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  S E R V I C E S
   #
   # -------------------------------------------------------------------
  @@ -452,7 +452,7 @@
   # -------------------------------------------------------------------
   # Default implementations of base interfaces for request processing.
   # Additional configurations can be defined by using other keys
  -# in the place of the <default> key.  
  +# in the place of the <default> key.
   # -------------------------------------------------------------------
   
   services.RunDataService.default.run.data=org.apache.turbine.services.rundata.DefaultTurbineRunData
  @@ -471,11 +471,11 @@
   services.GlobalCacheService.cache.check.frequency = 5000
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  A S S E M B L E R  B R O K E R  S E R V I C E
   #
   # -------------------------------------------------------------------
  -# A list of AssemblerFactory classes that will be registered 
  +# A list of AssemblerFactory classes that will be registered
   # with TurbineAssemblerBrokerService
   # -------------------------------------------------------------------
   
  @@ -488,7 +488,7 @@
   services.AssemblerBrokerService.scheduledjob=org.apache.turbine.services.assemblerbroker.util.java.JavaScheduledJobFactory
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  T E M P L A T E  S E R V I C E
   #
   # -------------------------------------------------------------------
  @@ -502,7 +502,7 @@
   services.TemplateService.screen.cache.size=50
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  P U L L  S E R V I C E
   #
   # -------------------------------------------------------------------
  @@ -510,7 +510,7 @@
   # that works in conjuction with the Turbine Pull Model API.
   # -------------------------------------------------------------------
   
  -# This determines whether the non-request tools are refreshed 
  +# This determines whether the non-request tools are refreshed
   # on each request (request tools aren't ever, because they're
   # instantiated for the request only anyway).
   services.PullService.tools.per.request.refresh=true
  @@ -542,7 +542,7 @@
   # Then:
   #
   # tool.ui.skin = default
  -# 
  +#
   # configures the value of "skin" for the "ui" tool.
   #
   # Tools are accessible in all templates by the <id> given
  @@ -563,13 +563,13 @@
   #               be threadsafe.
   #
   #   session:    tool is instantiated once for each user session, and is
  -#               stored in the user's temporary hashtable. Tool should be 
  +#               stored in the user's temporary hashtable. Tool should be
   #               threadsafe.
   #
   #   persistent: tool is instantitated once for each use session, and
   #               is stored in the user's permanent hashtable. This means
   #               for a logged in user the tool will be persisted in the
  -#               user's objectdata. Tool should be threadsafe and 
  +#               user's objectdata. Tool should be threadsafe and
   #               Serializable.
   #
   # Defaults: none
  @@ -594,14 +594,14 @@
   tool.ui.skin=default
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  V E L O C I T Y  S E R V I C E
   #
   # -------------------------------------------------------------------
   
   # The location of Velocity configuration file, relative to webapp root
   # These properties will override the default properties set by Velocity.
  -# You should specify the path to the templates directories as well as 
  +# You should specify the path to the templates directories as well as
   # the path to the log file and they should also be relative to webapp root
   
   services.VelocityService.template.extension=vm
  @@ -628,7 +628,7 @@
   services.VelocityService.classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  J S P  S E R V I C E
   #
   # -------------------------------------------------------------------
  @@ -645,7 +645,7 @@
   services.JspService.buffer.size = 8192
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  W E B M A C R O  S E R V I C E
   #
   # the webmacro-service is deprecated. you should use velocity instead!
  @@ -679,7 +679,7 @@
   services.WebMacroService.templates.provider=org.apache.turbine.services.webmacro.TurbineTemplateProvider
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  F R E E M A R K E R  S E R V I C E
   #
   # the freemarker-service is deprecated. you should use velocity instead!
  @@ -694,7 +694,7 @@
   services.FreeMarkerService.templates=/templates
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  U P L O A D  S E R V I C E
   #
   # -------------------------------------------------------------------
  @@ -721,7 +721,7 @@
   services.UploadService.size.threshold=10240
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  L O C A L I Z A T I O N  S E R V I C E
   #
   # -------------------------------------------------------------------
  @@ -741,30 +741,30 @@
   # locale.default.charset=
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  M I M E T Y P E  S E R V I C E
   #
   # -------------------------------------------------------------------
   
  -# This property specifies a file containing mappings between MIME 
  +# This property specifies a file containing mappings between MIME
   # content types and the corresponding file name extensions. The
  -# service itself contains a hardcoded set of most common mappings. 
  -# The file must use the same syntax as the mime.types file of 
  -# the Apache Server, i.e. 
  +# service itself contains a hardcoded set of most common mappings.
  +# The file must use the same syntax as the mime.types file of
  +# the Apache Server, i.e.
   # <mimetype> <ext1> <ext2>...
   #
   #services.MimeTypeService.mime.types=/WEB-INF/conf/mime.types
   
  -# This property specifies a file containing mappings between locales 
  -# and the corresponding character encodings. The service itself 
  -# contains a hardcoded set of most common mappings. 
  -# The file should use the Java property file syntax, i.e. 
  +# This property specifies a file containing mappings between locales
  +# and the corresponding character encodings. The service itself
  +# contains a hardcoded set of most common mappings.
  +# The file should use the Java property file syntax, i.e.
   # <lang_country_variant>=<charset>
   #
   #services.MimeTypeService.charsets=/WEB-INF/conf/charset.properties
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  S C H E D U L E R  S E R V I C E
   #
   # -------------------------------------------------------------------
  @@ -778,15 +778,15 @@
   
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  S E C U R I T Y  S E R V I C E
   #
   # -------------------------------------------------------------------
   
   #
   # This is the class that implements the User interface.
  -# You want to override this setting only if you want your User 
  -# implementation to provide application specific addtional 
  +# You want to override this setting only if you want your User
  +# implementation to provide application specific addtional
   # functionality.
   #
   # Default: org.apache.turbine.om.security.TurbineUser
  @@ -796,7 +796,7 @@
   
   #
   # This setting is DBSecurityService specific - this class is consulted for the names
  -# of the columns in the users' tables for the purpose of creating join queries. 
  +# of the columns in the users' tables for the purpose of creating join queries.
   # If you use your own User implementation in conjunction with DBSecurityService,
   # it's peer class must implement org.apache.turbine.om.security.peer.UserPeer interface,
   # and you need to specify the name of the peer class here.
  @@ -850,7 +850,7 @@
   #services.SecurityService.ldap.provider=com.sun.jndi.ldap.LdapCtxFactory
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  X M L R P C  S E R V I C E
   #
   # -------------------------------------------------------------------
  @@ -868,8 +868,8 @@
   
   services.XmlRpcService.port=12345
   
  -# If any classes are specified here, the Service will create an 
  -# instance of them here and start up a listener on the specified 
  +# If any classes are specified here, the Service will create an
  +# instance of them here and start up a listener on the specified
   # port.
   #
   # Note that the handlers demonstrated are not very useful.  You
  @@ -895,7 +895,7 @@
   services.XmlRpcService.handler.file = org.apache.turbine.services.xmlrpc.util.FileHandler
   services.XmlRpcService.paranoid = false
   services.XmlRpcService.acceptClient = 192.168.1.*
  -services.XmlRpcService.denyClient = 
  +services.XmlRpcService.denyClient =
   
   # Do we want a secure server
   
  @@ -916,10 +916,10 @@
   
   services.XmlRpcService.secure.server.option.javax.net.ssl.keyStore = /tmp/keystore
   services.XmlRpcService.secure.server.option.javax.net.ssl.keyStoreType = jks
  -services.XmlRpcService.secure.server.option.javax.net.ssl.keyStorePassword = password 
  +services.XmlRpcService.secure.server.option.javax.net.ssl.keyStorePassword = password
   services.XmlRpcService.secure.server.option.javax.net.ssl.trustStore = /tmp/truststore
   services.XmlRpcService.secure.server.option.javax.net.ssl.trustStoreType = jks
  -services.XmlRpcService.secure.server.option.javax.net.ssl.trustStorePassword = password 
  +services.XmlRpcService.secure.server.option.javax.net.ssl.trustStorePassword = password
   
   services.XmlRpcService.secure.server.option.sun.ssl.keymanager.type = SunX509
   services.XmlRpcService.secure.server.option.sun.ssl.trust.manager.type = SunX509
  @@ -930,7 +930,7 @@
   services.XmlRpcService.secure.server.option.java.security.debug = none
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  P O O L  S E R V I C E
   #
   # -------------------------------------------------------------------
  @@ -945,7 +945,7 @@
   #services.PoolService.pool.capacity.org.apache.turbine.services.rundata.DefaultTurbineRunData=512
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  F A C T O R Y  S E R V I C E
   #
   # -------------------------------------------------------------------
  @@ -1007,12 +1007,30 @@
   url.case.folding=lower
   
   # -------------------------------------------------------------------
  -# 
  +#
  +#  S U B S Y S T E M S
  +#
  +# -------------------------------------------------------------------
  +# Subsystems implementing the lifecycle interfaces can be loaded,
  +# configured and initialized by Turbine
  +# -------------------------------------------------------------------
  +
  +#subsystem.name = torque
  +#subsystem.name = fulcrum
  +
  +#subsystem.torque.classname = org.apache.torque.Torque
  +#subsystem.torque.config = /WEB-INF/conf/Torque.properties
  +
  +#subsystem.fulcrum.classname = org.apache.fulcrum.TurbineServices
  +#subsystem.fulcrum.config = /WEB-INF/conf/Fulcrum.properties
  +
  +# -------------------------------------------------------------------
  +#
   #  A D D I T I O N A L  P R O P E R T I E S
   #
   # -------------------------------------------------------------------
  -# The full path name to an additional properties file. Properties in 
  -# this file will be included in this property set. Duplicate name 
  +# The full path name to an additional properties file. Properties in
  +# this file will be included in this property set. Duplicate name
   # values will be replaced, so be careful.
   #
   # Default: none
  
  
  
  1.8       +81 -63    jakarta-turbine-2/conf/TurbineResources.properties
  
  Index: TurbineResources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/conf/TurbineResources.properties,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TurbineResources.properties	27 Nov 2001 15:33:51 -0000	1.7
  +++ TurbineResources.properties	8 Feb 2002 15:05:25 -0000	1.8
  @@ -1,15 +1,15 @@
   # -------------------------------------------------------------------
  -# $Id: TurbineResources.properties,v 1.7 2001/11/27 15:33:51 henning Exp $
  +# $Id: TurbineResources.properties,v 1.8 2002/02/08 15:05:25 mpoeschl Exp $
   #
   # This is the configuration file for Turbine.
   #
  -# Note that strings containing "," (comma) characters must backslash 
  +# Note that strings containing "," (comma) characters must backslash
   # escape the comma (i.e. '\,')
   #
   # -------------------------------------------------------------------
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  L O G S
   #
   # -------------------------------------------------------------------
  @@ -75,7 +75,7 @@
   services.LoggingService.remote.level=INFO
   
   # An example configuration for sending error reports as email with Log4Java
  -# notes: 
  +# notes:
   # * uses 'mail.server' as SMTP server to send mail through
   # * log4j will send the email when an ERROR is logged, with
   #   'buffer.size' previous (non-ERROR) logs included in the email
  @@ -89,8 +89,8 @@
   services.LoggingService.email.level=INFO
   
   # -------------------------------------------------------------------
  -# 
  -#  M A I L  S E R V E R 
  +#
  +#  M A I L  S E R V E R
   #
   # -------------------------------------------------------------------
   # Your mail server for outgoing email.
  @@ -104,7 +104,7 @@
   # SMTP-From header for your outgoing messages
   #
   # All failed delivery messages will be returned to this address.
  -# If unset, these messages will be sent to the address in the 
  +# If unset, these messages will be sent to the address in the
   # From header (standard behaviour)
   #
   # Default: null
  @@ -113,7 +113,7 @@
   mail.smtp.from=
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  M O D U L E  C A C H I N G
   #
   # -------------------------------------------------------------------
  @@ -136,7 +136,7 @@
   scheduledjob.cache.size=10
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  M O D U L E  P A C K A G E S
   #
   # -------------------------------------------------------------------
  @@ -155,7 +155,7 @@
   module.packages=org.apache.turbine.modules
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  D A T A B A S E  S E T T I N G S
   #
   # -------------------------------------------------------------------
  @@ -191,7 +191,7 @@
   
   database.connectionWaitTimeout=10000
   
  -# The interval (in milliseconds) between which the PoolBrokerService logs 
  +# The interval (in milliseconds) between which the PoolBrokerService logs
   # the status of it's ConnectionPools.
   #
   # Default: No logging = 0 = 0 * 1000
  @@ -220,7 +220,7 @@
   database.idbroker.prefetch=true
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  F R A M E W O R K  S E T T I N G S
   #
   # -------------------------------------------------------------------
  @@ -238,13 +238,13 @@
   
   # This is the default screen to show to people when they first access
   # the system. Specify one of the template screens such as VelocityScreen
  -# to use a template system. 
  +# to use a template system.
   #
   # Default: Login
   
   screen.homepage=
   
  -# This is the template that is shown on an incorrect login attempt. 
  +# This is the template that is shown on an incorrect login attempt.
   # Setting this property will override any value of screen.login specfied
   # below.
   #
  @@ -260,8 +260,8 @@
   
   screen.login=
   
  -# This is the template that is used by the respective Template based 
  -# ErrorScreen for displaying the error. If you are not using a Template based 
  +# This is the template that is used by the respective Template based
  +# ErrorScreen for displaying the error. If you are not using a Template based
   # ErrorScreen, then this is ignored.
   #
   # Default: /Error.vm
  @@ -317,7 +317,7 @@
   action.accesscontroller=AccessController
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  J N D I  C O N T E X T S
   #
   # -------------------------------------------------------------------
  @@ -343,7 +343,7 @@
   # context.name.java.naming.factory.initial=com.sun.jndi.rmi.registry.RegistryContextFactory
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  P E E R S
   #
   # -------------------------------------------------------------------
  @@ -356,11 +356,11 @@
   database.maps.builder=org.apache.turbine.util.db.map.TurbineMapBuilder
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  M E S S A G E S
   #
   # -------------------------------------------------------------------
  -# Note that strings containing "," (comma) characters must backslash 
  +# Note that strings containing "," (comma) characters must backslash
   # escape the comma (i.e. '\,')
   
   # The message that can be displayed before a user logs in.
  @@ -381,7 +381,7 @@
   logout.message=Thank you for using the system. Please come back soon.
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  S E C U R E  S O C K E T S  L A Y E R
   #
   # -------------------------------------------------------------------
  @@ -394,7 +394,7 @@
   use.ssl=true
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  S E R V I C E S
   #
   # -------------------------------------------------------------------
  @@ -452,7 +452,7 @@
   # -------------------------------------------------------------------
   # Default implementations of base interfaces for request processing.
   # Additional configurations can be defined by using other keys
  -# in the place of the <default> key.  
  +# in the place of the <default> key.
   # -------------------------------------------------------------------
   
   services.RunDataService.default.run.data=org.apache.turbine.services.rundata.DefaultTurbineRunData
  @@ -471,11 +471,11 @@
   services.GlobalCacheService.cache.check.frequency = 5000
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  A S S E M B L E R  B R O K E R  S E R V I C E
   #
   # -------------------------------------------------------------------
  -# A list of AssemblerFactory classes that will be registered 
  +# A list of AssemblerFactory classes that will be registered
   # with TurbineAssemblerBrokerService
   # -------------------------------------------------------------------
   
  @@ -488,7 +488,7 @@
   services.AssemblerBrokerService.scheduledjob=org.apache.turbine.services.assemblerbroker.util.java.JavaScheduledJobFactory
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  T E M P L A T E  S E R V I C E
   #
   # -------------------------------------------------------------------
  @@ -502,7 +502,7 @@
   services.TemplateService.screen.cache.size=50
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  P U L L  S E R V I C E
   #
   # -------------------------------------------------------------------
  @@ -510,7 +510,7 @@
   # that works in conjuction with the Turbine Pull Model API.
   # -------------------------------------------------------------------
   
  -# This determines whether the non-request tools are refreshed 
  +# This determines whether the non-request tools are refreshed
   # on each request (request tools aren't ever, because they're
   # instantiated for the request only anyway).
   services.PullService.tools.per.request.refresh=true
  @@ -542,7 +542,7 @@
   # Then:
   #
   # tool.ui.skin = default
  -# 
  +#
   # configures the value of "skin" for the "ui" tool.
   #
   # Tools are accessible in all templates by the <id> given
  @@ -563,13 +563,13 @@
   #               be threadsafe.
   #
   #   session:    tool is instantiated once for each user session, and is
  -#               stored in the user's temporary hashtable. Tool should be 
  +#               stored in the user's temporary hashtable. Tool should be
   #               threadsafe.
   #
   #   persistent: tool is instantitated once for each use session, and
   #               is stored in the user's permanent hashtable. This means
   #               for a logged in user the tool will be persisted in the
  -#               user's objectdata. Tool should be threadsafe and 
  +#               user's objectdata. Tool should be threadsafe and
   #               Serializable.
   #
   # Defaults: none
  @@ -594,14 +594,14 @@
   tool.ui.skin=default
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  V E L O C I T Y  S E R V I C E
   #
   # -------------------------------------------------------------------
   
   # The location of Velocity configuration file, relative to webapp root
   # These properties will override the default properties set by Velocity.
  -# You should specify the path to the templates directories as well as 
  +# You should specify the path to the templates directories as well as
   # the path to the log file and they should also be relative to webapp root
   
   services.VelocityService.template.extension=vm
  @@ -628,7 +628,7 @@
   services.VelocityService.classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  J S P  S E R V I C E
   #
   # -------------------------------------------------------------------
  @@ -645,7 +645,7 @@
   services.JspService.buffer.size = 8192
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  W E B M A C R O  S E R V I C E
   #
   # the webmacro-service is deprecated. you should use velocity instead!
  @@ -679,7 +679,7 @@
   services.WebMacroService.templates.provider=org.apache.turbine.services.webmacro.TurbineTemplateProvider
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  F R E E M A R K E R  S E R V I C E
   #
   # the freemarker-service is deprecated. you should use velocity instead!
  @@ -694,7 +694,7 @@
   services.FreeMarkerService.templates=/templates
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  U P L O A D  S E R V I C E
   #
   # -------------------------------------------------------------------
  @@ -721,7 +721,7 @@
   services.UploadService.size.threshold=10240
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  L O C A L I Z A T I O N  S E R V I C E
   #
   # -------------------------------------------------------------------
  @@ -741,30 +741,30 @@
   # locale.default.charset=
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  M I M E T Y P E  S E R V I C E
   #
   # -------------------------------------------------------------------
   
  -# This property specifies a file containing mappings between MIME 
  +# This property specifies a file containing mappings between MIME
   # content types and the corresponding file name extensions. The
  -# service itself contains a hardcoded set of most common mappings. 
  -# The file must use the same syntax as the mime.types file of 
  -# the Apache Server, i.e. 
  +# service itself contains a hardcoded set of most common mappings.
  +# The file must use the same syntax as the mime.types file of
  +# the Apache Server, i.e.
   # <mimetype> <ext1> <ext2>...
   #
   #services.MimeTypeService.mime.types=/WEB-INF/conf/mime.types
   
  -# This property specifies a file containing mappings between locales 
  -# and the corresponding character encodings. The service itself 
  -# contains a hardcoded set of most common mappings. 
  -# The file should use the Java property file syntax, i.e. 
  +# This property specifies a file containing mappings between locales
  +# and the corresponding character encodings. The service itself
  +# contains a hardcoded set of most common mappings.
  +# The file should use the Java property file syntax, i.e.
   # <lang_country_variant>=<charset>
   #
   #services.MimeTypeService.charsets=/WEB-INF/conf/charset.properties
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  S C H E D U L E R  S E R V I C E
   #
   # -------------------------------------------------------------------
  @@ -778,15 +778,15 @@
   
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  S E C U R I T Y  S E R V I C E
   #
   # -------------------------------------------------------------------
   
   #
   # This is the class that implements the User interface.
  -# You want to override this setting only if you want your User 
  -# implementation to provide application specific addtional 
  +# You want to override this setting only if you want your User
  +# implementation to provide application specific addtional
   # functionality.
   #
   # Default: org.apache.turbine.om.security.TurbineUser
  @@ -796,7 +796,7 @@
   
   #
   # This setting is DBSecurityService specific - this class is consulted for the names
  -# of the columns in the users' tables for the purpose of creating join queries. 
  +# of the columns in the users' tables for the purpose of creating join queries.
   # If you use your own User implementation in conjunction with DBSecurityService,
   # it's peer class must implement org.apache.turbine.om.security.peer.UserPeer interface,
   # and you need to specify the name of the peer class here.
  @@ -850,7 +850,7 @@
   #services.SecurityService.ldap.provider=com.sun.jndi.ldap.LdapCtxFactory
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  X M L R P C  S E R V I C E
   #
   # -------------------------------------------------------------------
  @@ -868,8 +868,8 @@
   
   services.XmlRpcService.port=12345
   
  -# If any classes are specified here, the Service will create an 
  -# instance of them here and start up a listener on the specified 
  +# If any classes are specified here, the Service will create an
  +# instance of them here and start up a listener on the specified
   # port.
   #
   # Note that the handlers demonstrated are not very useful.  You
  @@ -895,7 +895,7 @@
   services.XmlRpcService.handler.file = org.apache.turbine.services.xmlrpc.util.FileHandler
   services.XmlRpcService.paranoid = false
   services.XmlRpcService.acceptClient = 192.168.1.*
  -services.XmlRpcService.denyClient = 
  +services.XmlRpcService.denyClient =
   
   # Do we want a secure server
   
  @@ -916,10 +916,10 @@
   
   services.XmlRpcService.secure.server.option.javax.net.ssl.keyStore = /tmp/keystore
   services.XmlRpcService.secure.server.option.javax.net.ssl.keyStoreType = jks
  -services.XmlRpcService.secure.server.option.javax.net.ssl.keyStorePassword = password 
  +services.XmlRpcService.secure.server.option.javax.net.ssl.keyStorePassword = password
   services.XmlRpcService.secure.server.option.javax.net.ssl.trustStore = /tmp/truststore
   services.XmlRpcService.secure.server.option.javax.net.ssl.trustStoreType = jks
  -services.XmlRpcService.secure.server.option.javax.net.ssl.trustStorePassword = password 
  +services.XmlRpcService.secure.server.option.javax.net.ssl.trustStorePassword = password
   
   services.XmlRpcService.secure.server.option.sun.ssl.keymanager.type = SunX509
   services.XmlRpcService.secure.server.option.sun.ssl.trust.manager.type = SunX509
  @@ -930,7 +930,7 @@
   services.XmlRpcService.secure.server.option.java.security.debug = none
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  P O O L  S E R V I C E
   #
   # -------------------------------------------------------------------
  @@ -945,7 +945,7 @@
   #services.PoolService.pool.capacity.org.apache.turbine.services.rundata.DefaultTurbineRunData=512
   
   # -------------------------------------------------------------------
  -# 
  +#
   #  F A C T O R Y  S E R V I C E
   #
   # -------------------------------------------------------------------
  @@ -1007,12 +1007,30 @@
   url.case.folding=lower
   
   # -------------------------------------------------------------------
  -# 
  +#
  +#  S U B S Y S T E M S
  +#
  +# -------------------------------------------------------------------
  +# Subsystems implementing the lifecycle interfaces can be loaded,
  +# configured and initialized by Turbine
  +# -------------------------------------------------------------------
  +
  +#subsystem.name = torque
  +#subsystem.name = fulcrum
  +
  +#subsystem.torque.classname = org.apache.torque.Torque
  +#subsystem.torque.config = /WEB-INF/conf/Torque.properties
  +
  +#subsystem.fulcrum.classname = org.apache.fulcrum.TurbineServices
  +#subsystem.fulcrum.config = /WEB-INF/conf/Fulcrum.properties
  +
  +# -------------------------------------------------------------------
  +#
   #  A D D I T I O N A L  P R O P E R T I E S
   #
   # -------------------------------------------------------------------
  -# The full path name to an additional properties file. Properties in 
  -# this file will be included in this property set. Duplicate name 
  +# The full path name to an additional properties file. Properties in
  +# this file will be included in this property set. Duplicate name
   # values will be replaced, so be careful.
   #
   # Default: none
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>