You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2001/06/04 09:56:46 UTC
cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf JetspeedResources.properties TurbineResources.properties admin.xreg
taylor 01/06/04 00:56:46
Modified: webapp/WEB-INF/conf JetspeedResources.properties
TurbineResources.properties admin.xreg
Log:
- update TR.p for new TDK
- added velocity support to customizer in admin.xreg
Revision Changes Path
1.30 +3 -2 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties
Index: JetspeedResources.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- JetspeedResources.properties 2001/05/28 16:10:34 1.29
+++ JetspeedResources.properties 2001/06/04 07:56:45 1.30
@@ -1,7 +1,7 @@
################################################################################
# Jetspeed Configuration
# Author: Kevin A. Burton (burton@apache.org)
-# $Id: JetspeedResources.properties,v 1.29 2001/05/28 16:10:34 raphael Exp $
+# $Id: JetspeedResources.properties,v 1.30 2001/06/04 07:56:45 taylor Exp $
################################################################################
# This is the main file you will need to configuration Jetspeed. If there are
# any secondary files they will be pointed to from this file.
@@ -391,6 +391,7 @@
# The webapp relative path to the root profiling directory
services.Profiler.root=/WEB-INF/psml
+services.Profiler.templateRoot=/WEB-INF/templates/vm
# Profiler-Root relative path to directory used for anonymous access
# leave blank for directly in the psml root directory
@@ -438,5 +439,5 @@
confirm.email.from=jetspeed@domain
confirm.email.name=Jetspeed
confirm.email.subject=Jetspeed registration
-confirm.email.enable=false
+confirm.email.enable=true
1.30 +311 -254 jakarta-jetspeed/webapp/WEB-INF/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/TurbineResources.properties,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- TurbineResources.properties 2001/04/26 11:14:00 1.29
+++ TurbineResources.properties 2001/06/04 07:56:45 1.30
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.properties,v 1.29 2001/04/26 11:14:00 ingo Exp $
+# $Id: TurbineResources.properties,v 1.30 2001/06/04 07:56:45 taylor Exp $
#
# This is the configuration file for Turbine.
#
@@ -19,50 +19,86 @@
#
# 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
-services.TurbineLoggingService.facilities=system,debug,security
-services.TurbineLoggingService.default=system
-services.TurbineLoggingService.loggingConfig=org.apache.turbine.services.logging.PropertiesLoggingConfig
-
# A facility for system logging.
-services.TurbineLoggingService.system.destination.file=/WEB-INF/log/jetspeed.log
-services.TurbineLoggingService.system.className=org.apache.turbine.services.logging.FileLogger
-services.TurbineLoggingService.system.level=INFO
+services.LoggingService.system.destination.file=/WEB-INF/log/jetspeed.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=/WEB-INF/log/jetspeed.log
+services.LoggingService.scheduler.className=org.apache.turbine.services.logging.FileLogger
+services.LoggingService.scheduler.level=INFO
-# A facility for debuging applications. Messages will go both
+# A facility for debugging applications. Messages will go both
# to the log file and the server console.
-services.TurbineLoggingService.debug.destination.file=/WEB-INF/log/jetspeed.log
-services.TurbineLoggingService.debug.destination.console=true
-services.TurbineLoggingService.debug.className=org.apache.turbine.services.logging.FileLogger
-services.TurbineLoggingService.debug.level=INFO
+services.LoggingService.debug.destination.file=/WEB-INF/log/jetspeed.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 level to DEBUG
+services.LoggingService.sql.destination.file=/WEB-INF/log/jetspeed.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.TurbineLoggingService.security.destination.file=/WEB-INF/log/jetspeed.log
-services.TurbineLoggingService.security.className=org.apache.turbine.services.logging.FileLogger
-services.TurbineLoggingService.security.level=INFO
+services.LoggingService.security.destination.file=/WEB-INF/log/jetspeed.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 bakup copies
-services.TurbineLoggingService.rotation.destination.file=/WEB-INF/log/jetspeed.log
-services.TurbineLoggingService.rotation.file.size=1048576
-services.TurbineLoggingService.rotation.file.backups=5
-services.TurbineLoggingService.rotation.className=org.apache.turbine.services.logging.Log4JavaLogger
-services.TurbineLoggingService.rotation.level=INFO
+# This will keep the log file size under 1MB and save up to 5 backup copies
+services.LoggingService.rotation.destination.file=/WEB-INF/log/jetspeed.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.TurbineLoggingService.syslog.destination.syslogd.host=my.syslog.server.com
-services.TurbineLoggingService.syslog.destination.syslogd.facility=LOG_DAEMON
-services.TurbineLoggingService.syslog.className=org.apache.turbine.services.logging.Log4JavaLogger
-services.TurbineLoggingService.syslog.level=INFO
+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.TurbineLoggingService.remote.destination.remote.host=my.remote.server.com
-services.TurbineLoggingService.remote.destination.remote.port=1099
-services.TurbineLoggingService.remote.className=org.apache.turbine.services.logging.Log4JavaLogger
-services.TurbineLoggingService.remote.level=INFO
+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=/WEB-INF/log/jetspeed.log
+services.LoggingService.email.destination.email.from=root@localhost
+services.LoggingService.email.destination.email.to=root@localhost
+services.LoggingService.email.destination.email.subject=Jetspeed 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
+
+# -------------------------------------------------------------------
+#
+# M A I L S E R V E R
+#
+# -------------------------------------------------------------------
+# Your mail server for outgoing email.
+#
+# Default: null
+# -------------------------------------------------------------------
+mail.server=
# -------------------------------------------------------------------
# SMTP-From header for your outgoing messages
@@ -116,7 +152,10 @@
# Default: org.apache.turbine.modules
# -------------------------------------------------------------------
-module.packages=org.apache.jetspeed.modules,org.apache.turbine.modules
+# These look like mostly ECS modules
+module.packages=org.apache.jetspeed.modules
+module.packages=org.apache.turbine.flux.modules
+module.packages=org.apache.turbine.modules
# -------------------------------------------------------------------
#
@@ -137,9 +176,16 @@
database.default.password=
# The number of database connections to cache per ConnectionPool
-# instance.
+# instance (specified per 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.maxConnections=3
+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.
@@ -148,13 +194,6 @@
database.connectionWaitTimeout=10000
-# The amount of time (in milliseconds) that database connections will be
-# cached.
-#
-# Default: one hour = 60 * 60 * 1000
-
-database.expiryTime=3600000
-
# The interval (in milliseconds) between which the PoolBrokerService logs
# the status of it's ConnectionPools.
#
@@ -177,47 +216,48 @@
# -------------------------------------------------------------------
#
-# T E M P L A T E S E T T I N G S
+# F R A M E W O R K S E T T I N G S
#
# -------------------------------------------------------------------
-# These are variables to set if you're using a template system
-# (Velocity, WebMacro, FreeMarker, etc.) with Turbine.
+# These are settings that control the behaviour of the framework,
+# such as determining whether a template system is in use, what
+# the default templates and screens are and session handling settings.
# -------------------------------------------------------------------
# Used to set the template homepage if you are using a template
# layout.
#
-# Default: /index.wm
+# Default: /Index.vm
-#template.homepage=Home.vm
+template.homepage=/Home.vm
+#template.homepage=/Home.jsp
# This is the default screen to show to people when they first access
-# the system. You can override this by specifying module.packages to
-# include your own modules.
+# the system. Specify one of the template screens such as VelocityScreen
+# to use a template system.
#
# Default: Login
-screen.homepage=Home
+#screen.homepage=Home
-# 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.
#
-# Default: Login
+# Default: Login.vm
+#dst template.login=/Login.vm
template.login=Login.vm
# This is the page that is shown on an incorrect login attempt. It is
-# referenced in the LoginUser action
+# referenced in the LoginUser action. Note that it will only be used if
+# a login template has not been specified (see template.login above).
#
# Default: Login
+#dst screen.login=
screen.login=Login
-# This is the default error screen.
-#
-# Default: Error
-
-screen.error=Error
-
# 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.
@@ -225,9 +265,16 @@
# Default: /Error.vm
# for JSP templating use: Error.jsp
# for Velocity templating use: Error.vm
+
+#template.error=Error.jsp
+template.error=/Error.vm
+
+# This is the default error screen.
+#
+# Default: VelocityErrorScreen
-template.error=Error.jsp
-#template.error=Error.vm
+#dst screen.error=VelocityErrorScreen
+screen.error=Error
# This is the screen that is displayed when the user's web page is in
# an invalid state.
@@ -243,52 +290,36 @@
#
# Default: ignored if not set to some value.
-#default.doctype=Html40Transitional
+default.doctype=Html40Transitional
# This is the default action to log a user in.
-# Default: LoginUser
+#dst action.login=LoginUser
action.login=JLoginUser
+# This is the default action to log a user out.
+
+action.logout=LogoutUser
+
# This is the default action to validate whether or not a session is
# valid. For example, if you want to make sure if a user has already
# logged in or not.
#
# Default: SessionValidator
-#action.sessionvalidator=sessionvalidator.TemplateSessionValidator
+#dst action.sessionvalidator=sessionvalidator.TemplateSessionValidator
action.sessionvalidator=JetspeedSessionValidator
+# This is the timeout in seconds for sessions. If left commented out, the
+# servlet container's default timeout will be left as is.
+
+# session.timeout=1800
+
# This is the default action that builds up the AccessControlList for
# the individual users session.
-#
-# Default: AccessController
action.accesscontroller=AccessController
-# This is the default layout to apply.
-#
-# Default: DefaultLayout
-# for JSP templating use: JetspeedJspLayout
-# for VM templating use: VelocityOnlyLayout
-
-#layout.default=JetspeedLayout
-#layout.default=VelocityOnlyLayout
-layout.default=JetspeedJspLayout
-
-#
-# This is the default page module. You probably do not want to modify
-# this.
-#
-# Default: DefaultPage
-# for JSP templating use: JetspeedJspPage
-# for VM templating use: JetspeedVelocityPage
-
-#page.default=DefaultPage
-#page.default=JetspeedTemplatePage
-#page.default=JetspeedVelocityPage
-page.default=JetspeedJspPage
-
# -------------------------------------------------------------------
#
# J N D I C O N T E X T S
@@ -376,32 +407,37 @@
#
# To specify properties of a service use the following syntax:
# service.[name].[property]=[value]
-# -------------------------------------------------------------------
-services.TurbineResourceService.classname=org.apache.turbine.services.resources.TurbineResourceService
-services.TurbineLoggingService.classname=org.apache.turbine.services.logging.TurbineLoggingService
-services.TurbineFactoryService.classname=org.apache.turbine.services.factory.TurbineFactoryService
-services.TurbinePoolService.classname=org.apache.turbine.services.pool.TurbinePoolService
-services.TurbineRunDataService.classname=org.apache.turbine.services.rundata.TurbineRunDataService
-services.TurbineServletService.classname=org.apache.turbine.services.servlet.TurbineServletService
-services.TurbineAssemblerBrokerService.classname=org.apache.turbine.services.assemblerbroker.TurbineAssemblerBrokerService
-services.TurbineLocalizationService.classname=org.apache.turbine.services.localization.TurbineLocalizationService
-services.TurbineGlobalCacheService.classname=org.apache.turbine.services.cache.TurbineGlobalCacheService
-services.TurbineSchedulerService.classname=org.apache.turbine.services.schedule.TurbineSchedulerService
-#services.TurbineXmlRpcService.classname=org.apache.turbine.services.xmlrpc.TurbineXmlRpcService
-services.TurbineUniqueIdService.classname=org.apache.turbine.services.uniqueid.TurbineUniqueIdService
-services.TurbineUploadService.classname=org.apache.turbine.services.upload.TurbineUploadService
-services.TurbineSecurityService.classname=org.apache.turbine.services.security.db.DBSecurityService
+#
+# The order that these services is listed is important! The
+# order that is stated here is the order in which the services
+# will be initialized. Keep this is mind if you have services
+# 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
+services.ServletService.classname=org.apache.turbine.services.servlet.TurbineServletService
+services.AssemblerBrokerService.classname=org.apache.turbine.services.assemblerbroker.TurbineAssemblerBrokerService
+services.LocalizationService.classname=org.apache.turbine.services.localization.TurbineLocalizationService
+services.MimeTypeService.classname=org.apache.turbine.services.mimetype.TurbineMimeTypeService
+services.GlobalCacheService.classname=org.apache.turbine.services.cache.TurbineGlobalCacheService
+services.SchedulerService.classname=org.apache.turbine.services.schedule.TurbineSchedulerService
+#services.XmlRpcService.classname=org.apache.turbine.services.xmlrpc.TurbineXmlRpcService
+services.UniqueIdService.classname=org.apache.turbine.services.uniqueid.TurbineUniqueIdService
+services.UploadService.classname=org.apache.turbine.services.upload.TurbineUploadService
+services.SecurityService.classname=org.apache.jetspeed.services.security.JetspeedDBSecurityService
services.PoolBrokerService.classname=org.apache.turbine.services.db.TurbinePoolBrokerService
services.MapBrokerService.classname=org.apache.turbine.services.db.TurbineMapBrokerService
-services.TurbinePullService.classname=org.apache.turbine.services.pull.TurbinePullService
+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
+#services.XSLTService.classname=org.apache.turbine.services.xslt.TurbineXSLTService
# Turn on the appropriate template service.
-services.TurbineVelocityService.classname=org.apache.turbine.services.velocity.TurbineVelocityService
+services.VelocityService.classname=org.apache.turbine.services.velocity.TurbineVelocityService
services.JspService.classname=org.apache.turbine.services.jsp.TurbineJspService
-#services.TurbineTemplateService.classname=org.apache.turbine.services.template.TurbineTemplateService
-services.TurbineTemplateService.classname=org.apache.jetspeed.services.template.JetspeedTemplateService
-
# -------------------------------------------------------------------
#
@@ -413,11 +449,22 @@
# in the place of the <default> key.
# -------------------------------------------------------------------
-services.TurbineRunDataService.default.run.data=org.apache.turbine.services.rundata.DefaultTurbineRunData
-services.TurbineRunDataService.default.parameter.parser=org.apache.turbine.util.parser.DefaultParameterParser
-services.TurbineRunDataService.default.cookie.parser=org.apache.turbine.util.parser.DefaultCookieParser
+services.RunDataService.default.run.data=org.apache.turbine.services.rundata.DefaultTurbineRunData
+services.RunDataService.default.parameter.parser=org.apache.turbine.util.parser.DefaultParameterParser
+services.RunDataService.default.cookie.parser=org.apache.turbine.util.parser.DefaultCookieParser
# -------------------------------------------------------------------
+#
+# C A C H E S E R V I C E
+#
+# -------------------------------------------------------------------
+
+# Interval at which the cache will be checked. The default is
+# 5000ms or 5 seconds.
+
+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
#
@@ -426,13 +473,13 @@
# with TurbineAssemblerBrokerService
# -------------------------------------------------------------------
-services.TurbineAssemblerBrokerService.screen=org.apache.turbine.util.assemblerbroker.java.JavaScreenFactory
-#services.TurbineAssemblerBrokerService.screen=org.apache.turbine.util.assemblerbroker.python.PythonScreenFactory
-services.TurbineAssemblerBrokerService.action=org.apache.turbine.util.assemblerbroker.java.JavaActionFactory
-services.TurbineAssemblerBrokerService.layout=org.apache.turbine.util.assemblerbroker.java.JavaLayoutFactory
-services.TurbineAssemblerBrokerService.page=org.apache.turbine.util.assemblerbroker.java.JavaPageFactory
-services.TurbineAssemblerBrokerService.navigation=org.apache.turbine.util.assemblerbroker.java.JavaNavigationFactory
-services.TurbineAssemblerBrokerService.scheduledjob=org.apache.turbine.util.assemblerbroker.java.JavaScheduledJobFactory
+services.AssemblerBrokerService.screen=org.apache.turbine.services.assemblerbroker.util.java.JavaScreenFactory
+#services.AssemblerBrokerService.screen=org.apache.turbine.services.assemblerbroker.util.python.PythonScreenFactory
+services.AssemblerBrokerService.action=org.apache.turbine.services.assemblerbroker.util.java.JavaActionFactory
+services.AssemblerBrokerService.layout=org.apache.turbine.services.assemblerbroker.util.java.JavaLayoutFactory
+services.AssemblerBrokerService.page=org.apache.turbine.services.assemblerbroker.util.java.JavaPageFactory
+services.AssemblerBrokerService.navigation=org.apache.turbine.services.assemblerbroker.util.java.JavaNavigationFactory
+services.AssemblerBrokerService.scheduledjob=org.apache.turbine.services.assemblerbroker.util.java.JavaScheduledJobFactory
# -------------------------------------------------------------------
#
@@ -444,61 +491,11 @@
#
# Defaults: layout=2, navigation=10, screen=50
-services.TurbineTemplateService.layout.cache.size=2
-services.TurbineTemplateService.navigation.cache.size=10
-services.TurbineTemplateService.screen.cache.size=50
-
-# The extension that will be used when constructing default template
-# names. E.g. if set to wm the service will assume layout names of
-# "default.wm".
-#
-# Default: html
-# for JSP templating use: jsp
-# for Velocity templating use: vm
-
-#services.TurbineTemplateService.default.extension=vm
-services.TurbineTemplateService.default.extension=jsp
-
-# The location of the templates. This should be the same locations as
-# given for the template engine specific template path property. For
-# jsdk 2.2 this can be relative to the webapp root.
-#
-# Default: /templates
-# for JSP templating use: /WEB-INF/templates/jsp
-# for Velocity templating use: /WEB-INF/templates/vm
+services.TemplateService.layout.cache.size=2
+services.TemplateService.navigation.cache.size=10
+services.TemplateService.screen.cache.size=50
+services.TemplateService.default.extension=vm
-#services.TurbineTemplateService.template.path=/WEB-INF/templates/vm
-services.TurbineTemplateService.template.path=/WEB-INF/templates/jsp
-
-# This is the default navigation module after none by the name Default
-# have been located. Some possible values are WebMacroSiteNavigation
-# or BaseFreeMarkerNavigation.
-#
-# Default: none
-# for JSP templating use: BaseJspNavigation
-# for Velocity templating use: VelocityNavigation
-
-#services.TurbineTemplateService.default.navigation=VelocityNavigation
-services.TurbineTemplateService.default.navigation=BaseJspNavigation
-
-# This is the default screen module after none by the name Default
-# have been located. Some possible values are WebMacroSiteScreen or
-# BaseFreeMarkerScreen.
-#
-# Default: none
-# for JSP templating use: BaseJspScreen
-# for Velocity templating use: VelocityScreen
-
-#services.TurbineTemplateService.default.screen=VelocityScreen
-services.TurbineTemplateService.default.screen=BaseJspScreen
-
-# This is the default layout template after none by the name
-# default.{default.extension} have been located.
-#
-# Default: /default.{default.extension}
-
-services.TurbineTemplateService.default.layout.template=/default
-
# -------------------------------------------------------------------
#
# P U L L S E R V I C E
@@ -511,7 +508,7 @@
# 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.TurbinePullService.tools.per.request.refresh=true
+services.PullService.tools.per.request.refresh=true
# These are tools that are placed in the context by the service
# These tools will be made available to all your
@@ -523,6 +520,13 @@
# or persistent (see below for more details)
# <id> is the name of the tool in the context
#
+# You can configure the tools in this way:
+# tool.<id>.<parameter> = <value>
+#
+# So if you find "global", "request", "session" or "persistent" as second
+# part, it is a configuration to put a tool into the toolbox, else it is a
+# tool specific configuration.
+#
# For example:
#
# tool.global.ui = org.apache.turbine.util.pull.UIManager
@@ -530,20 +534,24 @@
# tool.request.link = org.apache.turbine.util.template.TemplateLink
# tool.request.page = org.apache.turbine.util.template.TemplatePageAttributes
#
-# (the next two examples specify mythical classes)
+# Then:
#
-# tool.session.basket = org.sample.tools.ShoppingBasket
-# tool.persistent.ui = org.sample.tools.PersistentUIManager
-#
+# tool.ui.skin = default
+#
+# configures the value of "skin" for the "ui" tool.
#
# Tools are accessible in all templates by the <id> given
# to the tool. So for the above listings the UIManager would
# be available as $ui, the MessageManager as $mm, the TemplateLink
# as $link and the TemplatePageAttributes as $page.
#
+# You should avoid using tool names called "global", "request",
+# "session" or "persistent" because of clashes with the possible Scopes.
+#
# Scopes:
-# global: tool is instantiated once and that instance is available
-# to all templates for all requests. Tool must be threadsafe.
+#
+# global: tool is instantiated once and that instance is available
+# to all templates for all requests. Tool must be threadsafe.
#
# request: tool is instantiated once for each request (although the
# PoolService is used to recycle instances). Tool need not
@@ -568,9 +576,6 @@
tool.request.jlink=org.apache.jetspeed.util.template.JetspeedTemplateLink
tool.request.jetspeed=org.apache.jetspeed.util.template.JetspeedTool
-#tool.request.om=org.apache.turbine.om.OMTool
-#tool.request.intake=org.apache.turbine.services.intake.IntakeTool
-
#tool.global.ui=org.apache.turbine.services.pull.util.UIManager
tool.global.config=org.apache.jetspeed.services.resources.JetspeedResources
@@ -591,49 +596,83 @@
# These properties will override the default properties set by Velocity.
# 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.TurbineVelocityService.properties=/WEB-INF/conf/velocity.properties
-#services.TurbineVelocityService.log=/logs/velocity.log
-#services.TurbineVelocityService.templates=/templates
-
-services.TurbineVelocityService.runtime.log=/WEB-INF/log/velocity.log
-#services.TurbineVelocityService.template.encoding=
-services.TurbineVelocityService.velocimacro.library = GlobalMacros.vm
-
-services.TurbineVelocityService.resource.loader = file
-services.TurbineVelocityService.file.resource.loader.description = Velocity File Resource Loader
-services.TurbineVelocityService.file.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
-services.TurbineVelocityService.file.resource.loader.path = /WEB-INF/templates/vm
-services.TurbineVelocityService.file.resource.loader.cache = false
-services.TurbineVelocityService.file.resource.loader.modificationCheckInterval = 2
-
-services.TurbineVelocityService.resource.loader = classpath
-services.TurbineVelocityService.classpath.resource.loader.description = Velocity Classpath Resource Loader
-services.TurbineVelocityService.classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+#default.page = JetspeedVelocityPage
+services.VelocityService.template.extension=vm
+#dst services.VelocityService.default.page = VelocityPage
+services.VelocityService.default.page = JetspeedVelocityPage
+services.VelocityService.default.screen=VelocityScreen
+services.VelocityService.default.layout = VelocityOnlyLayout
+#services.VelocityService.default.layout = VelocityDirectResponseLayout
+services.VelocityService.default.navigation=VelocityNavigation
+services.VelocityService.default.error.screen = VelocityErrorScreen
+services.VelocityService.default.layout.template = /default.vm
+
+services.VelocityService.runtime.log=/WEB-INF/log/velocity.log
+#services.VelocityService.input.encoding=UTF-8
+services.VelocityService.velocimacro.library = GlobalMacros.vm
+
+services.VelocityService.resource.loader = file
+services.VelocityService.file.resource.loader.description = Velocity File Resource Loader
+services.VelocityService.file.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
+services.VelocityService.file.resource.loader.path = /WEB-INF/templates/vm, /WEB-INF/templates/flux
+#services.VelocityService.file.resource.loader.path = /templates/vm, /templates/flux
+services.VelocityService.file.resource.loader.cache = false
+services.VelocityService.file.resource.loader.modificationCheckInterval = 2
+
+services.VelocityService.resource.loader = classpath
+services.VelocityService.classpath.resource.loader.description = Velocity Classpath Resource Loader
+services.VelocityService.classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
# -------------------------------------------------------------------
#
+# J S P S E R V I C E
+#
+# -------------------------------------------------------------------
+
+services.JspService.template.extension=jsp
+services.JspService.default.page = JetspeedJspPage
+services.JspService.default.screen=BaseJspScreen
+services.JspService.default.layout = JetspeedJspLayout
+services.JspService.default.navigation=BaseJspNavigation
+services.JspService.default.error.screen = JspErrorScreen
+services.JspService.default.layout.template = /default.jsp
+
+#services.JspService.templates =/WEB-INF/templates/jsp
+services.JspService.templates =/WEB-INF/templates/jsp,/WEB-INF/templates/flux
+services.JspService.buffer.size = 8192
+
+# -------------------------------------------------------------------
+#
# W E B M A C R O S E R V I C E
#
# -------------------------------------------------------------------
+services.WebMacroService.template.extension=wm
+services.WebMacroService.default.page = WebMacroSitePage
+services.WebMacroService.default.screen=WebMacroSiteScreen
+services.WebMacroService.default.layout = WebMacroSiteLayout
+services.WebMacroService.default.navigation=WebMacroSiteNavigation
+services.WebMacroService.default.error.screen = WebMacroSiteErrorScreen
+services.WebMacroService.default.layout.template = /Default.wm
+
# The location of WebMacro configuration file, relative to webapp
# root.
-services.TurbineWebMacroService.properties=/WEB-INF/conf/WebMacro.properties
+services.WebMacroService.properties=/WEB-INF/conf/WebMacro.properties
# The path where WebMacro will look for templates, relative to webapp
# root. Use your system's path separator to specify multiple paths.
-services.TurbineWebMacroService.templates=/WEB-INF/templates/wm
+services.WebMacroService.templates=/templates/app,/templates/flux
# The class that will act as a template provider in webmacro. We can
# use default class from WebMacro (template path above is pushed into
# WebMacro configuration mechanism, so that class can pick it up), or
# some other custom class
-services.TurbineWebMacroService.templates.provider=org.apache.turbine.services.webmacro.TurbineTemplateProvider
+services.WebMacroService.templates.provider=org.apache.turbine.services.webmacro.TurbineTemplateProvider
# -------------------------------------------------------------------
#
@@ -646,48 +685,34 @@
#
# Default: /templates
-services.TurbineFreeMarkerService.templates=/templates
+services.FreeMarkerService.templates=/templates
# -------------------------------------------------------------------
#
-# J S P S E R V I C E
-#
-# -------------------------------------------------------------------
-# Path to the JSP templates and the dafault JSP layout
-# -------------------------------------------------------------------
-
-services.JspService.templates=/WEB-INF/templates/jsp
-
-services.JspService.screen.error.NotLoggedIn=ErrorNotLoggedIn
-
-services.JspService.buffer.size=8192
-
-# -------------------------------------------------------------------
-#
# U P L O A D S E R V I C E
#
# -------------------------------------------------------------------
-# Wheter the files should be automaticaly picked up by
+# Whether the files should be automatically picked up by
# ParameterParser.
-services.TurbineUploadService.automatic=false
+services.UploadService.automatic=true
#
# The directory where files will be temporarily stored.
#
-services.TurbineUploadService.repository=${webapp.dir}/WEB-INF/tmp
+services.UploadService.repository=.
#
# The maximum size of a request that will be processed.
#
-services.TurbineUploadService.size.max=1048576
+services.UploadService.size.max=1048576
#
# The maximum size of a request that will have it's elements cached in
# memory by TurbineUploadService class.
#
-services.TurbineUploadService.size.threshold=10240
+services.UploadService.size.threshold=10240
# -------------------------------------------------------------------
#
@@ -706,12 +731,35 @@
# 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=
+
+# -------------------------------------------------------------------
+#
+# M I M E T Y P E S E R V I C E
+#
+# -------------------------------------------------------------------
-locale.default.charset=UTF-8
+# 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.
+# <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.
+# <lang_country_variant>=<charset>
+#
+#services.MimeTypeService.charsets=/WEB-INF/conf/charset.properties
+
# -------------------------------------------------------------------
#
-# S C H E U D U L E R S E R V I C E
+# S C H E D U L E R S E R V I C E
#
# -------------------------------------------------------------------
@@ -738,7 +786,7 @@
# Default: org.apache.turbine.om.security.TurbineUser
#
-services.TurbineSecurityService.user.class=org.apache.turbine.om.security.TurbineUser
+services.SecurityService.user.class=org.apache.turbine.om.security.TurbineUser
#
# This setting is DBSecurityService specific - this class is consulted for the names
@@ -749,7 +797,7 @@
#
# Defalut: org.apache.turbine.om.security.peer.TurbineUserPeer
#
-services.TurbineSecurityService.userPeer.class=org.apache.turbine.om.security.peer.TurbineUserPeer
+services.SecurityService.userPeer.class=org.apache.turbine.om.security.peer.TurbineUserPeer
#
# This is the class that implements UserManager interface.
@@ -758,7 +806,7 @@
# Default implementation uses Peers and a relational database .
#
-services.TurbineSecurityService.user.manager=org.apache.turbine.services.security.db.DBUserManager
+services.SecurityService.user.manager=org.apache.turbine.services.security.db.DBUserManager
#
# This is used by the SecurityService to make the password checking
@@ -771,7 +819,7 @@
# Default: false
#
-services.TurbineSecurityService.secure.passwords=false
+services.SecurityService.secure.passwords=false
#
# This property lets you choose what digest algorithm will be used
@@ -781,19 +829,19 @@
# Default: SHA
#
-services.TurbineSecurityService.secure.passwords.algorithm=SHA
+services.SecurityService.secure.passwords.algorithm=SHA
# Configuration for the LDAP Security Service implementation
-#services.TurbineSecurityService.ldap.security.athentication=simple
-#services.TurbineSecurityService.ldap.port=<LDAP PORT>
-#services.TurbineSecurityService.ldap.host=<LDAP HOST>
-#services.TurbineSecurityService.ldap.admin.username=<ADMIN USERNAME>
-#services.TurbineSecurityService.ldap.admin.password=<ADMIN PASSWORD>
-#services.TurbineSecurityService.ldap.user.basesearch=<SEARCH PATTERN>
-#services.TurbineSecurityService.ldap.user.search.filter=<SEARCH FILTER>
-#services.TurbineSecurityService.ldap.dn.attribute=userPrincipalName
-#services.TurbineSecurityService.ldap.provider=com.sun.jndi.ldap.LdapCtxFactory
+#services.SecurityService.ldap.security.athentication=simple
+#services.SecurityService.ldap.port=<LDAP PORT>
+#services.SecurityService.ldap.host=<LDAP HOST>
+#services.SecurityService.ldap.admin.username=<ADMIN USERNAME>
+#services.SecurityService.ldap.admin.password=<ADMIN PASSWORD>
+#services.SecurityService.ldap.user.basesearch=<SEARCH PATTERN>
+#services.SecurityService.ldap.user.search.filter=<SEARCH FILTER>
+#services.SecurityService.ldap.dn.attribute=userPrincipalName
+#services.SecurityService.ldap.provider=com.sun.jndi.ldap.LdapCtxFactory
# -------------------------------------------------------------------
#
@@ -804,16 +852,15 @@
# xml for XmlRpc functionality.
#
# Default: org.apache.xerces.parsers.SAXParser
-#
-services.TurbineXmlRpcService.parser=org.apache.xerces.parsers.SAXParser
+services.XmlRpcService.parser=org.apache.xerces.parsers.SAXParser
# This property specifies which port the server part of the XmlRpc
# should listen, if it is active.
#
# Default: 12345
-services.TurbineXmlRpcService.port=12345
+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
@@ -829,8 +876,8 @@
#
# Default: no classes are specified by default
-#services.TurbineXmlRpcService.handler.$default=java.util.Hashtable
-#services.TurbineXmlRpcService.handler.stringhandler=java.lang.String
+#services.XmlRpcService.handler.$default=java.util.Hashtable
+#services.XmlRpcService.handler.stringhandler=java.lang.String
# The following properties allow the transfer of data between
# separate Turbine applications running on different servers.
@@ -839,10 +886,10 @@
# that needs to be shared between Turbine applications
# running on separate servers.
-services.TurbineXmlRpcService.handler.file = org.apache.turbine.services.xmlrpc.util.FileHandler
-services.TurbineXmlRpcService.paranoid = false
-services.TurbineXmlRpcService.acceptClient = 192.168.1.*
-services.TurbineXmlRpcService.denyClient =
+services.XmlRpcService.handler.file = org.apache.turbine.services.xmlrpc.util.FileHandler
+services.XmlRpcService.paranoid = false
+services.XmlRpcService.acceptClient = 192.168.1.*
+services.XmlRpcService.denyClient =
# -------------------------------------------------------------------
#
@@ -853,11 +900,11 @@
# Default capacity of pools of the Object pooling service.
#
# Default: 128
-services.TurbinePoolService.pool.capacity = 128
+services.PoolService.pool.capacity = 128
# Class specific capacities used instead of the default if specified.
#
-#services.TurbinePoolService.pool.capacity.org.apache.turbine.services.rundata.DefaultTurbineRunData=512
+#services.PoolService.pool.capacity.org.apache.turbine.services.rundata.DefaultTurbineRunData=512
# -------------------------------------------------------------------
#
@@ -869,7 +916,7 @@
#
# Example: org.foo.bar.MyClassLoader, org.ack.joe.YourClassLoader
#
-#services.TurbineFactoryService.class.loaders=
+#services.FactoryService.class.loaders=
# Customized factories to be used instead of the default factory.
# E.g. to instantiate XML parsers, SSL sockets, etc., which require
@@ -881,9 +928,18 @@
#
# Examples:
#
-# services.TurbineFactoryService.factory.javax.xml.parsers.DocumentBuilder=org.foo.xml.DomBuilderFactory
-# services.TurbineFactoryService.factory.javax.xml.parsers.SAXParser=org.foo.xml.SaxParserFactory
-# services.TurbineFactoryService.factory.java.net.ServerSocket=org.foo.net.SslServerSocketFactory
+# services.FactoryService.factory.javax.xml.parsers.DocumentBuilder=org.foo.xml.DomBuilderFactory
+# services.FactoryService.factory.javax.xml.parsers.SAXParser=org.foo.xml.SaxParserFactory
+# services.FactoryService.factory.java.net.ServerSocket=org.foo.net.SslServerSocketFactory
+
+#--------------------------------------------------------------------
+#
+# X S L T S E R V I C E
+#
+#--------------------------------------------------------------------
+
+services.XSLTService.path = /path/to/stylesheets
+services.XSLTService.cache = false
#--------------------------------------------------------------------
#
@@ -912,4 +968,5 @@
# Default: none
# -------------------------------------------------------------------
-include=JetspeedResources.properties
\ No newline at end of file
+include = JetspeedResources.properties
+include = Flux.properties
\ No newline at end of file
1.5 +78 -79 jakarta-jetspeed/webapp/WEB-INF/conf/admin.xreg
Index: admin.xreg
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/admin.xreg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- admin.xreg 2001/05/31 17:14:00 1.4
+++ admin.xreg 2001/06/04 07:56:45 1.5
@@ -1,81 +1,80 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
+<?xml version="1.0" encoding="UTF-8"?>
<registry>
-
- <portlet-entry type="instance" name="Applications" hidden="true">
- <security role="user"/>
- <classname>org.apache.jetspeed.portal.portlets.ApplicationsPortlet</classname>
- </portlet-entry>
-
- <portlet-entry type="instance" name="PortletCustomizer" hidden="true">
- <security role="user"/>
- <classname>org.apache.jetspeed.portal.portlets.VelocityPortlet</classname>
- <parameter name="template" value="customizer-portlet"/>
- <parameter name="action" value="portlets.CustomizeAction"/>
- <meta-info>
- <title>Customizing portlet</title>
- </meta-info>
- </portlet-entry>
-
- <portlet-entry type="instance" name="HomepageCustomizer" hidden="true">
- <security role="user"/>
- <classname>org.apache.jetspeed.portal.portlets.customize.CustomizePortlet</classname>
- <!-- jsp location points to the customize.jsp which displays the customize page -->
- <parameter name="jsp_location" value="/dynamic/customizer/customize.jsp"/>
- <parameter name="customization_max_number" value="50"/>
- </portlet-entry>
-
- <portlet-entry type="instance" name="PortletInfoPortlet" hidden="true">
- <classname>org.apache.jetspeed.portal.portlets.PortletInfoPortlet</classname>
- <parameter name="thirdparty.portletrenderer.url" value="http://avantgo.com/mydevice/autoadd.html?max=300&depth=5&images=0&links=0&refresh=always&hours=2&dflags=127&hour=0&quarter=00&s=00"/>
- <parameter name="thirdparty.portletrenderer.caption" value="Add to Avantgo"/>
- <meta-info>
- <title>Portlet Information</title>
- <description>Provides some information about a portlet</description>
- </meta-info>
- </portlet-entry>
-
- <portlet-entry type="ref" parent="Velocity" name="Login" hidden="true">
- <parameter name="template" value="login" />
- <parameter name="action" value="portlets.Login" />
- <meta-info>
- <title>Login</title>
- <description>Login portlet</description>
- </meta-info>
- </portlet-entry>
-
- <!-- BEGIN ADMIN PORTLETS -->
-
- <portlet-entry type="instance" name="GlobalAdminPortlet" hidden="true">
- <security role="admin"/>
- <classname>org.apache.jetspeed.portal.portlets.admin.GlobalAdminPortlet</classname>
- </portlet-entry>
-
- <portlet-entry type="instance" name="JavaRuntimePortlet" hidden="true">
- <security role="admin"/>
- <classname>org.apache.jetspeed.portal.portlets.admin.JavaRuntimePortlet</classname>
- </portlet-entry>
-
- <portlet-entry type="instance" name="DaemonAdminPortlet" hidden="true">
- <security role="admin"/>
- <classname>org.apache.jetspeed.portal.portlets.admin.DaemonAdminPortlet</classname>
- </portlet-entry>
-
- <portlet-entry type="instance" name="JetspeedContentAdmin" hidden="true">
- <security role="admin"/>
- <classname>org.apache.jetspeed.portal.portlets.admin.JetspeedContentAdmin</classname>
- </portlet-entry>
-
- <portlet-entry type="instance" name="BadURLManagerPortlet" hidden="true">
- <security role="admin"/>
- <classname>org.apache.jetspeed.portal.portlets.admin.BadURLManagerPortlet</classname>
- </portlet-entry>
-
- <portlet-entry type="ref" parent="HTML" name="login" hidden="true">
- <url>/login.html</url>
- <meta-info>
- <title>Login</title>
- </meta-info>
- </portlet-entry>
-
+ <portlet-entry name="Applications" hidden="true" type="instance" application="false">
+ <classname>org.apache.jetspeed.portal.portlets.ApplicationsPortlet</classname>
+ <security role="user"/>
+ </portlet-entry>
+ <portlet-entry name="PortletCustomizer" hidden="true"
+ type="instance" application="false">
+ <classname>org.apache.jetspeed.portal.portlets.VelocityPortlet</classname>
+ <parameter name="template" value="customizer-portlet" hidden="false"/>
+ <parameter name="action" value="portlets.CustomizeAction" hidden="false"/>
+ <security role="user"/>
+ <meta-info>
+ <title>Customizing portlet</title>
+ </meta-info>
+ </portlet-entry>
+ <portlet-entry name="HomepageCustomizer" hidden="true"
+ type="instance" application="false">
+ <classname>org.apache.jetspeed.portal.portlets.customize.CustomizePortlet</classname>
+ <parameter name="jsp_location"
+ value="/dynamic/customizer/customize.jsp" hidden="false"/>
+ <parameter name="vm_location"
+ value="/portlets/HomePageCustomizer.vm" hidden="false"/>
+ <parameter name="customization_max_number" value="50" hidden="false"/>
+ <parameter name="template" value="vm" />
+ <security role="user"/>
+ </portlet-entry>
+ <portlet-entry name="PortletInfoPortlet" hidden="true"
+ type="instance" application="false">
+ <classname>org.apache.jetspeed.portal.portlets.PortletInfoPortlet</classname>
+ <parameter name="thirdparty.portletrenderer.url"
+ value="http://avantgo.com/mydevice/autoadd.html?max=300&depth=5&images=0&links=0&refresh=always&hours=2&dflags=127&hour=0&quarter=00&s=00" hidden="false"/>
+ <parameter name="thirdparty.portletrenderer.caption"
+ value="Add to Avantgo" hidden="false"/>
+ <meta-info>
+ <title>Portlet Information</title>
+ <description>Provides some information about a portlet</description>
+ </meta-info>
+ </portlet-entry>
+ <portlet-entry name="Login" hidden="true" type="ref"
+ parent="Velocity" application="false">
+ <parameter name="template" value="login" hidden="false"/>
+ <parameter name="action" value="portlets.Login" hidden="false"/>
+ <meta-info>
+ <title>Login</title>
+ <description>Login portlet</description>
+ </meta-info>
+ </portlet-entry>
+ <portlet-entry name="GlobalAdminPortlet" hidden="true"
+ type="instance" application="false">
+ <classname>org.apache.jetspeed.portal.portlets.admin.GlobalAdminPortlet</classname>
+ <security role="admin"/>
+ </portlet-entry>
+ <portlet-entry name="JavaRuntimePortlet" hidden="true"
+ type="instance" application="false">
+ <classname>org.apache.jetspeed.portal.portlets.admin.JavaRuntimePortlet</classname>
+ <security role="admin"/>
+ </portlet-entry>
+ <portlet-entry name="DaemonAdminPortlet" hidden="true"
+ type="instance" application="false">
+ <classname>org.apache.jetspeed.portal.portlets.admin.DaemonAdminPortlet</classname>
+ <security role="admin"/>
+ </portlet-entry>
+ <portlet-entry name="JetspeedContentAdmin" hidden="true"
+ type="instance" application="false">
+ <classname>org.apache.jetspeed.portal.portlets.admin.JetspeedContentAdmin</classname>
+ <security role="admin"/>
+ </portlet-entry>
+ <portlet-entry name="BadURLManagerPortlet" hidden="true"
+ type="instance" application="false">
+ <classname>org.apache.jetspeed.portal.portlets.admin.BadURLManagerPortlet</classname>
+ <security role="admin"/>
+ </portlet-entry>
+ <portlet-entry name="login" hidden="true" type="ref" parent="HTML" application="false">
+ <url>/login.html</url>
+ <meta-info>
+ <title>Login</title>
+ </meta-info>
+ </portlet-entry>
</registry>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org