X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.servlet%2Fsrc%2Forg%2Fargeo%2Fcms%2Fservlet%2FCmsServletContext.java;h=40404c5d45d44eb70b675ee045acf2aee0674c1f;hb=b71546ddc74d6ca49d252806aafd491c75dfe1fb;hp=a5ba6ef82be5ed3658fd9f2572fd995f6ff579ff;hpb=beec30ca4ad6e0a27b3fe984d987b98988e14e76;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.servlet/src/org/argeo/cms/servlet/CmsServletContext.java b/org.argeo.cms.servlet/src/org/argeo/cms/servlet/CmsServletContext.java
index a5ba6ef82..40404c5d4 100644
--- a/org.argeo.cms.servlet/src/org/argeo/cms/servlet/CmsServletContext.java
+++ b/org.argeo.cms.servlet/src/org/argeo/cms/servlet/CmsServletContext.java
@@ -11,10 +11,10 @@ import javax.security.auth.login.LoginException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.api.NodeConstants;
-import org.argeo.cms.auth.HttpRequestCallbackHandler;
+import org.argeo.api.cms.CmsAuth;
+import org.argeo.api.cms.CmsLog;
+import org.argeo.cms.auth.RemoteAuthCallbackHandler;
+import org.argeo.cms.auth.RemoteAuthUtils;
 import org.argeo.cms.servlet.internal.HttpUtils;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
@@ -25,7 +25,7 @@ import org.osgi.service.http.context.ServletContextHelper;
  * pre-authenticated.
  */
 public class CmsServletContext extends ServletContextHelper {
-	private final static Log log = LogFactory.getLog(CmsServletContext.class);
+	private final static CmsLog log = CmsLog.getLog(CmsServletContext.class);
 	// use CMS bundle for resources
 	private Bundle bundle = FrameworkUtil.getBundle(getClass());
 
@@ -43,8 +43,8 @@ public class CmsServletContext extends ServletContextHelper {
 			HttpUtils.logRequestHeaders(log, request);
 		LoginContext lc;
 		try {
-			lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER,
-					new HttpRequestCallbackHandler(new ServletHttpRequest(request), new ServletHttpResponse(response)));
+			lc = CmsAuth.USER.newLoginContext(
+					new RemoteAuthCallbackHandler(new ServletHttpRequest(request), new ServletHttpResponse(response)));
 			lc.login();
 		} catch (LoginException e) {
 			lc = processUnauthorized(request, response);
@@ -61,7 +61,7 @@ public class CmsServletContext extends ServletContextHelper {
 			@Override
 			public Void run() {
 				// TODO also set login context in order to log out ?
-				ServletAuthUtils.configureRequestSecurity(new ServletHttpRequest(request));
+				RemoteAuthUtils.configureRequestSecurity(new ServletHttpRequest(request));
 				return null;
 			}
 
@@ -71,14 +71,14 @@ public class CmsServletContext extends ServletContextHelper {
 
 	@Override
 	public void finishSecurity(HttpServletRequest request, HttpServletResponse response) {
-		ServletAuthUtils.clearRequestSecurity(new ServletHttpRequest(request));
+		RemoteAuthUtils.clearRequestSecurity(new ServletHttpRequest(request));
 	}
 
 	protected LoginContext processUnauthorized(HttpServletRequest request, HttpServletResponse response) {
 		// anonymous
 		try {
-			LoginContext lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_ANONYMOUS,
-					new HttpRequestCallbackHandler(new ServletHttpRequest(request), new ServletHttpResponse(response)));
+			LoginContext lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_ANONYMOUS,
+					new RemoteAuthCallbackHandler(new ServletHttpRequest(request), new ServletHttpResponse(response)));
 			lc.login();
 			return lc;
 		} catch (LoginException e1) {