You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/06/14 17:15:01 UTC
cvs commit: jakarta-turbine/conf/master TurbineResources.master
jvanzyl 01/06/14 08:15:01
Modified: conf/master TurbineResources.master
Log:
- fully qualified services properties, new logging config.
Revision Changes Path
1.78 +121 -150 jakarta-turbine/conf/master/TurbineResources.master
Index: TurbineResources.master
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/master/TurbineResources.master,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- TurbineResources.master 2001/06/08 18:40:10 1.77
+++ TurbineResources.master 2001/06/14 15:14:59 1.78
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.master,v 1.77 2001/06/08 18:40:10 jvanzyl Exp $
+# $Id: TurbineResources.master,v 1.78 2001/06/14 15:14:59 jvanzyl Exp $
#
# This is the configuration file for Turbine.
#
@@ -10,83 +10,34 @@
# -------------------------------------------------------------------
#
-# L O G S
+# L O G G I N G
#
# -------------------------------------------------------------------
-# This is the configuration for the logging system. In most cases
-# you don't need to modify anything. However, if you wish to add more
-# facilities or modify the existing settings, then you can do so.
-#
-# destination.file: A path relative to the web app root
-# -------------------------------------------------------------------
-services.LoggingService.facilities=system,debug,security
-services.LoggingService.default=system
-services.LoggingService.loggingConfig=org.apache.turbine.services.logging.PropertiesLoggingConfig
-
-# A facility for system logging.
-services.LoggingService.system.destination.file=@TURBINE_LOG@
-services.LoggingService.system.className=org.apache.turbine.services.logging.FileLogger
-services.LoggingService.system.level=INFO
-
-# A facility for the scheduler service
-# To disable started/stopped messages set the level to ERROR
-services.LoggingService.scheduler.destination.file=@TURBINE_LOG@
-services.LoggingService.scheduler.className=org.apache.turbine.services.logging.FileLogger
-services.LoggingService.scheduler.level=INFO
-
-# A facility for debugging applications. Messages will go both
-# to the log file and the server console.
-services.LoggingService.debug.destination.file=@TURBINE_LOG@
-services.LoggingService.debug.destination.console=true
-services.LoggingService.debug.className=org.apache.turbine.services.logging.FileLogger
-services.LoggingService.debug.level=INFO
-
-# A facility for SQL query logging
-# To enable SQL query logging, set the system and sql log level to DEBUG
-services.LoggingService.sql.destination.file=@TURBINE_LOG@
-services.LoggingService.sql.className=org.apache.turbine.services.logging.FileLogger
-services.LoggingService.sql.level=ERROR
-
-# A facility for security audit. NOTE! As of 23 Jan 2001
-# Turbine does not have any standard security auditing
-# functionality. It's up to your application.
-services.LoggingService.security.destination.file=@TURBINE_LOG@
-services.LoggingService.security.className=org.apache.turbine.services.logging.FileLogger
-services.LoggingService.security.level=INFO
-
-# An example configuration for automatic log rotation using Log4Java
-# This will keep the log file size under 1MB and save up to 5 backup copies
-services.LoggingService.rotation.destination.file=@TURBINE_LOG@
-services.LoggingService.rotation.file.size=1048576
-services.LoggingService.rotation.file.backups=5
-services.LoggingService.rotation.className=org.apache.turbine.services.logging.Log4JavaLogger
-services.LoggingService.rotation.level=INFO
-
-# An example configuration for using *NIX syslogd with Log4Java
-services.LoggingService.syslog.destination.syslogd.host=my.syslog.server.com
-services.LoggingService.syslog.destination.syslogd.facility=LOG_DAEMON
-services.LoggingService.syslog.className=org.apache.turbine.services.logging.Log4JavaLogger
-services.LoggingService.syslog.level=INFO
-
-# An example configuration for using remote Log4Java server
-services.LoggingService.remote.destination.remote.host=my.remote.server.com
-services.LoggingService.remote.destination.remote.port=1099
-services.LoggingService.remote.className=org.apache.turbine.services.logging.Log4JavaLogger
-services.LoggingService.remote.level=INFO
-
-# An example configuration for sending error reports as email with Log4Java
-# 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
-# * configured to log to a file as well otherwise stacktraces are lost
-services.LoggingService.email.destination.file=@TURBINE_LOG@
-services.LoggingService.email.destination.email.from=root@localhost
-services.LoggingService.email.destination.email.to=root@localhost
-services.LoggingService.email.destination.email.subject=Turbine Error Report
-services.LoggingService.email.destination.email.buffer.size=512
-services.LoggingService.email.className=org.apache.turbine.services.logging.Log4JavaLogger
-services.LoggingService.email.level=INFO
+# We use Log4J for all Turbine logging and we embed the log4j
+# properties within our application configuration.
+# -------------------------------------------------------------------
+
+# This first category is required and the category
+# must be named 'default'. This is used for all logging
+# where an explicit category is not specified.
+
+log4j.category.default = INFO, default
+log4j.appender.default = org.apache.log4j.FileAppender
+log4j.appender.default.file = ${webapp}/logs/turbine.log
+log4j.appender.default.layout = org.apache.log4j.PatternLayout
+log4j.appender.default.layout.conversionPattern = %5r %-5p [%t] %c{2} - %m%n
+log4j.appender.default.append = false
+
+# This category is used in the BasePeer class. All
+# SQL generated will be logged if the category
+# priority is set to DEBUG
+
+log4j.category.sql = DEBUG, sql
+log4j.appender.sql = org.apache.log4j.FileAppender
+log4j.appender.sql.file = ${webapp}/logs/sql.log
+log4j.appender.sql.layout = org.apache.log4j.PatternLayout
+log4j.appender.sql.layout.conversionPattern = %5r %-5p [%t] %c{2} - %m%n
+log4j.appender.sql.append = false
# -------------------------------------------------------------------
#
@@ -156,63 +107,6 @@
# -------------------------------------------------------------------
#
-# D A T A B A S E S E T T I N G S
-#
-# -------------------------------------------------------------------
-# These are your database settings. Look in the
-# org.apache.turbine.util.db.pool.* packages for more information.
-# The default driver for Turbine is for MySQL.
-#
-# The parameters to connect to the default database. You MUST
-# configure these properly.
-# -------------------------------------------------------------------
-
-database.@DATABASE_DEFAULT@.driver=@DATABASE_DRIVER@
-database.@DATABASE_DEFAULT@.url=@DATABASE_URL@
-database.@DATABASE_DEFAULT@.username=@DATABASE_USER@
-database.@DATABASE_DEFAULT@.password=@DATABASE_PASSWORD@
-
-# The number of database connections to cache per ConnectionPool
-# instance (specified per database).
-
-database.@DATABASE_DEFAULT@.maxConnections=3
-
-# The amount of time (in milliseconds) that database connections will be
-# cached (specified per database).
-#
-# Default: one hour = 60 * 60 * 1000
-
-database.@DATABASE_DEFAULT@.expiryTime=3600000
-
-# The amount of time (in milliseconds) a connection request will have to wait
-# before a time out occurs and an error is thrown.
-#
-# Default: ten seconds = 10 * 1000
-
-database.connectionWaitTimeout=10000
-
-# The interval (in milliseconds) between which the PoolBrokerService logs
-# the status of it's ConnectionPools.
-#
-# Default: No logging = 0 = 0 * 1000
-
-database.logInterval=0
-
-# These are the supported JDBC drivers and their associated Turbine
-# adaptor. These properties are used by the DBFactory. You can add
-# all the drivers you want here.
-
-database.adaptor=@DATABASE_ADAPTOR@
-database.adaptor.@DATABASE_ADAPTOR@=@DATABASE_DRIVER@
-
-# Determines if the quantity column of the IDBroker's id_table should
-# be increased automatically if requests for ids reaches a high
-# volume.
-
-database.idbroker.cleverquantity=true
-
-# -------------------------------------------------------------------
-#
# F R A M E W O R K S E T T I N G S
#
# -------------------------------------------------------------------
@@ -402,7 +296,6 @@
# that depend on other services during initialization.
# -------------------------------------------------------------------
services.ResourceService.classname=org.apache.turbine.services.resources.TurbineResourceService
-services.LoggingService.classname=org.apache.turbine.services.logging.TurbineLoggingService
services.FactoryService.classname=org.apache.turbine.services.factory.TurbineFactoryService
services.PoolService.classname=org.apache.turbine.services.pool.TurbinePoolService
services.RunDataService.classname=org.apache.turbine.services.rundata.TurbineRunDataService
@@ -416,8 +309,7 @@
services.UniqueIdService.classname=org.apache.turbine.services.uniqueid.TurbineUniqueIdService
services.UploadService.classname=org.apache.turbine.services.upload.TurbineUploadService
services.SecurityService.classname=org.apache.turbine.services.security.db.DBSecurityService
-services.PoolBrokerService.classname=org.apache.turbine.services.db.TurbinePoolBrokerService
-services.MapBrokerService.classname=org.apache.turbine.services.db.TurbineMapBrokerService
+services.DatabaseService.classname=org.apache.turbine.services.db.TurbineDatabaseService
services.PullService.classname=org.apache.turbine.services.pull.TurbinePullService
#services.IntakeService.classname=org.apache.turbine.services.intake.TurbineIntakeService
services.TemplateService.classname=org.apache.turbine.services.template.TurbineTemplateService
@@ -427,6 +319,65 @@
@TEMPLATE_SERVICE@
# -------------------------------------------------------------------
+#
+# D A T A B A S E S E R V I C E
+#
+# -------------------------------------------------------------------
+# These are your database settings. Look in the
+# org.apache.turbine.util.db.pool.* packages for more information.
+# The default driver for Turbine is for MySQL.
+#
+# The parameters to connect to the default database. You MUST
+# configure these properly.
+# -------------------------------------------------------------------
+
+services.DatabaseService.database.default=@DATABASE_DEFAULT@
+
+services.DatabaseService.database.@DATABASE_DEFAULT@.driver=@DATABASE_DRIVER@
+services.DatabaseService.database.@DATABASE_DEFAULT@.url=@DATABASE_URL@
+services.DatabaseService.database.@DATABASE_DEFAULT@.username=@DATABASE_USER@
+services.DatabaseService.database.@DATABASE_DEFAULT@.password=@DATABASE_PASSWORD@
+
+# The number of database connections to cache per ConnectionPool
+# instance (specified per database).
+
+services.DatabaseService.database.@DATABASE_DEFAULT@.maxConnections=3
+
+# The amount of time (in milliseconds) that database connections will be
+# cached (specified per database).
+#
+# Default: one hour = 60 * 60 * 1000
+
+services.DatabaseService.database.@DATABASE_DEFAULT@.expiryTime=3600000
+
+# The amount of time (in milliseconds) a connection request will have to wait
+# before a time out occurs and an error is thrown.
+#
+# Default: ten seconds = 10 * 1000
+
+services.DatabaseService.database.connectionWaitTimeout=10000
+
+# The interval (in milliseconds) between which the PoolBrokerService logs
+# the status of it's ConnectionPools.
+#
+# Default: No logging = 0 = 0 * 1000
+
+services.DatabaseService.database.logInterval=0
+
+# These are the supported JDBC drivers and their associated Turbine
+# adaptor. These properties are used by the DBFactory. You can add
+# all the drivers you want here.
+
+services.DatabaseService.database.adaptor=@DATABASE_ADAPTOR@
+services.DatabaseService.database.adaptor.@DATABASE_ADAPTOR@=@DATABASE_DRIVER@
+
+# Determines if the quantity column of the IDBroker's id_table should
+# be increased automatically if requests for ids reaches a high
+# volume.
+
+services.DatabaseService.database.idbroker.cleverquantity=true
+
+# -------------------------------------------------------------------
#
# R U N D A T A S E R V I C E
#
@@ -449,7 +400,7 @@
# Interval at which the cache will be checked. The default is
# 5000ms or 5 seconds.
-services.GlobalCacheService.cache.check.frequency = 5000
+services.GlobalCacheService.cacheCheckFrequency = 5000
# -------------------------------------------------------------------
#
@@ -555,22 +506,26 @@
#
# Defaults: none
-tool.request.link=org.apache.turbine.util.template.TemplateLink
-tool.request.page=org.apache.turbine.util.template.TemplatePageAttributes
-tool.request.content=org.apache.turbine.util.ContentURI
-tool.request.flux=org.apache.turbine.flux.tools.FluxTool
+services.PullService.tool.request.link=org.apache.turbine.util.template.TemplateLink
+services.PullService.tool.request.page=org.apache.turbine.util.template.TemplatePageAttributes
+services.PullService.tool.request.content=org.apache.turbine.util.ContentURI
+services.PullService.tool.request.flux=org.apache.turbine.flux.tools.FluxTool
# These are intake tools.
-#tool.request.om=org.apache.turbine.om.OMTool
-#tool.request.intake=org.apache.turbine.services.intake.IntakeTool
+#services.PullService.tool.request.om=org.apache.turbine.om.OMTool
+#services.PullService.tool.request.intake=org.apache.turbine.services.intake.IntakeTool
-tool.global.ui=org.apache.turbine.services.pull.util.UIManager
+services.PullService.tool.global.ui=org.apache.turbine.services.pull.util.UIManager
+services.PullService.earlyInit = true
+
# The UI Manager will allow you to skin your Turbine
# application using simple properties files that are
# located in the WEBAPP/resources/ui/skins/ directory
# hierarchy.
+// This is a remain thorn in our side. How to provide properties
+// for pull tools elegantly. This is not good.
tool.ui.skin=default
# -------------------------------------------------------------------
@@ -607,6 +562,8 @@
services.VelocityService.classpath.resource.loader.description = Velocity Classpath Resource Loader
services.VelocityService.classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+services.VelocityService.earlyInit = true
+
# -------------------------------------------------------------------
#
# J S P S E R V I C E
@@ -624,6 +581,8 @@
services.JspService.templates = @TEMPLATE_PATH@
services.JspService.buffer.size = 8192
+services.JspService.earlyInit = true
+
# -------------------------------------------------------------------
#
# W E B M A C R O S E R V I C E
@@ -693,7 +652,7 @@
# The maximum size of a request that will have it's elements cached in
# memory by TurbineUploadService class.
#
-services.UploadService.size.threshold=10240
+services.UploadService.size.threshold=0
# -------------------------------------------------------------------
#
@@ -704,16 +663,16 @@
# Default ResourceBundle and language/country codes used by the
# TurbineLocalizationService.
#
-locale.default.bundle=@LOCALE_DEFAULT_BUNDLE@
-locale.default.language=@LOCALE_DEFAULT_LANGUAGE@
-locale.default.country=@LOCALE_DEFAULT_COUNTRY@
+services.LocalizationService.locale.default.bundle=@LOCALE_DEFAULT_BUNDLE@
+services.LocalizationService.locale.default.language=@LOCALE_DEFAULT_LANGUAGE@
+services.LocalizationService.locale.default.country=@LOCALE_DEFAULT_COUNTRY@
#
# This will set the charset= portion of the ContentType: header.
# Leave commented out unless you want to return stuff as a different
# charset.
#
-# locale.default.charset=
+# services.LocalizationService.locale.default.charset=
# -------------------------------------------------------------------
#
@@ -749,7 +708,7 @@
#
# Default = false
#
-scheduler.enabled=false
+services.SchedulerService.scheduler.enabled=false
# -------------------------------------------------------------------
@@ -872,6 +831,8 @@
services.XmlRpcService.acceptClient = 192.168.1.*
services.XmlRpcService.denyClient =
+services.XmlRpcService.earlyInit = true
+
# -------------------------------------------------------------------
#
# P O O L S E R V I C E
@@ -921,6 +882,16 @@
services.XSLTService.path = /path/to/stylesheets
services.XSLTService.cache = false
+
+# -------------------------------------------------------------------
+#
+# I N T A K E S E R V I C E
+#
+# -------------------------------------------------------------------
+# The location of the xml file specifying valid inputs
+# -------------------------------------------------------------------
+
+services.IntakeService.xml.path=@INTAKE_DESCRIPTOR@
#--------------------------------------------------------------------
#
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org