svn commit: r1614727 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/struts2/core/Login.java java/org/apache/roller/weblogger/ui/struts2/core/Register.java resources/ApplicationResources.properties webapp/WEB-INF/jsps/core/Login.jsp

[gm...@apache.org]

Author: gmazza
Date: Wed Jul 30 18:01:35 2014
New Revision: 1614727

URL: http://svn.apache.org/r1614727
Log:
Added comments on how authentication works in Roller.

Modified:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
    roller/trunk/app/src/main/resources/ApplicationResources.properties
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java?rev=1614727&r1=1614726&r2=1614727&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java Wed Jul 30 18:01:35 2014
@@ -21,9 +21,16 @@ package org.apache.roller.weblogger.ui.s
 import org.apache.roller.weblogger.config.WebloggerConfig;
 import org.apache.roller.weblogger.ui.struts2.util.UIAction;
 
-
 /**
  * Handle user logins.
+ *
+ * The standard blog login buttons route to login-redirect.rol, which is
+ * intercepted by the Spring security.xml to first require a standard login (this class).
+ * After successful authentication, login-redirect will either route the user to
+ * registration (if the user logged in via an external method such as LDAP and doesn't
+ * yet have a Roller account), or directly to the user's blog.
+ *
+ * @see org.apache.roller.weblogger.ui.struts2.core.Register
  */
 public class Login extends UIAction {
     

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java?rev=1614727&r1=1614726&r2=1614727&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java Wed Jul 30 18:01:35 2014
@@ -43,7 +43,12 @@ import org.apache.struts2.interceptor.va
 
 
 /**
- * Actions for registering a new user.
+ * Actions for registering a new user.  This page is activated in Roller in two ways,
+ * by explicitly selecting the "Register" button on the Main Menu, or if
+ * upon a non-Roller DB login (say, LDAP) if the user does not exist in the
+ * Roller DB.  In the latter case, this page is activated from login-redirect.jsp file.
+ *
+ * @see org.apache.roller.weblogger.ui.struts2.core.Login
  */
 public class Register extends UIAction implements ServletRequestAware {
     

Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1614727&r1=1614726&r2=1614727&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Wed Jul 30 18:01:35 2014
@@ -1734,13 +1734,17 @@ WeblogConfig.error.descriptionSize=Descr
 WeblogConfig.error.analyticsCodeSize=Analytics tracking key(s) cannot be more than 1200 characters
 
 
-# ------------------------------------------------------------- Welcome new user
+# ------------------------------------------------------------- Welcome.jsp
 
 welcome.title=Welcome to Roller
 welcome.accountCreated=Your new user account has been created.
 welcome.clickHere=Click here
 welcome.toLoginAndPost=to login.
 
+welcome.user.account.activated=Your user account is activated.
+welcome.user.account.not.activated=In order to login to the system, you have to \
+activate your user account by clicking the link that is sent to you via e-mail.
+
 # ----------------------------------------------------------------- Your profile
 
 yourProfile.title=Your Profile
@@ -1820,6 +1824,3 @@ user.account.activation.mail.content=\
 <p>To activate your new Roller user account with username [{1}], please click the link below:</p> \
 <p><a href=\"{2}\">{2}</a></p></body></html>
 
-welcome.user.account.activated=Your user account is activated.
-welcome.user.account.not.activated=In order to login to the system, you have to \
-activate your user account by clicking the link that is sent to you via e-mail.

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp?rev=1614727&r1=1614726&r2=1614727&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Login.jsp Wed Jul 30 18:01:35 2014
@@ -1,4 +1,4 @@
-<!--
+<%--
   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  The ASF licenses this file to You
   under the Apache License, Version 2.0 (the "License"); you may not
@@ -14,7 +14,7 @@
   limitations under the License.  For additional information regarding
   copyright in this work, please see the NOTICE file in the top level
   directory of this distribution.
--->
+--%>
 
 <%-- Body of the login page, invoked from login.jsp --%>
 <%@ page import="org.apache.roller.weblogger.config.WebloggerConfig" %>