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

diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties
index 92cdc4cd9ca418a02edef421e34d80500e641e5f..0e8b1f16593c418c87d1bfbb6bb31ad485da9e94 100644 (file)
--- 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 c7c221d919c9d5b7ab7b02c06ae9941afd96c1b0..ee6263f0ee72e87112b6c95283f80786ea5c3d32 100644 (file)
--- 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 9c868cde6772cb267dc9919535031feb290c4d3b..b7a75c53bc8f018528dee89275ecdac6fdbd8156 100644 (file)
--- 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);