[jboss-svn-commits] JBL Code SVN: r5924 - in labs/jbosslabs/branches/qa/jbosslabs/portal-extensions: configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF forge-login-portlet/src/java/org/jbosslabs/security/portlet

[jboss-svn-commits at lists.jboss.org]

Author: szimano
Date: 2006-08-16 16:05:10 -0400 (Wed, 16 Aug 2006)
New Revision: 5924

Modified:
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/Login.java
Log:
vn merge -r 5917:5923 https://svn.labs.jboss.com/labs/jbosslabs/trunk/portal-extensions .
login


Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2006-08-16 19:47:24 UTC (rev 5923)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2006-08-16 20:05:10 UTC (rev 5924)
@@ -217,7 +217,7 @@
       <realm-name>JBoss Portal</realm-name>
       <form-login-config>
          <form-login-page>/login</form-login-page>
-         <form-error-page>/error.jsp</form-error-page>
+         <form-error-page>/index.html?ctrl:cmd=render&amp;ctrl:window=default.login.LoginWindow&amp;action=loginFailed</form-error-page>
       </form-login-config>
    </login-config>
 

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/Login.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/Login.java	2006-08-16 19:47:24 UTC (rev 5923)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/Login.java	2006-08-16 20:05:10 UTC (rev 5924)
@@ -10,6 +10,7 @@
 
 
 import org.jboss.forge.common.ForgeHelper;
+import org.jboss.logging.Logger;
 import org.jboss.portlet.JBossPortlet;
 import org.jboss.portlet.JBossRenderRequest;
 import org.jboss.portlet.JBossRenderResponse;
@@ -18,6 +19,7 @@
 
 
 import java.io.IOException;
+import java.util.Map;
 
 import javax.portlet.*;
 
@@ -26,6 +28,7 @@
 
 public class Login extends JBossPortlet 
 {
+	private static final Logger log = Logger.getLogger(Login.class);
 		
 	private static final String LOGIN_JSP = "login/login.jsp";
 
@@ -33,11 +36,12 @@
 	{		
 	}
 
-	public void processAction(final JBossActionRequest req, final JBossActionResponse resp) 
-	throws PortletException, PortletSecurityException, IOException
-	{
+	@Override
+	public void processAction(JBossActionRequest req, JBossActionResponse resp) throws PortletException, PortletSecurityException, IOException {
+		log.info(req.getAuthType());
 		try
 		{
+			
 			String action = req.getParameter(Constants.param1);							
 			if(action!=null)
 			{
@@ -47,6 +51,7 @@
 			String logout = req.getParameter(Constants.LOGOUT);
 			
 			if (logout != null && logout.equals(Constants.LOGOUT_TRUE)) {
+				req.getPortletSession().invalidate();
 				resp.signOut();
 				return;
 			}
@@ -61,6 +66,7 @@
 	public void doView(JBossRenderRequest request, JBossRenderResponse response)
 	throws IOException, PortletException 
 	{
+	
 		try
 		{
 			String portalName = ForgeHelper.getPortalName(request);