Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv3878/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_4
LoginPortlet.java
Log Message:
CMSC-830 - *added* some functionality to send the password, but at the same
time *removed* it from the portlet because it doesn't belong there.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-830
Index: LoginPortlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.5.2.6
retrieving revision 1.5.2.7
diff -u -b -r1.5.2.6 -r1.5.2.7
--- LoginPortlet.java 25 Mar 2008 15:17:43 -0000 1.5.2.6
+++ LoginPortlet.java 27 Mar 2008 15:32:40 -0000 1.5.2.7
@@ -14,7 +14,6 @@
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.PortletException;
-import javax.portlet.PortletPreferences;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
@@ -22,7 +21,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.finalist.cmsc.portalImpl.PortalConstants;
import com.finalist.cmsc.services.community.Community;
/**
@@ -31,18 +29,20 @@
* @author Remco Bos
*/
public class LoginPortlet extends CmscPortlet {
+ protected static final String ACTION_PARAMETER = "action";
private static final String ACEGI_SECURITY_FORM_USERNAME_KEY =
"j_username";
-
private static final String ACEGI_SECURITY_FORM_PASSWORD_KEY =
"j_password";
private static final Log log = LogFactory.getLog(LoginPortlet.class);
+ @Override
public void processView(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
- String action = request.getParameter("action");
+ String action = request.getParameter(ACTION_PARAMETER);
if ("login".equals(action)) {
String userName =
request.getParameter(ACEGI_SECURITY_FORM_USERNAME_KEY);
String password =
request.getParameter(ACEGI_SECURITY_FORM_PASSWORD_KEY);
+
if (!StringUtils.isBlank(userName) &&
!StringUtils.isBlank(password)) {
Community.login(userName, password);
}
@@ -53,19 +53,9 @@
log.info(String.format("Login failed for user
%s", userName));
response.setRenderParameter("errormessage",
"login.failed");
}
-
} else if ("logout".equals(action)) {
Community.logout();
- } else if ("send_password".equals(action)) {
- String username = request.getParameter("username");
- if (!StringUtils.isBlank(username)) {
- //Get email text and email header from portlet properties and
use it for sending an email
- String emailText =
request.getPreferences().getValue("email.text", "Your account details
associated with the given email address.\n");
- String emailHeader =
request.getPreferences().getValue("email.header", "Account details");
- Community.sendPassword(username, emailText, emailHeader);
- }
- }
- else {
+ } else {
// Unknown
log.error(String.format("Unknown action '%s'", action));
}
@@ -85,11 +75,8 @@
template = "login/logout.jsp";
} else {
template = "login/login.jsp";
- String action = request.getParameter("action");
- if (!StringUtils.isBlank(action) &&
"send_password".equals(action)) {
- template = "login/send_password.jsp";
- }
}
+
doInclude("view", template, request, response);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
