svn commit: r1199015 - /turbine/core/trunk/conf/test/CompleteTurbineResources.properties

[tv...@apache.org]

Author: tv
Date: Mon Nov  7 23:39:51 2011
New Revision: 1199015

URL: http://svn.apache.org/viewvc?rev=1199015&view=rev
Log:
Remove reference to non-existing pull tool, cleanup. Thanks to Siegfried for the hint.

Modified:
    turbine/core/trunk/conf/test/CompleteTurbineResources.properties

Modified: turbine/core/trunk/conf/test/CompleteTurbineResources.properties
URL: http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/CompleteTurbineResources.properties?rev=1199015&r1=1199014&r2=1199015&view=diff
==============================================================================
--- turbine/core/trunk/conf/test/CompleteTurbineResources.properties (original)
+++ turbine/core/trunk/conf/test/CompleteTurbineResources.properties Mon Nov  7 23:39:51 2011
@@ -436,7 +436,7 @@ services.PullService.tools.resources.dir
 #
 # For example:
 #
-# tool.global.ui    = org.apache.turbine.util.pull.UIManager
+# tool.global.ui    = org.apache.turbine.util.pull.tools.UITool
 # tool.global.mm    = org.apache.turbine.util.pull.MessageManager
 # tool.request.link = org.apache.turbine.services.pull.tools.TemplateLink
 # tool.request.page = org.apache.turbine.util.template.TemplatePageAttributes
@@ -453,7 +453,7 @@ services.PullService.tools.resources.dir
 # 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.
+# or "session" because of clashes with the possible Scopes.
 #
 # Scopes:
 #
@@ -471,13 +471,6 @@ services.PullService.tools.resources.dir
 #   authorized: tool is instantiated once for each user session once the
 #               user logs in. After this, it is a normal session tool.
 #
-#   persistent: tool is instantitated once for each user session once
-#               the user logs in and is 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.services.pull.tools.TemplateLink
@@ -493,16 +486,14 @@ tool.request.dateFormatter=org.apache.tu
 tool.session.sessionData=org.apache.turbine.services.pull.util.SessionData
 
 # These are intake tools.
-# tool.request.om=org.apache.turbine.om.OMTool
 # tool.request.intake=org.apache.turbine.services.intake.IntakeTool
 
 # This is a tool that allows access to the scheduler service.
 # tool.request.scheduler=org.apache.turbine.services.SchedulerTool
 
+# This pull tool can be used to provide skins to an application
 tool.global.ui = org.apache.turbine.services.pull.tools.UITool
-## The following is the old deprecated version.  It is being added as uimanager
-## so that it can still be tested.
-tool.global.uimanager = org.apache.turbine.services.pull.util.UIManager
+
 ## These properties apply to both the old UIManager and the newer UIService
 tool.ui.dir.skin = /turbine-skins/
 tool.ui.dir.image = /turbine-images/
@@ -512,9 +503,9 @@ tool.ui.css = skins.css
 #
 # The content tool can put its URIs through the Servlet container,
 # which might attach things like the jsessionid even to URIs that
-# are not servered by the container.
+# are not served by the container.
 #
-# The default behaviour was not to put these through the container.
+# The default behavior was not to put these through the container.
 #
 # Set this to true if you need things like jsessionid attached to all
 # links generated from the $content pull tool.
@@ -525,7 +516,7 @@ tool.content.want.encoding = false
 # Both the link and the content tool normally return absolute URIs
 # You can change this by exchanging the tool classes but this is not
 # really recommended. Setting these properties to true allow you
-# to change the behaviour if you want only relative URIs (e.g. if you
+# to change the behavior if you want only relative URIs (e.g. if you
 # run behind a reverse proxy or a load balancer).
 #
 tool.content.want.relative = false