X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.ui%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fui%2FSuiteUi.java;h=cad5a9b994e093dce57c08c18dc147e630f54686;hp=1231d9262efda834e893a75f6a4dd81b670f79af;hb=25ed06d42600a81063515220c51ac2d93fefa27a;hpb=d21b6765434d473fe04de867e2c3e773a6da8030

diff --git a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java
index 1231d92..cad5a9b 100644
--- a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java
+++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteUi.java
@@ -11,7 +11,6 @@ import javax.jcr.Session;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.api.NodeConstants;
-import org.argeo.api.NodeUtils;
 import org.argeo.cms.ui.CmsView;
 import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.jcr.Jcr;
@@ -29,8 +28,8 @@ class SuiteUi extends Composite {
 	private Composite dynamicArea;
 
 	private Session sysSession;
-	private Session homeSession;
-	private Node userHome;
+//	private Session homeSession;
+	private Node userDir;
 
 	private Map<String, SuiteLayer> layers = new HashMap<>();
 	private Map<String, Composite> workAreas = new HashMap<>();
@@ -105,7 +104,7 @@ class SuiteUi extends Composite {
 		}
 		if (context == null) {
 			if (!cmsView.isAnonymous())
-				context = userHome;
+				context = userDir;
 		}
 		Composite toShow = getLayer(layerId, context);
 		currentLayerId = layerId;
@@ -152,9 +151,9 @@ class SuiteUi extends Composite {
 	}
 
 	synchronized void logout() {
-		userHome = null;
+		userDir = null;
 		Jcr.logout(sysSession);
-		Jcr.logout(homeSession);
+//		Jcr.logout(homeSession);
 		currentLayerId = null;
 		workAreas.clear();
 	}
@@ -179,18 +178,18 @@ class SuiteUi extends Composite {
 //		return sysSession;
 //	}
 //
-	synchronized void initSessions(Repository repository) throws RepositoryException {
+	synchronized void initSessions(Repository repository, String userDirPath) throws RepositoryException {
 		this.sysSession = repository.login();
-		this.homeSession = repository.login(NodeConstants.HOME_WORKSPACE);
-		userHome = NodeUtils.getUserHome(homeSession);
+//		this.homeSession = repository.login(NodeConstants.HOME_WORKSPACE);
+		userDir = sysSession.getNode(userDirPath);
 		addDisposeListener((e) -> {
 			Jcr.logout(sysSession);
-			Jcr.logout(homeSession);
+//			Jcr.logout(homeSession);
 		});
 	}
 
-	Node getUserHome() {
-		return userHome;
+	Node getUserDir() {
+		return userDir;
 	}
 
 	Session getSysSession() {
@@ -202,8 +201,8 @@ class SuiteUi extends Composite {
 			return sysSession;
 		if (NodeConstants.SYS_WORKSPACE.equals(workspaceName))
 			return sysSession;
-		else if (NodeConstants.HOME_WORKSPACE.equals(workspaceName))
-			return homeSession;
+//		else if (NodeConstants.HOME_WORKSPACE.equals(workspaceName))
+//			return homeSession;
 		else
 			throw new IllegalArgumentException("Unknown workspace " + workspaceName);
 	}