TurbineSecurity.getACL() and added to the current
+ * session.
*
+ * @see org.apache.turbine.services.security.TurbineSecurity
* @param data Turbine information.
* @exception Exception, a generic exception.
*/
Index: modules/actions/LoginUser.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine/src/java/org/apache/turbine/modules/actions/LoginUser.java,v
retrieving revision 1.11
diff -u -r1.11 LoginUser.java
--- modules/actions/LoginUser.java 2001/05/05 16:34:21 1.11
+++ modules/actions/LoginUser.java 2001/06/19 01:15:12
@@ -76,7 +76,15 @@
public class LoginUser extends Action
{
/**
- * Execute the action.
+ * Updates the user's LastLogin timestamp, sets their state to
+ * "logged in" and calls RunData.setUser() . If the user cannot
+ * be authenticated (database error?) the user is assigned
+ * anonymous status and, if tr.props contains a TEMPLATE_LOGIN,
+ * the screenTemplate is set to this, otherwise the screen is set
+ * to SCREEN_LOGIN
+ *
+ * Note: Turbine clears the session before calling this + * method
* * @param data Turbine information. * @exception Exception, a generic exception. Index: modules/actions/LogoutUser.java =================================================================== RCS file: /home/cvspublic/jakarta-turbine/src/java/org/apache/turbine/modules/actions/LogoutUser.java,v retrieving revision 1.9 diff -u -r1.9 LogoutUser.java --- modules/actions/LogoutUser.java 2001/05/05 16:34:22 1.9 +++ modules/actions/LogoutUser.java 2001/06/19 01:15:15 @@ -66,7 +66,7 @@ /** * This action removes a user from the session. It makes sure to save - * the User object in the sesion. + * the User object in the session. * * @author Dave Bryson * @version $Id: LogoutUser.java,v 1.9 2001/05/05 16:34:22 mpoeschl Exp $ @@ -74,9 +74,20 @@ public class LogoutUser extends Action { /** - * Execute the action. + * Clears the RunData user object back to an anonymous status not + * logged in, and with a null ACL. If the tr.props ACTION_LOGIN + * is anthing except "LogoutUser", flow is transfered to the + * SCREEN_HOMEPAGE * - * @param data Turbine information. + * If this action name is the value of action.logout then we are + * being run before the session validator, so we don't need to + * set the screen (we assume that the session validator will handle + * that). This is basically still here simply to preserve old behaviour + * - it is recommended that action.logout is set to "LogoutUser" and + * that the session validator does handle setting the screen/template + * for a logged out (read not-logged-in) user. + * + * @param data Turbine information. * @exception Exception, a generic exception. */ public void doPerform( RunData data ) Index: modules/actions/sessionvalidator/DefaultSessionValidator.java =================================================================== RCS file: /home/cvspublic/jakarta-turbine/src/java/org/apache/turbine/modules/actions/sessionvalidator/DefaultSessionValidator.java,v retrieving revision 1.8 diff -u -r1.8 DefaultSessionValidator.java --- modules/actions/sessionvalidator/DefaultSessionValidator.java 2001/05/05 17:45:46 1.8 +++ modules/actions/sessionvalidator/DefaultSessionValidator.java 2001/06/19 01:15:21 @@ -88,9 +88,12 @@ public class DefaultSessionValidator extends SessionValidator { /** - * Execute the action. - * - * @param data Turbine information. + * Execute the action. The default is to populate the RunData + * object and, if the user is unknown, to force a login screen (as + * set in the tr.props). + * + * @see org.apache.turbine.modules.screens.error.InvalidState + * @param data Turbine RunData context information. * @exception Exception, a generic exception. */ public void doPerform( RunData data ) throws Exception Index: modules/actions/sessionvalidator/TemplateSecureSessionValidator.java =================================================================== RCS file: /home/cvspublic/jakarta-turbine/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java,v retrieving revision 1.8 diff -u -r1.8 TemplateSecureSessionValidator.java --- modules/actions/sessionvalidator/TemplateSecureSessionValidator.java 2001/05/23 16:35:55 1.8 +++ modules/actions/sessionvalidator/TemplateSecureSessionValidator.java 2001/06/19 01:15:25 @@ -84,8 +84,13 @@ public class TemplateSecureSessionValidator extends SessionValidator { /** - * Execute the action. + * doPerform is virtually identical to DefaultSessionValidator + * except that it calls template methods instead of bare screen + * methods. For example, it usessetScreenTemplate to
+ * load the tr.props TEMPLATE_LOGIN instead of the default's
+ * setScreen to TurbineContants.SCREEN_LOGIN.
*
+ * @see DefaultSessionValidator
* @param data Turbine information.
* @exception Exception, a generic exception.
*/
Index: modules/actions/sessionvalidator/TemplateSessionValidator.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java,v
retrieving revision 1.5
diff -u -r1.5 TemplateSessionValidator.java
--- modules/actions/sessionvalidator/TemplateSessionValidator.java 2001/05/05 17:45:46 1.5
+++ modules/actions/sessionvalidator/TemplateSessionValidator.java 2001/06/19 01:15:26
@@ -61,13 +61,15 @@
import org.apache.turbine.services.security.TurbineSecurity;
/**
- * SessionValidator for use with the Template Service.
+ * SessionValidator for use with the Template Service, the
+ * TemplateSessionValidator is virtually identical to the
+ * TemplateSecureValidator except that it does not tranfer to the
+ * login page when it detects a null user (or a user not logged in).
*
- * The Template Service requires a different Session Validator * because of the way it handles screens. * + * @see TemplateSecureValidator * @author John D. McNally * @author Dave Bryson * @version $Id: TemplateSessionValidator.java,v 1.5 2001/05/05 17:45:46 mpoeschl Exp $ Index: modules/layouts/DefaultLayout.java =================================================================== RCS file: /home/cvspublic/jakarta-turbine/src/java/org/apache/turbine/modules/layouts/DefaultLayout.java,v retrieving revision 1.6 diff -u -r1.6 DefaultLayout.java --- modules/layouts/DefaultLayout.java 2001/05/23 16:36:04 1.6 +++ modules/layouts/DefaultLayout.java 2001/06/19 01:15:27 @@ -77,6 +77,9 @@ { /** * Build the layout. + * + *
NOTE: Unless otherwise specified, the page background + * defaults to 'white'
* * @param data Turbine information. * @exception Exception, a generic exception. Index: modules/layouts/VelocityECSLayout.java =================================================================== RCS file: /home/cvspublic/jakarta-turbine/src/java/org/apache/turbine/modules/layouts/VelocityECSLayout.java,v retrieving revision 1.9 diff -u -r1.9 VelocityECSLayout.java --- modules/layouts/VelocityECSLayout.java 2001/06/11 00:03:33 1.9 +++ modules/layouts/VelocityECSLayout.java 2001/06/19 01:15:32 @@ -80,7 +80,8 @@ public class VelocityECSLayout extends Layout { /** - * Build the layout. + * Build the layout. Also sets the ContentType and Locale headers + * of the HttpServletResponse object. * * @param data Turbine information. * @exception Exception, a generic exception. -- Gary Lawrence Murphy