X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.rap%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Frap%2FSecureEntryPoint.java;h=6a582f83f75e948dc60b8fb9680e3aa9b49033a4;hb=94114b7d025df8452c96a23554ec96c32e6c459b;hp=c27fbc70e4dda02e09b089cf764dad9588d945fe;hpb=86140b8db15a11cfd942892eface6a4f90329a41;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 c27fbc70e..6a582f83f 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
@@ -15,7 +15,7 @@
  */
 package org.argeo.security.ui.rap;
 
-import static org.argeo.cms.KernelHeader.ACCESS_CONTROL_CONTEXT;
+import static org.argeo.cms.auth.AuthConstants.ACCESS_CONTROL_CONTEXT;
 
 import java.security.AccessControlContext;
 import java.security.AccessController;
@@ -33,8 +33,7 @@ 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.auth.AuthConstants;
 import org.argeo.cms.widgets.auth.DefaultLoginDialog;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.util.LocaleUtils;
@@ -78,7 +77,7 @@ public class SecureEntryPoint implements EntryPoint {
 		HttpServletRequest httpRequest = RWT.getRequest();
 		final HttpSession httpSession = httpRequest.getSession();
 		AccessControlContext acc = (AccessControlContext) httpSession
-				.getAttribute(KernelHeader.ACCESS_CONTROL_CONTEXT);
+				.getAttribute(AuthConstants.ACCESS_CONTROL_CONTEXT);
 
 		final Subject subject;
 		if (acc != null
@@ -92,8 +91,8 @@ public class SecureEntryPoint implements EntryPoint {
 			try {
 				CallbackHandler callbackHandler = new DefaultLoginDialog(
 						display.getActiveShell());
-				loginContext = new ArgeoLoginContext(
-						KernelHeader.LOGIN_CONTEXT_USER, subject,
+				loginContext = new LoginContext(
+						AuthConstants.LOGIN_CONTEXT_USER, subject,
 						callbackHandler);
 			} catch (LoginException e1) {
 				throw new ArgeoException("Cannot initialize login context", e1);
@@ -134,8 +133,8 @@ public class SecureEntryPoint implements EntryPoint {
 				if (log.isTraceEnabled())
 					log.trace("Display disposed");
 				try {
-					LoginContext loginContext = new ArgeoLoginContext(
-							KernelHeader.LOGIN_CONTEXT_USER, subject);
+					LoginContext loginContext = new LoginContext(
+							AuthConstants.LOGIN_CONTEXT_USER, subject);
 					loginContext.logout();
 				} catch (LoginException e) {
 					log.error("Error when logging out", e);
@@ -205,8 +204,8 @@ public class SecureEntryPoint implements EntryPoint {
 
 	private void fullLogout(Subject subject, String username) {
 		try {
-			LoginContext loginContext = new ArgeoLoginContext(
-					KernelHeader.LOGIN_CONTEXT_USER, subject);
+			LoginContext loginContext = new LoginContext(
+					AuthConstants.LOGIN_CONTEXT_USER, subject);
 			loginContext.logout();
 			HttpServletRequest httpRequest = RWT.getRequest();
 			HttpSession httpSession = httpRequest.getSession();