X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.rap%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Frap%2FSecureEntryPoint.java;fp=org.argeo.security.ui.rap%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Frap%2FSecureEntryPoint.java;h=3f0f6646998babee7df0bf9855cc01b68b8a2a5a;hb=bd811d9fad35f55aa1ab3afbc835ff24367ffbbe;hp=b79d60d261e469abde35663237dcf4cf5b3a7b47;hpb=6d2f2b44756d30f9530b315e30ba23fda7cee695;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/SecureEntryPoint.java b/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/SecureEntryPoint.java
index b79d60d26..3f0f66469 100644
--- a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/SecureEntryPoint.java
+++ b/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/SecureEntryPoint.java
@@ -22,16 +22,14 @@ import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.login.CredentialNotFoundException;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 import org.argeo.cms.KernelHeader;
 import org.argeo.cms.auth.ArgeoLoginContext;
+import org.argeo.cms.widgets.auth.DefaultLoginDialog;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
-import org.argeo.security.ui.auth.DefaultLoginDialog;
 import org.argeo.util.LocaleUtils;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.rap.rwt.RWT;
@@ -40,7 +38,6 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.PlatformUI;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
@@ -78,13 +75,13 @@ public class SecureEntryPoint implements EntryPoint {
 		RWT.getRequest().getSession().setMaxInactiveInterval(loginTimeout);
 
 		// Try to load security context thanks to the session processing filter
-//		HttpServletRequest httpRequest = RWT.getRequest();
-//		HttpSession httpSession = httpRequest.getSession();
-//		Object contextFromSessionObject = httpSession
-//				.getAttribute(SPRING_SECURITY_CONTEXT_KEY);
-//		if (contextFromSessionObject != null)
-//			SecurityContextHolder
-//					.setContext((SecurityContext) contextFromSessionObject);
+		// HttpServletRequest httpRequest = RWT.getRequest();
+		// HttpSession httpSession = httpRequest.getSession();
+		// Object contextFromSessionObject = httpSession
+		// .getAttribute(SPRING_SECURITY_CONTEXT_KEY);
+		// if (contextFromSessionObject != null)
+		// SecurityContextHolder
+		// .setContext((SecurityContext) contextFromSessionObject);
 
 		final Display display = PlatformUI.createDisplay();
 		Subject subject = new Subject();
@@ -106,9 +103,10 @@ public class SecureEntryPoint implements EntryPoint {
 					throw new ArgeoException("Login succeeded but no auth");// fatal
 
 				// add security context to session
-//				if (httpSession.getAttribute(SPRING_SECURITY_CONTEXT_KEY) == null)
-//					httpSession.setAttribute(SPRING_SECURITY_CONTEXT_KEY,
-//							SecurityContextHolder.getContext());
+				// if (httpSession.getAttribute(SPRING_SECURITY_CONTEXT_KEY) ==
+				// null)
+				// httpSession.setAttribute(SPRING_SECURITY_CONTEXT_KEY,
+				// SecurityContextHolder.getContext());
 
 				// add thread locale to RWT session
 				if (log.isTraceEnabled())