X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=rap%2Forg.argeo.cms.ui.rap%2Fsrc%2Forg%2Fargeo%2Fcms%2Fweb%2FAbstractCmsEntryPoint.java;h=947a4d11a903f1b420027b5fd490581d63f6934b;hb=b71546ddc74d6ca49d252806aafd491c75dfe1fb;hp=c20068fa76b6925efb46e55ed628dc2ae7974c47;hpb=f9efbe5228615951dd8482a4582aa24e00c10ce5;p=lgpl%2Fargeo-commons.git

diff --git a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java
index c20068fa7..947a4d11a 100644
--- a/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java
+++ b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java
@@ -1,6 +1,6 @@
 package org.argeo.cms.web;
 
-import static org.argeo.naming.SharedSecret.X_SHARED_SECRET;
+import static org.argeo.util.naming.SharedSecret.X_SHARED_SECRET;
 
 import java.io.IOException;
 import java.security.PrivilegedAction;
@@ -21,22 +21,21 @@ 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.cms.CmsView;
+import org.argeo.api.cms.CmsLog;
+import org.argeo.api.cms.CmsAuth;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.CurrentUser;
-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.argeo.cms.swt.CmsStyles;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.eclipse.ui.specific.UiContext;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.naming.AuthPassword;
-import org.argeo.naming.SharedSecret;
+import org.argeo.util.naming.AuthPassword;
+import org.argeo.util.naming.SharedSecret;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.application.AbstractEntryPoint;
 import org.eclipse.rap.rwt.client.WebClient;
@@ -53,7 +52,7 @@ import org.eclipse.swt.widgets.Shell;
 public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implements CmsView {
 	private static final long serialVersionUID = 906558779562569784L;
 
-	private final Log log = LogFactory.getLog(AbstractCmsEntryPoint.class);
+	private final CmsLog log = CmsLog.getLog(AbstractCmsEntryPoint.class);
 
 	// private final Subject subject;
 	private LoginContext loginContext;
@@ -85,13 +84,13 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
 		// Initial login
 		LoginContext lc;
 		try {
-			lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER,
-					new HttpRequestCallbackHandler(new ServletHttpRequest(UiContext.getHttpRequest()),
+			lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER,
+					new RemoteAuthCallbackHandler(new ServletHttpRequest(UiContext.getHttpRequest()),
 							new ServletHttpResponse(UiContext.getHttpResponse())));
 			lc.login();
 		} catch (LoginException e) {
 			try {
-				lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_ANONYMOUS);
+				lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_ANONYMOUS);
 				lc.login();
 			} catch (LoginException e1) {
 				throw new CmsException("Cannot log in as anonymous", e1);
@@ -197,7 +196,7 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
 		try {
 			CurrentUser.logoutCmsSession(loginContext.getSubject());
 			loginContext.logout();
-			LoginContext anonymousLc = new LoginContext(NodeConstants.LOGIN_CONTEXT_ANONYMOUS);
+			LoginContext anonymousLc = new LoginContext(CmsAuth.LOGIN_CONTEXT_ANONYMOUS);
 			anonymousLc.login();
 			authChange(anonymousLc);
 		} catch (LoginException e) {
@@ -293,16 +292,16 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
 						super.handle(callbacks);
 						// handle HTTP context
 						for (Callback callback : callbacks) {
-							if (callback instanceof HttpRequestCallback) {
-								((HttpRequestCallback) callback)
+							if (callback instanceof RemoteAuthCallback) {
+								((RemoteAuthCallback) callback)
 										.setRequest(new ServletHttpRequest(UiContext.getHttpRequest()));
-								((HttpRequestCallback) callback)
+								((RemoteAuthCallback) callback)
 										.setResponse(new ServletHttpResponse(UiContext.getHttpResponse()));
 							}
 						}
 					}
 				};
-				LoginContext lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, token);
+				LoginContext lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER, token);
 				lc.login();
 				authChange(lc);// sets the node as well
 				// } else {