projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Massive Argeo APIs refactoring
[lgpl/argeo-commons.git]
/
rap
/
org.argeo.cms.e4.rap
/
src
/
org
/
argeo
/
cms
/
e4
/
rap
/
CmsLoginLifecycle.java
diff --git
a/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java
b/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java
index 3ee8df1ef76c27a9b44a672c16354d4b3fe0cf8a..ac9ab1dbef14a37e51cf563862e984fd88d97d54 100644
(file)
--- a/
rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java
+++ b/
rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java
@@
-7,11
+7,10
@@
import javax.security.auth.Subject;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsAuth;
import org.argeo.api.cms.CmsImageManager;
import org.argeo.api.cms.CmsView;
import org.argeo.api.cms.CmsImageManager;
import org.argeo.api.cms.CmsView;
+import org.argeo.api.cms.CmsLog;
import org.argeo.api.cms.UxContext;
import org.argeo.cms.auth.CurrentUser;
import org.argeo.cms.swt.CmsSwtUtils;
import org.argeo.api.cms.UxContext;
import org.argeo.cms.auth.CurrentUser;
import org.argeo.cms.swt.CmsSwtUtils;
@@
-33,7
+32,7
@@
import org.osgi.service.event.EventHandler;
@SuppressWarnings("restriction")
public class CmsLoginLifecycle implements CmsView {
@SuppressWarnings("restriction")
public class CmsLoginLifecycle implements CmsView {
- private final static
Log log = LogFactory
.getLog(CmsLoginLifecycle.class);
+ private final static
CmsLog log = CmsLog
.getLog(CmsLoginLifecycle.class);
private UxContext uxContext;
private CmsImageManager imageManager;
private UxContext uxContext;
private CmsImageManager imageManager;
@@
-68,7
+67,7
@@
public class CmsLoginLifecycle implements CmsView {
loginShell.setSubject(subject);
try {
// try pre-auth
loginShell.setSubject(subject);
try {
// try pre-auth
- loginContext = new LoginContext(
NodeConstants
.LOGIN_CONTEXT_USER, subject, loginShell);
+ loginContext = new LoginContext(
CmsAuth
.LOGIN_CONTEXT_USER, subject, loginShell);
loginContext.login();
} catch (LoginException e) {
loginShell.createUi();
loginContext.login();
} catch (LoginException e) {
loginShell.createUi();