portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raph...@apache.org
Subject cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf TurbineResources.properties jetspeed-config.jcfg
Date Tue, 03 Apr 2001 00:28:20 GMT
raphael     01/04/02 17:28:20

  Modified:    webapp/WEB-INF/conf TurbineResources.properties
                        jetspeed-config.jcfg
  Log:
  - update Turbine dependency to TDKa13
  
  Revision  Changes    Path
  1.26      +201 -54   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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- TurbineResources.properties	2001/03/08 16:28:14	1.25
  +++ TurbineResources.properties	2001/04/03 00:28:17	1.26
  @@ -1,7 +1,11 @@
   # -------------------------------------------------------------------
  -# $Id: TurbineResources.properties,v 1.25 2001/03/08 16:28:14 ingo Exp $
  +# $Id: TurbineResources.properties,v 1.26 2001/04/03 00:28:17 raphael Exp $
   #
   # This is the configuration file for Turbine.
  +#
  +# Note that strings containing "," (comma) characters must backslash 
  +# escape the comma (i.e. '\,')
  +#
   # -------------------------------------------------------------------
   
   # -------------------------------------------------------------------
  @@ -13,12 +17,7 @@
   # 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: The full path name to a log file. If not given, 
  -#                   commands to log events using org.apache.turbine.util.Log 
  -#                   will be ignored.   If it isn't a full path, the 
  -#                   log system will attempt to make the path relative to 
  -#                   the ServletConfig Context root, ie: webapps/[APP] 
  -#                   that Turbine is currently running under.
  +# destination.file: A path relative to the web app root
   # -------------------------------------------------------------------
   
   services.TurbineLoggingService.facilities=system,debug,security
  @@ -26,13 +25,13 @@
   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.destination.file=/WEB-INF/log/jetspeed.log
   services.TurbineLoggingService.system.className=org.apache.turbine.services.logging.FileLogger
   services.TurbineLoggingService.system.level=INFO
   
   # A facility for debuging 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.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
  @@ -40,13 +39,13 @@
   # 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.destination.file=/WEB-INF/log/jetspeed.log
   services.TurbineLoggingService.security.className=org.apache.turbine.services.logging.FileLogger
   services.TurbineLoggingService.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.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
  @@ -66,6 +65,18 @@
   
   
   # -------------------------------------------------------------------
  +# 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 
  +# From header (standard behaviour)
  +#
  +# Default: null
  +# -------------------------------------------------------------------
  +
  +mail.smtp.from=
  +
  +# -------------------------------------------------------------------
   # 
   #  M O D U L E  C A C H I N G
   #
  @@ -232,12 +243,6 @@
   
   #default.doctype=Html40Transitional
   
  -# The default location for ImageServer to find its files.
  -#
  -# Default: d:/asdfasdfasdf
  -
  -screen.ImageServer.root=d:/asdfasdfasdf
  -
   # This is the default action to log a user in.
   # Default: LoginUser
   
  @@ -278,7 +283,7 @@
   # for VM templating use: JetspeedVelocityPage
   
   #page.default=DefaultPage
  -#page.default=JetspeedVelocityPage
  +#page.default=JetspeedTemplatePage
   page.default=JetspeedJspPage
   
   # -------------------------------------------------------------------
  @@ -325,6 +330,8 @@
   #  M E S S A G E S
   #
   # -------------------------------------------------------------------
  +# Note that strings containing "," (comma) characters must backslash 
  +# escape the comma (i.e. '\,')
   
   # The message that can be displayed before a user logs in.
   
  @@ -367,29 +374,47 @@
   # 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.TurbineTemplateService.classname=org.apache.jetspeed.services.template.JetspeedTemplateService
  -#services.TurbineTemplateService.classname=org.apache.turbine.services.template.TurbineTemplateService
   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.DBSecurityService
  +services.TurbineSecurityService.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.TurbinePullService.classname=org.apache.turbine.services.pull.TurbinePullService
  +services.TurbinePullService.classname=org.apache.turbine.services.pull.TurbinePullService
  +#services.IntakeService.classname=org.apache.turbine.services.intake.TurbineIntakeService
   
   # Turn on the appropriate template service.
  -#services.TurbineWebMacroService.classname=org.apache.turbine.services.webmacro.TurbineWebMacroService
   services.TurbineVelocityService.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
   
  +
   # -------------------------------------------------------------------
  +#
  +#  R U N   D A T A   S E R V I C E
  +#
  +# -------------------------------------------------------------------
  +# Default implementations of base interfaces for request processing.
  +# Additional configurations can be defined by using other keys
  +# 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
  +
  +# -------------------------------------------------------------------
   # 
   #  A S S E M B L E R  B R O K E R  S E R V I C E
   #
  @@ -404,7 +429,7 @@
   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.TurbineAssemblerBrokerService.scheduledjob=org.apache.turbine.util.assemblerbroker.java.JavaScheduledJobFactory
   
   # -------------------------------------------------------------------
   # 
  @@ -479,43 +504,79 @@
   # These are the properties for the Pull Service, the service
   # that works in conjuction with the Turbine Pull Model API.
   # -------------------------------------------------------------------
  -
  -services.TurbinePullService.toolbox.per.request.refresh=true
  -
  -# This is the name of the handle by which to access
  -# the global ToolBox from within your templates.
  -# 
  -# Default: toolbox
   
  -toolbox.handle = toolbox
  +# 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
   
  -# These are tools that are placed in the so called
  -# ToolBox. These tools will be made available to all your
  +# These are tools that are placed in the context by the service
  +# These tools will be made available to all your
   # templates. You list the tools in the following way:
   #
  -# toolbox.tool.<id>.<load-order> = <classname>
  +# tool.<scope>.<id> = <classname>
   #
  +# <scope>      is the tool scope: global, request, session
  +#              or persistent (see below for more details)
  +# <id>         is the name of the tool in the context
  +#
   # For example:
  +#
  +# tool.global.ui    = org.apache.turbine.util.pull.UIManager
  +# tool.global.mm    = org.apache.turbine.util.pull.MessageManager
  +# 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) 
  +#
  +# tool.session.basket = org.sample.tools.ShoppingBasket
  +# tool.persistent.ui  = org.sample.tools.PersistentUIManager
   #
  -# toolbox.tool.ui.1 = org.apache.turbine.util.pull.UIManager
  -# toolbox.tool.mm.2 = org.apache.turbine.util.pull.MessageManager
   #
   # Tools are accessible in all templates by the <id> given
   # to the tool. So for the above listings the UIManager would
  -# be available as $toolbox.ui and the MessageManager would
  -# be available as $toolbox.mm. This is assuming that you
  -# are using the default toolbox.handle of "toolbox"
  +# be available as $ui, the MessageManager as $mm, the TemplateLink
  +# as $link and the TemplatePageAttributes as $page.
   #
  +# Scopes:
  +#   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
  +#               be threadsafe.
  +#
  +#   session:    tool is instantiated once for each user session, and is
  +#               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 
  +#               Serializable.
  +#
   # 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.clink=org.apache.jetspeed.util.template.ContentTemplateLink
  +tool.request.jlink=org.apache.jetspeed.util.template.JetspeedTemplateLink
  +tool.request.jetspeed=org.apache.jetspeed.util.template.JetspeedTool
   
  -toolbox.tool.ui.1=org.apache.turbine.util.pull.UIManager
  +#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
  +
   # 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.
   
  -toolbox.ui.skin=default
  +tool.ui.skin=default
   
   # -------------------------------------------------------------------
   # 
  @@ -527,9 +588,25 @@
   # 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=/WEB-INF/log/velocity.log
  -services.TurbineVelocityService.templates=WEB-INF/templates/vm
  +#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
  +
   
   
   # -------------------------------------------------------------------
  @@ -661,13 +738,24 @@
   services.TurbineSecurityService.user.class=org.apache.turbine.om.security.TurbineUser
   
   #
  +# 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. 
  +# 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.
  +#
  +# Defalut: org.apache.turbine.om.security.peer.TurbineUserPeer
  +#
  +services.TurbineSecurityService.userPeer.class=org.apache.turbine.om.security.peer.TurbineUserPeer
  +
  +#
   # This is the class that implements UserManager interface.
   # Override this setting if you want your User information stored
   # on a different medium (LADP directory is a good example).
   # Default implementation uses Peers and a relational database .
   #
   
  -services.TurbineSecurityService.user.manager=org.apache.turbine.services.security.DBUserManager
  +services.TurbineSecurityService.user.manager=org.apache.turbine.services.security.db.DBUserManager
   
   #
   # This is used by the SecurityService to make the password checking
  @@ -692,13 +780,23 @@
   
   services.TurbineSecurityService.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
  +
   # -------------------------------------------------------------------
   # 
   #  X M L R P C  S E R V I C E
   #
   # -------------------------------------------------------------------
  -
  -#
   # This property specifies which class should be used to parse
   # xml for XmlRpc functionality.
   #
  @@ -707,16 +805,13 @@
   
   services.TurbineXmlRpcService.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
   
  -#
   # If any classes are specified here, the Service will create an 
   # instance of them here and start up a listener on the specified 
   # port.
  @@ -730,14 +825,66 @@
   # the default handler for the service
   #
   # Default: no classes are specified by default
  -#
   
   #services.TurbineXmlRpcService.handler.$default=java.util.Hashtable
   #services.TurbineXmlRpcService.handler.stringhandler=java.lang.String
   
  +# The following properties allow the transfer of data between
  +# separate Turbine applications running on different servers.
  +# This allows B2B type behavior such as sending database
  +# updates in the form of XML or whatever type of data
  +# 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 = 
  +
  +# -------------------------------------------------------------------
  +# 
  +#  P O O L  S E R V I C E
  +#
  +# -------------------------------------------------------------------
  +
  +# Default capacity of pools of the Object pooling service.
  +#
  +# Default: 128
  +services.TurbinePoolService.pool.capacity = 128
  +
  +# Class specific capacities used instead of the default if specified.
  +#
  +#services.TurbinePoolService.pool.capacity.org.apache.turbine.services.rundata.DefaultTurbineRunData=512
  +
  +# -------------------------------------------------------------------
  +# 
  +#  F A C T O R Y  S E R V I C E
  +#
  +# -------------------------------------------------------------------
  +
  +# A comma separated list of classloaders (very optional)
  +#
  +# Example: org.foo.bar.MyClassLoader, org.ack.joe.YourClassLoader
  +#
  +#services.TurbineFactoryService.class.loaders=
  +
  +# Customized factories to be used instead of the default factory.
  +# E.g. to instantiate XML parsers, SSL sockets, etc., which require
  +# specific instantiation not supported by the default factory.
  +# The property name is prefixed with "factory" followed by the
  +# name of the production class. The value is the class name of
  +# the factory implementing the Factory interface. The factory
  +# will be instantiated by using the service itself.
  +#
  +# 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
  +
   #--------------------------------------------------------------------
   #
  -# P A R M E T E R  P A R S E R
  +# P A R A M E T E R  P A R S E R
   #
   #--------------------------------------------------------------------
   #
  
  
  
  1.13      +8 -8      jakarta-jetspeed/webapp/WEB-INF/conf/jetspeed-config.jcfg
  
  Index: jetspeed-config.jcfg
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/jetspeed-config.jcfg,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- jetspeed-config.jcfg	2001/01/30 05:40:17	1.12
  +++ jetspeed-config.jcfg	2001/04/03 00:28:18	1.13
  @@ -4,7 +4,7 @@
   
       <!-- 
       Jetspeed Configuration 
  -    Version: $Id: jetspeed-config.jcfg,v 1.12 2001/01/30 05:40:17 taylor Exp $
  +    Version: $Id: jetspeed-config.jcfg,v 1.13 2001/04/03 00:28:18 raphael Exp $
       Authors:  Kevin A. Burton (burton@apache.org)
           See proposal: /docs/proposals/0003.txt    
       -->
  @@ -174,17 +174,17 @@
   
           </portlet-entry>
       
  -         <portlet-entry type="abstract" name="WebPagePortlet">	
  +         <portlet-entry type="abstract" name="WebPagePortlet">  
               <classname>org.apache.jetspeed.portal.portlets.WebPagePortlet</classname>
            </portlet-entry>
   
            <portlet-entry type="ref" parent="WebPagePortlet" name="JavaWeb">
  -         	   <url>http://www.javasoft.com/</url>
  -          	   <parameter name="dont_remove_applet" value="yes" />
  -         	   <meta-info>
  -         		  <title>JavaSoft</title>
  -         		  <description>JavaSoft</description>
  -         	   </meta-info>
  +             <url>http://www.javasoft.com/</url>
  +               <parameter name="dont_remove_applet" value="yes" />
  +             <meta-info>
  +              <title>JavaSoft</title>
  +              <description>JavaSoft</description>
  +             </meta-info>
            </portlet-entry>
   
       </portlet-registry>    
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message