X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.swt%2Fsrc%2Forg%2Fargeo%2Fcms%2Fswt%2Fauth%2FCmsLogin.java;h=9c8680c4d79660260c2b67e3e26ad56a5a7553ba;hb=633a8acd189cc22f06944d278879601189be1bc8;hp=66bccc07ad536775190ee3eb798ddd846a8ec94c;hpb=4185ff8826f893a4a1f054f61a11b89333c3e85d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java b/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java
index 66bccc07a..9c8680c4d 100644
--- a/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java
+++ b/org.argeo.cms.swt/src/org/argeo/cms/swt/auth/CmsLogin.java
@@ -17,10 +17,9 @@ import javax.security.auth.callback.UnsupportedCallbackException;
 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.NodeState;
+import org.argeo.api.cms.CmsAuth;
+import org.argeo.api.cms.CmsContext;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.CmsView;
 import org.argeo.cms.CmsMsg;
 import org.argeo.cms.LocaleUtils;
@@ -48,7 +47,7 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
 public class CmsLogin implements CmsStyles, CallbackHandler {
-	private final static Log log = LogFactory.getLog(CmsLogin.class);
+	private final static CmsLog log = CmsLog.getLog(CmsLogin.class);
 
 	private Composite parent;
 	private Text usernameT, passwordT;
@@ -65,7 +64,8 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
 
 	public CmsLogin(CmsView cmsView) {
 		this.cmsView = cmsView;
-		NodeState nodeState = null;// = Activator.getNodeState();
+		CmsContext nodeState = null;// = Activator.getNodeState();
+		// FIXME reactivate locales
 		if (nodeState != null) {
 			defaultLocale = nodeState.getDefaultLocale();
 			List<Locale> locales = nodeState.getLocales();
@@ -272,9 +272,9 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
 			// loginContext.logout();
 			LoginContext loginContext;
 			if (subject == null)
-				loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, this);
+				loginContext = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER, this);
 			else
-				loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, subject, this);
+				loginContext = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER, subject, this);
 			loginContext.login();
 			cmsView.authChange(loginContext);
 			return true;