jvanzyl 01/05/10 10:13:22
Modified: conf TurbineResources.properties
conf/master TurbineResources.master
conf/view jsp velocity velocity-secure webmacro
Log:
- changing the templates path to allow all templates to be grouped
under a /templates directory and then be separated within there.
so we would have something like:
/templates/app
/template/flux
This is just a simple way to separate the templates and leave
the dev tree looking decent. this is the 2.1, in 2.2 this will
probably change as hopefully an app will be completely self-contained.
Revision Changes Path
1.107 +3 -3 jakarta-turbine/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/TurbineResources.properties,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- TurbineResources.properties 2001/05/10 17:08:00 1.106
+++ TurbineResources.properties 2001/05/10 17:13:06 1.107
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.properties,v 1.106 2001/05/10 17:08:00 jvanzyl Exp $
+# $Id: TurbineResources.properties,v 1.107 2001/05/10 17:13:06 jvanzyl Exp $
#
# This is the configuration file for Turbine.
#
@@ -595,7 +595,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
+services.VelocityService.file.resource.loader.path = /templates/app
services.VelocityService.file.resource.loader.cache = false
services.VelocityService.file.resource.loader.modificationCheckInterval = 2
@@ -617,7 +617,7 @@
services.JspService.default.error.screen = JspErrorScreen
services.JspService.default.layout.template = /Default.jsp
-services.JspService.templates = /templates
+services.JspService.templates = /templates/app
services.JspService.buffer.size = 8192
# -------------------------------------------------------------------
@@ -642,7 +642,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
+services.WebMacroService.templates=/templates/app
# 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.72 +3 -3 jakarta-turbine/conf/master/TurbineResources.master
Index: TurbineResources.master
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/master/TurbineResources.master,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- TurbineResources.master 2001/04/25 05:31:04 1.71
+++ TurbineResources.master 2001/05/10 17:13:10 1.72
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.master,v 1.71 2001/04/25 05:31:04 ilkka Exp $
+# $Id: TurbineResources.master,v 1.72 2001/05/10 17:13:10 jvanzyl Exp $
#
# This is the configuration file for Turbine.
#
@@ -617,7 +617,7 @@
services.JspService.default.error.screen = JspErrorScreen
services.JspService.default.layout.template = /Default.jsp
-services.JspService.templates = /templates
+services.JspService.templates = @TEMPLATE_PATH@
services.JspService.buffer.size = 8192
# -------------------------------------------------------------------
@@ -642,7 +642,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
+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.3 +1 -1 jakarta-turbine/conf/view/jsp
Index: jsp
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/view/jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jsp 2001/04/08 16:45:01 1.2
+++ jsp 2001/05/10 17:13:14 1.3
@@ -14,7 +14,7 @@
page.default=JspPage
template.default.extension=jsp
-template.path=/templates
+template.path=/templates/app
template.default.navigation=BaseJspNavigation
template.default.screen=BaseJspScreen
template.default.layout=/Default.jsp
1.15 +1 -1 jakarta-turbine/conf/view/velocity
Index: velocity
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/view/velocity,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- velocity 2001/04/08 16:45:01 1.14
+++ velocity 2001/05/10 17:13:14 1.15
@@ -14,7 +14,7 @@
page.default=VelocityPage
template.default.extension=vm
-template.path=/templates
+template.path=/templates/app
template.default.navigation=VelocityNavigation
template.default.screen=VelocityScreen
template.default.layout=/Default.vm
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- velocity-secure 2001/04/08 16:45:01 1.7
+++ velocity-secure 2001/05/10 17:13:15 1.8
@@ -14,7 +14,7 @@
page.default=VelocityPage
template.default.extension=vm
-template.path=/templates
+template.path=/templates/app
template.default.navigation=VelocityNavigation
template.default.screen=VelocityScreen
template.default.layout=/Default.vm
1.9 +1 -1 jakarta-turbine/conf/view/webmacro
Index: webmacro
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/view/webmacro,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- webmacro 2001/04/08 16:45:01 1.8
+++ webmacro 2001/05/10 17:13:16 1.9
@@ -14,7 +14,7 @@
page.default=WebMacroSitePage
template.default.extension=wm
-template.path=/templates
+template.path=/templates/app
template.default.navigation=WebMacroSiteNavigation
template.default.screen=WebMacroSiteScreen
template.default.layout=/default.wm
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
