You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jo...@apache.org on 2001/03/27 06:43:53 UTC
cvs commit: jakarta-turbine/conf/view velocity
jon 01/03/26 20:43:53
Modified: conf TurbineResources.properties
conf/master TurbineResources.master
conf/view velocity
Log:
fix some defaults and other minor stuff
Revision Changes Path
1.81 +7 -7 jakarta-turbine/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/TurbineResources.properties,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- TurbineResources.properties 2001/03/26 16:47:54 1.80
+++ TurbineResources.properties 2001/03/27 04:43:52 1.81
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.properties,v 1.80 2001/03/26 16:47:54 jvanzyl Exp $
+# $Id: TurbineResources.properties,v 1.81 2001/03/27 04:43:52 jon Exp $
#
# This is the configuration file for Turbine.
#
@@ -219,7 +219,7 @@
# Used to set the template homepage if you are using a template
# layout.
#
-# Default: /index.wm
+# Default: /Index.vm
template.homepage=/Index.vm
@@ -235,7 +235,7 @@
# Setting this property will override any value of screen.login specfied
# below.
#
-# Default: Login
+# Default: Login.vm
template.login=/Login.vm
@@ -249,15 +249,15 @@
# This is the default error screen.
#
-# Default: Error
+# Default: VelocityErrorScreen
-screen.error=Error
+screen.error=VelocityErrorScreen
# This is the template that is used by the respective Template based
# ErrorScreen for displaying the error. If you are not using a Template based
# ErrorScreen, then this is ignored.
#
-# Default: /Error.wm
+# Default: /Error.vm
template.error=/Error.vm
@@ -304,7 +304,7 @@
# This is the default layout to apply.
#
-# Default: DefaultLayout
+# Default: VelocityECSLayout
layout.default=VelocityECSLayout
1.47 +6 -6 jakarta-turbine/conf/master/TurbineResources.master
Index: TurbineResources.master
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/master/TurbineResources.master,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- TurbineResources.master 2001/03/26 16:48:01 1.46
+++ TurbineResources.master 2001/03/27 04:43:52 1.47
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.master,v 1.46 2001/03/26 16:48:01 jvanzyl Exp $
+# $Id: TurbineResources.master,v 1.47 2001/03/27 04:43:52 jon Exp $
#
# This is the configuration file for Turbine.
#
@@ -219,7 +219,7 @@
# Used to set the template homepage if you are using a template
# layout.
#
-# Default: /index.wm
+# Default: /Index.vm
template.homepage=@TEMPLATE_HOMEPAGE@
@@ -235,7 +235,7 @@
# Setting this property will override any value of screen.login specfied
# below.
#
-# Default: Login
+# Default: Login.vm
template.login=@TEMPLATE_LOGIN@
@@ -249,7 +249,7 @@
# This is the default error screen.
#
-# Default: Error
+# Default: VelocityErrorScreen
screen.error=@SCREEN_ERROR@
@@ -257,7 +257,7 @@
# ErrorScreen for displaying the error. If you are not using a Template based
# ErrorScreen, then this is ignored.
#
-# Default: /Error.wm
+# Default: /Error.vm
template.error=@TEMPLATE_ERROR@
@@ -304,7 +304,7 @@
# This is the default layout to apply.
#
-# Default: DefaultLayout
+# Default: VelocityECSLayout
layout.default=@LAYOUT_DEFAULT@
1.12 +1 -1 jakarta-turbine/conf/view/velocity
Index: velocity
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/view/velocity,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- velocity 2001/03/26 16:48:08 1.11
+++ velocity 2001/03/27 04:43:53 1.12
@@ -2,7 +2,7 @@
template.login=/Login.vm
screen.homepage=
screen.login=
-screen.error=Error
+screen.error=VelocityErrorScreen
screen.invalidstate=error.InvalidState
action.login=LoginUser
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org