jvanzyl 01/06/28 10:39:23
Modified: conf TurbineResources.properties
conf/master TurbineResources.master
Log:
- removing
screen.login
screen.homepage
screen.error
screen.invalidstate
from the master TRP as we are now dealing strictly with templates.
Revision Changes Path
1.122 +15 -44 jakarta-turbine/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/TurbineResources.properties,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- TurbineResources.properties 2001/06/27 23:52:56 1.121
+++ TurbineResources.properties 2001/06/28 17:39:17 1.122
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.properties,v 1.121 2001/06/27 23:52:56 jvanzyl Exp $
+# $Id: TurbineResources.properties,v 1.122 2001/06/28 17:39:17 jvanzyl Exp $
#
# This is the configuration file for Turbine.
#
@@ -122,21 +122,6 @@
# the default templates and screens are and session handling settings.
# -------------------------------------------------------------------
-# Used to set the template homepage if you are using a template
-# layout.
-#
-# Default: /Index.vm
-
-template.homepage=/Index.vm
-
-# This is the default screen to show to people when they first access
-# the system. Specify one of the template screens such as VelocityScreen
-# to use a template system.
-#
-# Default: Login
-
-screen.homepage=
-
# This is the template that is shown on an incorrect login attempt.
# Setting this property will override any value of screen.login specfied
# below.
@@ -145,43 +130,20 @@
template.login=/Login.vm
-# This is the page that is shown on an incorrect login attempt. It is
-# referenced in the LoginUser action. Note that it will only be used if
-# a login template has not been specified (see template.login above).
+# Used to set the template homepage if you are using a template
+# layout.
#
-# Default: Login
+# Default: /Index.vm
-screen.login=
+template.homepage=/Index.vm
# 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.vm
-
-template.error=/Error.vm
-
-# This is the default error screen.
-#
-# Default: VelocityErrorScreen
-
-screen.error=VelocityErrorScreen
-
-# This is the screen that is displayed when the user's web page is in
-# an invalid state.
-#
-# Default: error.InvalidState
-
-screen.invalidstate=error.InvalidState
-
-# Set the default Doctype. The default Doctype can be set by using
-# the single strings: Html40Strict, Html40Transitional, or
-# Html40Frameset. Additionally the default can be supplied as two
-# strings separated by a comma giving the DTD and URI.
#
-# Default: ignored if not set to some value.
+# Default: /{ViewType}Error.vm
-default.doctype=Html40Transitional
+template.error=/VelocityError.vm
# This is the default action to log a user in.
@@ -208,6 +170,15 @@
# the individual users session.
action.accesscontroller=AccessController
+
+# Set the default Doctype. The default Doctype can be set by using
+# the single strings: Html40Strict, Html40Transitional, or
+# Html40Frameset. Additionally the default can be supplied as two
+# strings separated by a comma giving the DTD and URI.
+#
+# Default: ignored if not set to some value.
+
+default.doctype=Html40Transitional
# -------------------------------------------------------------------
#
1.88 +15 -44 jakarta-turbine/conf/master/TurbineResources.master
Index: TurbineResources.master
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/master/TurbineResources.master,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- TurbineResources.master 2001/06/27 23:52:24 1.87
+++ TurbineResources.master 2001/06/28 17:39:21 1.88
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.master,v 1.87 2001/06/27 23:52:24 jvanzyl Exp $
+# $Id: TurbineResources.master,v 1.88 2001/06/28 17:39:21 jvanzyl Exp $
#
# This is the configuration file for Turbine.
#
@@ -122,21 +122,6 @@
# the default templates and screens are and session handling settings.
# -------------------------------------------------------------------
-# Used to set the template homepage if you are using a template
-# layout.
-#
-# Default: /Index.vm
-
-template.homepage=@TEMPLATE_HOMEPAGE@
-
-# This is the default screen to show to people when they first access
-# the system. Specify one of the template screens such as VelocityScreen
-# to use a template system.
-#
-# Default: Login
-
-screen.homepage=@SCREEN_HOMEPAGE@
-
# This is the template that is shown on an incorrect login attempt.
# Setting this property will override any value of screen.login specfied
# below.
@@ -145,44 +130,21 @@
template.login=@TEMPLATE_LOGIN@
-# This is the page that is shown on an incorrect login attempt. It is
-# referenced in the LoginUser action. Note that it will only be used if
-# a login template has not been specified (see template.login above).
+# Used to set the template homepage if you are using a template
+# layout.
#
-# Default: Login
+# Default: /Index.vm
-screen.login=@SCREEN_LOGIN@
+template.homepage=@TEMPLATE_HOMEPAGE@
# 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.vm
+# Default: /{ViewType}Error.vm
template.error=@TEMPLATE_ERROR@
-# This is the default error screen.
-#
-# Default: VelocityErrorScreen
-
-screen.error=@SCREEN_ERROR@
-
-# This is the screen that is displayed when the user's web page is in
-# an invalid state.
-#
-# Default: error.InvalidState
-
-screen.invalidstate=@SCREEN_INVALID_STATE@
-
-# Set the default Doctype. The default Doctype can be set by using
-# the single strings: Html40Strict, Html40Transitional, or
-# Html40Frameset. Additionally the default can be supplied as two
-# strings separated by a comma giving the DTD and URI.
-#
-# Default: ignored if not set to some value.
-
-default.doctype=Html40Transitional
-
# This is the default action to log a user in.
action.login=@ACTION_LOGIN@
@@ -208,6 +170,15 @@
# the individual users session.
action.accesscontroller=@ACTION_ACCESS_CONTROLLER@
+
+# Set the default Doctype. The default Doctype can be set by using
+# the single strings: Html40Strict, Html40Transitional, or
+# Html40Frameset. Additionally the default can be supplied as two
+# strings separated by a comma giving the DTD and URI.
+#
+# Default: ignored if not set to some value.
+
+default.doctype=Html40Transitional
# -------------------------------------------------------------------
#
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
