X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.swt%2Fsrc%2Forg%2Fargeo%2Fcms%2Fswt%2Fauth%2FCmsLogin.java;h=e4d08d728e8fd5b9f5a39e79db403dce4bab5ed4;hb=7064547ae5d85225546f1b8f15d6b5c82f30fe22;hp=8e12a8986e663be7ed8508c1e83953107d9002a2;hpb=d132025deea1a6f5f81f0fb64932ce404c426bb0;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..e4d08d728 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,7 +16,7 @@ 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;
@@ -25,6 +25,8 @@ import org.argeo.api.cms.CmsView;
 import org.argeo.cms.CmsMsg;
 import org.argeo.cms.LocaleUtils;
 import org.argeo.cms.auth.HttpRequestCallback;
+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;
@@ -309,8 +311,8 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
 			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());
+				((HttpRequestCallback) callback).setRequest(new ServletHttpRequest(UiContext.getHttpRequest()));
+				((HttpRequestCallback) callback).setResponse(new ServletHttpResponse(UiContext.getHttpResponse()));
 			} else if (callback instanceof LanguageCallback) {
 				Locale toUse = null;
 				if (localeChoice != null)