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/08/14 15:57:47 UTC
cvs commit: jakarta-turbine/conf/view jsp velocity velocity-secure
jvanzyl 01/08/14 06:57:47
Modified: conf TurbineResources.properties
conf/master TurbineResources.master
conf/view jsp velocity velocity-secure
Log:
- changing the way the module configuration works in an attempt to make it
easier to understand.
Revision Changes Path
1.138 +6 -9 jakarta-turbine/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/TurbineResources.properties,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- TurbineResources.properties 2001/08/11 08:04:40 1.137
+++ TurbineResources.properties 2001/08/14 13:57:47 1.138
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.properties,v 1.137 2001/08/11 08:04:40 dlr Exp $
+# $Id: TurbineResources.properties,v 1.138 2001/08/14 13:57:47 jvanzyl Exp $
#
# This is the configuration file for Turbine.
#
@@ -103,13 +103,10 @@
# These are the default modules to emulate the Turbine
# 2.1 page/layout/nav/screen system.
-module.default.base = Module
-module.default.actions = TemplateAction
-module.default.screens = TemplateScreen
-
-#module.mapping.screens = base
-module.mapping.layouts = base
-module.mapping.navigations = base
+module.default.actions = actions.TemplateAction
+module.default.layouts = Module
+module.default.navigations = Module
+module.default.screens = Module
# You can define any module type you wish here and
# they will be added to Turbine's module processing
@@ -171,7 +168,7 @@
#
# Default: SessionValidator
-action.sessionvalidator=sessionvalidator.TemplateSessionValidator
+action.sessionvalidator=TemplateSessionValidator
# This is the timeout in seconds for sessions. If left commented out, the
# servlet container's default timeout will be left as is.
1.105 +5 -8 jakarta-turbine/conf/master/TurbineResources.master
Index: TurbineResources.master
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/master/TurbineResources.master,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- TurbineResources.master 2001/08/11 08:04:40 1.104
+++ TurbineResources.master 2001/08/14 13:57:47 1.105
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.master,v 1.104 2001/08/11 08:04:40 dlr Exp $
+# $Id: TurbineResources.master,v 1.105 2001/08/14 13:57:47 jvanzyl Exp $
#
# This is the configuration file for Turbine.
#
@@ -103,13 +103,10 @@
# These are the default modules to emulate the Turbine
# 2.1 page/layout/nav/screen system.
-module.default.base = Module
-module.default.actions = TemplateAction
-module.default.screens = TemplateScreen
-
-#module.mapping.screens = base
-module.mapping.layouts = base
-module.mapping.navigations = base
+module.default.actions = actions.TemplateAction
+module.default.layouts = Module
+module.default.navigations = Module
+module.default.screens = Module
# You can define any module type you wish here and
# they will be added to Turbine's module processing
1.6 +1 -1 jakarta-turbine/conf/view/jsp
Index: jsp
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/view/jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jsp 2001/06/28 19:01:26 1.5
+++ jsp 2001/08/14 13:57:47 1.6
@@ -4,7 +4,7 @@
action.login=LoginUser
action.logout=LogoutUser
-action.sessionvalidator=sessionvalidator.TemplateSessionValidator
+action.sessionvalidator=TemplateSessionValidator
action.accesscontroller=AccessController
template.service=services.JspService.classname=org.apache.turbine.services.velocity.TurbineJspService
1.20 +1 -1 jakarta-turbine/conf/view/velocity
Index: velocity
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/view/velocity,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- velocity 2001/08/05 16:05:42 1.19
+++ velocity 2001/08/14 13:57:47 1.20
@@ -4,7 +4,7 @@
action.login=LoginUser
action.logout=LogoutUser
-action.sessionvalidator=sessionvalidator.TemplateSessionValidator
+action.sessionvalidator=TemplateSessionValidator
action.accesscontroller=AccessController
template.service=services.VelocityService.classname=org.apache.fulcrum.velocity.TurbineVelocityService
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- velocity-secure 2001/08/05 16:05:42 1.12
+++ velocity-secure 2001/08/14 13:57:47 1.13
@@ -4,7 +4,7 @@
action.login=LoginUser
action.logout=LogoutUser
-action.sessionvalidator=sessionvalidator.TemplateSecureSessionValidator
+action.sessionvalidator=TemplateSecureSessionValidator
action.accesscontroller=AccessController
template.service=services.VelocityService.classname=org.apache.fulcrum.velocity.TurbineVelocityService
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org