Remove JcrSecurityModel from supported APIs

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

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 9b01c552535afed97544bf234f0023430289d26c..7f92ab7cb913965a54fff22fb17647164824f111 100644 (file)
--- 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
@@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
 import org.argeo.cms.KernelHeader;
 import org.argeo.cms.auth.ArgeoLoginContext;
-import org.argeo.eclipse.ui.workbench.ErrorFeedback;
+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;
@@ -150,8 +150,8 @@ public class SecureEntryPoint implements EntryPoint {
                // Logout callback when the display is disposed
                display.disposeExec(new Runnable() {
                        public void run() {
-                               log.debug("Display disposed");
-                               // logout(loginContext, username);
+                               if (log.isTraceEnabled())
+                                       log.trace("Display disposed");
                                try {
                                        loginContext.logout();
                                } catch (LoginException e) {
@@ -174,7 +174,7 @@ public class SecureEntryPoint implements EntryPoint {
                                }
                        });
                        // Explicit exit from workbench
-                       logout(loginContext, username);
+                       fullLogout(loginContext, username);
                } finally {
                        display.dispose();
                }
@@ -229,7 +229,7 @@ public class SecureEntryPoint implements EntryPoint {
                        return null;
        }
 
-       private void logout(LoginContext loginContext, String username) {
+       private void fullLogout(LoginContext loginContext, String username) {
                try {
                        loginContext.logout();
                        SecurityContextHolder.clearContext();