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/07/10 03:13:53 UTC
cvs commit: jakarta-turbine/conf/view velocity velocity-secure
jvanzyl 01/07/09 18:13:53
Modified: conf TurbineResources.properties
conf/master TurbineResources.master
conf/view velocity velocity-secure
Log:
- updating properties to reflect changes to templating
Revision Changes Path
1.123 +28 -34 jakarta-turbine/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/TurbineResources.properties,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- TurbineResources.properties 2001/06/28 17:39:17 1.122
+++ TurbineResources.properties 2001/07/10 01:13:43 1.123
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.properties,v 1.122 2001/06/28 17:39:17 jvanzyl Exp $
+# $Id: TurbineResources.properties,v 1.123 2001/07/10 01:13:43 jvanzyl Exp $
#
# This is the configuration file for Turbine.
#
@@ -143,7 +143,7 @@
#
# Default: /{ViewType}Error.vm
-template.error=/VelocityError.vm
+template.error=/Error.vm
# This is the default action to log a user in.
@@ -409,20 +409,6 @@
# -------------------------------------------------------------------
#
-# T E M P L A T E S E R V I C E
-#
-# -------------------------------------------------------------------
-
-# Roughly, the number of templates in each category.
-#
-# Defaults: layout=2, navigation=10, screen=50
-
-services.TemplateService.layout.cache.size=2
-services.TemplateService.navigation.cache.size=10
-services.TemplateService.screen.cache.size=50
-
-# -------------------------------------------------------------------
-#
# P U L L S E R V I C E
#
# -------------------------------------------------------------------
@@ -518,6 +504,26 @@
# -------------------------------------------------------------------
#
+# T E M P L A T E S E R V I C E
+#
+# -------------------------------------------------------------------
+
+# Roughly, the number of templates in each category.
+#
+# Defaults: layout=2, navigation=10, screen=50
+
+services.TemplateService.default.page = TemplatePage
+services.TemplateService.default.screen=TemplateScreen
+services.TemplateService.default.layout = TemplateLayout
+services.TemplateService.default.navigation=TemplateNavigation
+services.TemplateService.default.error.screen = Error
+
+services.TemplateService.layout.cache.size=2
+services.TemplateService.navigation.cache.size=10
+services.TemplateService.screen.cache.size=50
+
+# -------------------------------------------------------------------
+#
# V E L O C I T Y S E R V I C E
#
# -------------------------------------------------------------------
@@ -528,11 +534,7 @@
# the path to the log file and they should also be relative to webapp root
services.VelocityService.template.extension=vm
-services.VelocityService.default.page = VelocityPage
-services.VelocityService.default.screen=VelocityScreen
-services.VelocityService.default.layout = VelocityECSLayout
-services.VelocityService.default.navigation=VelocityNavigation
-services.VelocityService.default.error.screen = VelocityErrorScreen
+services.VelocityService.default.page.template = /Default.vm
services.VelocityService.default.layout.template = /Default.vm
services.VelocityService.runtime.log=/logs/velocity.log
@@ -542,7 +544,7 @@
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 = /templates/app
+services.VelocityService.file.resource.loader.path = ${template.path}
services.VelocityService.file.resource.loader.cache = false
services.VelocityService.file.resource.loader.modificationCheckInterval = 2
@@ -559,14 +561,10 @@
# -------------------------------------------------------------------
services.JspService.template.extension=jsp
-services.JspService.default.page = JspPage
-services.JspService.default.screen=BaseJspScreen
-services.JspService.default.layout = JspLayout
-services.JspService.default.navigation=BaseJspNavigation
-services.JspService.default.error.screen = JspErrorScreen
+services.JspService.default.page.template = /Default.jsp
services.JspService.default.layout.template = /Default.jsp
-services.JspService.templates = /templates/app
+services.JspService.templates = ${template.path}
services.JspService.buffer.size = 8192
services.JspService.earlyInit = true
@@ -578,11 +576,7 @@
# -------------------------------------------------------------------
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.page.template = /Default.wm
services.WebMacroService.default.layout.template = /Default.wm
# The location of WebMacro configuration file, relative to webapp
@@ -593,7 +587,7 @@
# The path where WebMacro will look for templates, relative to webapp
# root. Use your system's path separator to specify multiple paths.
-services.WebMacroService.templates=/templates/app
+services.WebMacroService.templates=${template.path}
# The class that will act as a template provider in webmacro. We can
# use default class from WebMacro (template path above is pushed into
1.89 +24 -30 jakarta-turbine/conf/master/TurbineResources.master
Index: TurbineResources.master
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/master/TurbineResources.master,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- TurbineResources.master 2001/06/28 17:39:21 1.88
+++ TurbineResources.master 2001/07/10 01:13:47 1.89
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.master,v 1.88 2001/06/28 17:39:21 jvanzyl Exp $
+# $Id: TurbineResources.master,v 1.89 2001/07/10 01:13:47 jvanzyl Exp $
#
# This is the configuration file for Turbine.
#
@@ -409,20 +409,6 @@
# -------------------------------------------------------------------
#
-# T E M P L A T E S E R V I C E
-#
-# -------------------------------------------------------------------
-
-# Roughly, the number of templates in each category.
-#
-# Defaults: layout=2, navigation=10, screen=50
-
-services.TemplateService.layout.cache.size=2
-services.TemplateService.navigation.cache.size=10
-services.TemplateService.screen.cache.size=50
-
-# -------------------------------------------------------------------
-#
# P U L L S E R V I C E
#
# -------------------------------------------------------------------
@@ -518,6 +504,26 @@
# -------------------------------------------------------------------
#
+# T E M P L A T E S E R V I C E
+#
+# -------------------------------------------------------------------
+
+# Roughly, the number of templates in each category.
+#
+# Defaults: layout=2, navigation=10, screen=50
+
+services.TemplateService.default.page = TemplatePage
+services.TemplateService.default.screen=TemplateScreen
+services.TemplateService.default.layout = TemplateLayout
+services.TemplateService.default.navigation=TemplateNavigation
+services.TemplateService.default.error.screen = Error
+
+services.TemplateService.layout.cache.size=2
+services.TemplateService.navigation.cache.size=10
+services.TemplateService.screen.cache.size=50
+
+# -------------------------------------------------------------------
+#
# V E L O C I T Y S E R V I C E
#
# -------------------------------------------------------------------
@@ -528,11 +534,7 @@
# the path to the log file and they should also be relative to webapp root
services.VelocityService.template.extension=vm
-services.VelocityService.default.page = VelocityPage
-services.VelocityService.default.screen=VelocityScreen
-services.VelocityService.default.layout = VelocityECSLayout
-services.VelocityService.default.navigation=VelocityNavigation
-services.VelocityService.default.error.screen = VelocityErrorScreen
+services.VelocityService.default.page.template = /Default.vm
services.VelocityService.default.layout.template = /Default.vm
services.VelocityService.runtime.log=/logs/velocity.log
@@ -559,11 +561,7 @@
# -------------------------------------------------------------------
services.JspService.template.extension=jsp
-services.JspService.default.page = JspPage
-services.JspService.default.screen=BaseJspScreen
-services.JspService.default.layout = JspLayout
-services.JspService.default.navigation=BaseJspNavigation
-services.JspService.default.error.screen = JspErrorScreen
+services.JspService.default.page.template = /Default.jsp
services.JspService.default.layout.template = /Default.jsp
services.JspService.templates = @TEMPLATE_PATH@
@@ -578,11 +576,7 @@
# -------------------------------------------------------------------
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.page.template = /Default.wm
services.WebMacroService.default.layout.template = /Default.wm
# The location of WebMacro configuration file, relative to webapp
1.18 +1 -1 jakarta-turbine/conf/view/velocity
Index: velocity
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/view/velocity,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- velocity 2001/06/28 19:01:26 1.17
+++ velocity 2001/07/10 01:13:50 1.18
@@ -1,6 +1,6 @@
template.hompage=/Index.vm
template.login=/Login.vm
-template.error=/VelocityError.vm
+template.error=/Error.vm
action.login=LoginUser
action.logout=LogoutUser
1.11 +1 -1 jakarta-turbine/conf/view/velocity-secure
Index: velocity-secure
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/view/velocity-secure,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- velocity-secure 2001/06/28 19:01:26 1.10
+++ velocity-secure 2001/07/10 01:13:51 1.11
@@ -1,6 +1,6 @@
template.hompage=/Index.vm
template.login=/Login.vm
-template.error=/VelocityError.vm
+template.error=/Error.vm
action.login=LoginUser
action.logout=LogoutUser
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org