From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 16 Nov 2021 08:48:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into testing
X-Git-Tag: v2.1.18~11
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=6d86c642497b795d566bda2918aaea5c3de43084;hp=d54761c3afbd70612e0a40a4ea927b18422fc6a6;p=gpl%2Fargeo-slc.git

Merge remote-tracking branch 'origin/master' into testing
---

diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties
index 92cdc4cd9..0e8b1f165 100644
--- a/demo/slc_demo_rap.properties
+++ b/demo/slc_demo_rap.properties
@@ -1,6 +1,8 @@
 argeo.osgi.start.2.http=\
 org.eclipse.equinox.http.servlet,\
+org.eclipse.equinox.metatype,\
 org.eclipse.equinox.cm,\
+org.eclipse.equinox.ds,\
 org.eclipse.rap.rwt.osgi
 
 argeo.osgi.start.3.node=\
diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrBrowserView.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrBrowserView.java
index c7c221d91..ee6263f0e 100644
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrBrowserView.java
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrBrowserView.java
@@ -13,6 +13,7 @@ import javax.jcr.observation.Event;
 import javax.jcr.observation.EventListener;
 import javax.jcr.observation.ObservationManager;
 
+import org.argeo.api.NodeConstants;
 import org.argeo.api.security.Keyring;
 import org.argeo.cms.ui.jcr.DefaultRepositoryRegister;
 import org.argeo.cms.ui.jcr.JcrBrowserUtils;
@@ -83,7 +84,7 @@ public class JcrBrowserView extends ViewPart {
 		top.setLayout(gl);
 
 		try {
-			this.userSession = this.nodeRepository.login();
+			this.userSession = this.nodeRepository.login(NodeConstants.HOME_WORKSPACE);
 		} catch (RepositoryException e) {
 			throw new EclipseUiException("Cannot open user session", e);
 		}
diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java
index 9c868cde6..b7a75c53b 100644
--- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java
+++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java
@@ -8,6 +8,7 @@ import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 import javax.jcr.security.Privilege;
 
+import org.argeo.api.NodeConstants;
 import org.argeo.api.security.Keyring;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcConstants;
@@ -47,7 +48,7 @@ public class PublishWorkspace extends AbstractHandler {
 		Session session = null;
 
 		try {
-			nodeSession = nodeRepository.login();
+			nodeSession = nodeRepository.login(NodeConstants.HOME_WORKSPACE);
 			Node repoNode = nodeSession.getNode(targetRepoPath);
 			Repository repository = RepoUtils.getRepository(repositoryFactory,
 					keyring, repoNode);