X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.swt%2Fsrc%2Forg%2Fargeo%2Fcms%2Fswt%2Fauth%2FCmsLogin.java;h=42eedf1a3a23417f9f828c75835e9c527cf926ff;hb=b71546ddc74d6ca49d252806aafd491c75dfe1fb;hp=8e12a8986e663be7ed8508c1e83953107d9002a2;hpb=b7683883512d924a039a43c2e1102290aa49f64d;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 8e12a8986..42eedf1a3 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
@@ -16,15 +16,16 @@ import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
-import javax.servlet.http.HttpServletRequest;
-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.CmsView;
+import org.argeo.api.cms.CmsLog;
+import org.argeo.api.cms.CmsAuth;
+import org.argeo.api.cms.CmsState;
 import org.argeo.cms.CmsMsg;
 import org.argeo.cms.LocaleUtils;
-import org.argeo.cms.auth.HttpRequestCallback;
+import org.argeo.cms.auth.RemoteAuthCallback;
+import org.argeo.cms.servlet.ServletHttpRequest;
+import org.argeo.cms.servlet.ServletHttpResponse;
 import org.argeo.cms.swt.CmsStyles;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.eclipse.ui.specific.UiContext;
@@ -46,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;
@@ -63,7 +64,7 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
 
 	public CmsLogin(CmsView cmsView) {
 		this.cmsView = cmsView;
-		NodeState nodeState = null;// = Activator.getNodeState();
+		CmsState nodeState = null;// = Activator.getNodeState();
 		if (nodeState != null) {
 			defaultLocale = nodeState.getDefaultLocale();
 			List<Locale> locales = nodeState.getLocales();
@@ -270,9 +271,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;
@@ -308,9 +309,9 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
 				((NameCallback) callback).setName(usernameT.getText());
 			else if (callback instanceof PasswordCallback && passwordT != null)
 				((PasswordCallback) callback).setPassword(passwordT.getTextChars());
-			else if (callback instanceof HttpRequestCallback) {
-				((HttpRequestCallback) callback).setRequest(UiContext.getHttpRequest());
-				((HttpRequestCallback) callback).setResponse(UiContext.getHttpResponse());
+			else if (callback instanceof RemoteAuthCallback) {
+				((RemoteAuthCallback) callback).setRequest(new ServletHttpRequest(UiContext.getHttpRequest()));
+				((RemoteAuthCallback) callback).setResponse(new ServletHttpResponse(UiContext.getHttpResponse()));
 			} else if (callback instanceof LanguageCallback) {
 				Locale toUse = null;
 				if (localeChoice != null)