X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=cms%2Forg.argeo.cms.integration%2Fsrc%2Forg%2Fargeo%2Fcms%2Fintegration%2FCmsLoginServlet.java;h=29a3137bbfa150a76d2f3ce34a9c117079e6c4da;hb=fbde11e8a342318876a4744c4676d3618bdf8583;hp=ad976b114a8dad6b0622b3c77b3d8bb19602123c;hpb=85b0dba06831dfca60d634b4591aec21d5d9f1af;p=gpl%2Fargeo-slc.git

diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLoginServlet.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLoginServlet.java
index ad976b114..29a3137bb 100644
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLoginServlet.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLoginServlet.java
@@ -16,10 +16,10 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.argeo.api.NodeConstants;
+import org.argeo.api.cms.CmsAuth;
 import org.argeo.api.cms.CmsSessionId;
-import org.argeo.cms.auth.HttpRequestCallback;
-import org.argeo.cms.auth.HttpRequestCallbackHandler;
+import org.argeo.cms.auth.RemoteAuthCallback;
+import org.argeo.cms.auth.RemoteAuthCallbackHandler;
 import org.argeo.cms.servlet.ServletHttpRequest;
 import org.argeo.cms.servlet.ServletHttpResponse;
 import org.osgi.service.useradmin.Authorization;
@@ -49,16 +49,16 @@ public class CmsLoginServlet extends HttpServlet {
 		ServletHttpRequest request = new ServletHttpRequest(req);
 		ServletHttpResponse response = new ServletHttpResponse(resp);
 		try {
-			lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, new HttpRequestCallbackHandler(request, response) {
+			lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER, new RemoteAuthCallbackHandler(request, response) {
 				public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
 					for (Callback callback : callbacks) {
 						if (callback instanceof NameCallback && username != null)
 							((NameCallback) callback).setName(username);
 						else if (callback instanceof PasswordCallback && password != null)
 							((PasswordCallback) callback).setPassword(password.toCharArray());
-						else if (callback instanceof HttpRequestCallback) {
-							((HttpRequestCallback) callback).setRequest(request);
-							((HttpRequestCallback) callback).setResponse(response);
+						else if (callback instanceof RemoteAuthCallback) {
+							((RemoteAuthCallback) callback).setRequest(request);
+							((RemoteAuthCallback) callback).setResponse(response);
 						}
 					}
 				}