X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=rcp%2Forg.argeo.cms.e4.rcp%2Fsrc%2Forg%2Fargeo%2Fcms%2Fe4%2Frcp%2FCmsE4Application.java;h=a13c0170fc9a6d302ba1f217c504f64a5e5b29ea;hb=df60fd8de17590b8f4ab32fd0278e57aaaedbfa2;hp=5cc6a839453bacea1144dce120f79f5a2cd2e155;hpb=b71546ddc74d6ca49d252806aafd491c75dfe1fb;p=lgpl%2Fargeo-commons.git

diff --git a/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java b/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java
index 5cc6a8394..a13c0170f 100644
--- a/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java
+++ b/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java
@@ -8,9 +8,9 @@ import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
 
 import org.argeo.api.cms.CmsAuth;
-import org.argeo.api.cms.CmsImageManager;
-import org.argeo.api.cms.CmsView;
-import org.argeo.api.cms.UxContext;
+import org.argeo.api.cms.ux.CmsImageManager;
+import org.argeo.api.cms.ux.CmsView;
+import org.argeo.api.cms.ux.UxContext;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.swt.CmsSwtUtils;
@@ -31,15 +31,18 @@ public class CmsE4Application implements IApplication, CmsView {
 
 	@Override
 	public Object start(IApplicationContext context) throws Exception {
+		// TODO wait for CMS to be ready
+		Thread.sleep(5000);
+
 		uid = UUID.randomUUID().toString();
 		Subject subject = new Subject();
 		Display display = createDisplay();
-		CmsLoginShell loginShell = new CmsLoginShell(this);
+		CmsLoginShell loginShell = new CmsLoginShell(this, null);
 		// TODO customize CmsLoginShell to be smaller and centered
 		loginShell.setSubject(subject);
 		try {
 			// try pre-auth
-			loginContext = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER, subject, loginShell);
+			loginContext = new LoginContext(CmsAuth.LOGIN_CONTEXT_SINGLE_USER, subject, loginShell);
 			loginContext.login();
 		} catch (LoginException e) {
 			e.printStackTrace();
@@ -80,7 +83,7 @@ public class CmsE4Application implements IApplication, CmsView {
 		// }
 
 		uxContext = new SimpleSwtUxContext();
-		//UiContext.setData(CmsView.KEY, this);
+		// UiContext.setData(CmsView.KEY, this);
 		CmsSwtUtils.registerCmsView(loginShell.getShell(), this);
 		e4Application = getApplication(null);
 		Object res = Subject.doAs(subject, new PrivilegedExceptionAction<Object>() {
@@ -201,5 +204,4 @@ public class CmsE4Application implements IApplication, CmsView {
 		return uid;
 	}
 
-	
 }