X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=cms%2Forg.argeo.cms.integration%2Fsrc%2Forg%2Fargeo%2Fcms%2Fintegration%2FCmsLogoutServlet.java;h=461953790b3cbe02297bd9ddbe9d3202d712d51f;hb=85b0dba06831dfca60d634b4591aec21d5d9f1af;hp=bc37b5f4f4e8b3f6a473b963bd53b5df5a081955;hpb=d3bee9f6a2c9aea9bc9ab631e935794dcba39b03;p=gpl%2Fargeo-slc.git

diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLogoutServlet.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLogoutServlet.java
index bc37b5f4f..461953790 100644
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLogoutServlet.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLogoutServlet.java
@@ -14,10 +14,12 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.argeo.api.NodeConstants;
-import org.argeo.cms.auth.CmsSessionId;
+import org.argeo.api.cms.CmsSessionId;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.auth.HttpRequestCallback;
 import org.argeo.cms.auth.HttpRequestCallbackHandler;
+import org.argeo.cms.servlet.ServletHttpRequest;
+import org.argeo.cms.servlet.ServletHttpResponse;
 
 /** Externally authenticate an http session. */
 public class CmsLogoutServlet extends HttpServlet {
@@ -32,18 +34,21 @@ public class CmsLogoutServlet extends HttpServlet {
 	@Override
 	protected void doPost(HttpServletRequest request, HttpServletResponse response)
 			throws ServletException, IOException {
+		ServletHttpRequest httpRequest = new ServletHttpRequest(request);
+		ServletHttpResponse httpResponse = new ServletHttpResponse(response);
 		LoginContext lc = null;
 		try {
-			lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, new HttpRequestCallbackHandler(request, response) {
-				public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-					for (Callback callback : callbacks) {
-						if (callback instanceof HttpRequestCallback) {
-							((HttpRequestCallback) callback).setRequest(request);
-							((HttpRequestCallback) callback).setResponse(response);
+			lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER,
+					new HttpRequestCallbackHandler(httpRequest, httpResponse) {
+						public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+							for (Callback callback : callbacks) {
+								if (callback instanceof HttpRequestCallback) {
+									((HttpRequestCallback) callback).setRequest(httpRequest);
+									((HttpRequestCallback) callback).setResponse(httpResponse);
+								}
+							}
 						}
-					}
-				}
-			});
+					});
 			lc.login();
 
 			Subject subject = lc.getSubject();