Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv1248/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
LoginPortlet.java
Log Message:
Merge van 1.4 branch
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
Index: LoginPortlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- LoginPortlet.java 21 Feb 2008 12:51:03 -0000 1.7
+++ LoginPortlet.java 14 Mar 2008 12:52:11 -0000 1.8
@@ -17,6 +17,7 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -39,36 +40,48 @@
String action = request.getParameter("action");
if ("login".equals(action)) {
String userName =
request.getParameter(ACEGI_SECURITY_FORM_USERNAME_KEY);
- if (userName == null) {
- userName = "";
- }
String password =
request.getParameter(ACEGI_SECURITY_FORM_PASSWORD_KEY);
- if (password == null) {
- password = "";
- }
+ if (!StringUtils.isBlank(userName) &&
!StringUtils.isBlank(password)) {
Community.login(userName, password);
+ }
+
if (Community.isAuthenticated()) {
log.info(String.format("Login successful for
user %s", userName));
} else {
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)) {
+ throw new UnsupportedOperationException("Community module does not
have all methods yet");
+// String username = request.getParameter("username");
+// if (!StringUtils.isBlank(username)) {
+// }
+ }
+ else {
// Unknown
- } else {
log.error(String.format("Unknown action '%s'", action));
}
}
@Override
protected void doView(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
+ String error = request.getParameter("errormessage");
+ if (!StringUtils.isBlank(error)) {
+ request.setAttribute("errormessage", error);
+ }
+
String template = null;
if (Community.isAuthenticated()) {
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
