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

diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java b/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java
index 887490c41..c20068fa7 100644
--- a/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java
+++ b/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java
@@ -24,12 +24,15 @@ 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.cms.CmsException;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.auth.HttpRequestCallback;
 import org.argeo.cms.auth.HttpRequestCallbackHandler;
-import org.argeo.cms.ui.CmsStyles;
-import org.argeo.cms.ui.CmsView;
+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;
@@ -83,7 +86,8 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
 		LoginContext lc;
 		try {
 			lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER,
-					new HttpRequestCallbackHandler(UiContext.getHttpRequest(), UiContext.getHttpResponse()));
+					new HttpRequestCallbackHandler(new ServletHttpRequest(UiContext.getHttpRequest()),
+							new ServletHttpResponse(UiContext.getHttpResponse())));
 			lc.login();
 		} catch (LoginException e) {
 			try {
@@ -120,7 +124,7 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
 	@Override
 	protected final void createContents(final Composite parent) {
 		// UiContext.setData(CmsView.KEY, this);
-		CmsView.registerCmsView(parent.getShell(), this);
+		CmsSwtUtils.registerCmsView(parent.getShell(), this);
 		Subject.doAs(getSubject(), new PrivilegedAction<Void>() {
 			@Override
 			public Void run() {
@@ -290,8 +294,10 @@ public abstract class AbstractCmsEntryPoint extends AbstractEntryPoint implement
 						// handle HTTP context
 						for (Callback callback : callbacks) {
 							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()));
 							}
 						}
 					}