Fix browser windows resize

[lgpl/argeo-commons.git] / security / plugins / org.argeo.security.ui.rap / src / main / java / org / argeo / security / ui / rap / SecureEntryPoint.java

diff --git a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureEntryPoint.java b/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureEntryPoint.java
index 2339716874598d0d142b9431ba91e7a45afbdc8f..6da17d73399006eea930bc75809c1104aafebb96 100644 (file)
--- a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureEntryPoint.java
+++ b/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureEntryPoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Mathieu Baudier
+ * Copyright (C) 2007-2012 Argeo GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.ErrorFeedback;
+import org.argeo.util.LocaleUtils;
 import org.eclipse.equinox.security.auth.ILoginContext;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.rwt.RWT;
@@ -70,6 +71,7 @@ public class SecureEntryPoint implements IEntryPoint {
                // around too long
                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
@@ -78,10 +80,10 @@ public class SecureEntryPoint implements IEntryPoint {
                        SecurityContextHolder
                                        .setContext((SecurityContext) contextFromSessionObject);
 
-               if (log.isDebugEnabled())
-                       log.debug("THREAD=" + Thread.currentThread().getId()
-                                       + ", sessionStore=" + RWT.getSessionStore().getId()
-                                       + ", remote user=" + httpRequest.getRemoteUser());
+//             if (log.isDebugEnabled())
+//                     log.debug("THREAD=" + Thread.currentThread().getId()
+//                                     + ", sessionStore=" + RWT.getSessionStore().getId()
+//                                     + ", remote user=" + httpRequest.getRemoteUser());
 
                // create display
                final Display display = PlatformUI.createDisplay();
@@ -95,9 +97,13 @@ public class SecureEntryPoint implements IEntryPoint {
                                loginContext.login();
                                subject = loginContext.getSubject();
 
+                               // add security context to session
                                if (httpSession.getAttribute(SPRING_SECURITY_CONTEXT_KEY) == null)
                                        httpSession.setAttribute(SPRING_SECURITY_CONTEXT_KEY,
                                                        SecurityContextHolder.getContext());
+                               // add thread locale to RWT session
+                               log.info("Locale "+LocaleUtils.threadLocale.get());
+                               RWT.setLocale(LocaleUtils.threadLocale.get());
 
                                // Once the user is logged in, she can have a longer session
                                // timeout
@@ -140,7 +146,7 @@ public class SecureEntryPoint implements IEntryPoint {
                                        return new Integer(result);
                                }
                        });
-                       //logout(loginContext, username);
+                       // logout(loginContext, username);
                } finally {
                        display.dispose();
                }