Fix issues with admin

git-svn-id: https://svn.argeo.org/slc/trunk@5915 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/modules/org.argeo.slc.server.repo/META-INF/spring/jcr.xml b/modules/org.argeo.slc.server.repo/META-INF/spring/jcr.xml
index 7fa468ba9c76442f08a986e95dbbd7352ed5c044..f34e48d6ede16d4b990e17e49be7ce3b4efdb1c7 100644 (file)
--- a/modules/org.argeo.slc.server.repo/META-INF/spring/jcr.xml
+++ b/modules/org.argeo.slc.server.repo/META-INF/spring/jcr.xml
@@ -54,7 +54,6 @@
                <property name="principalPrivileges">\r
                        <map>\r
                                <entry key="jcr:all" value="ROLE_SLC" />\r
-                               <entry key="jcr:all" value="ROLE_ADMIN" />\r
                        </map>\r
                </property>\r
                <property name="workspace" value="*" />\r

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java
index 3e197b07031e17df888e317d3bb10a4ba3bf244e..812e6eebe01e4d35e0380f783d10a1f9fea15075 100644 (file)
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java
@@ -18,10 +18,12 @@ package org.argeo.slc.client.ui.dist.commands;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
+import javax.jcr.security.Privilege;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
+import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.client.ui.dist.utils.CommandHelpers;
 import org.eclipse.core.commands.AbstractHandler;
@@ -40,6 +42,8 @@ public class CreateWorkspace extends AbstractHandler {
        public final static String DEFAULT_LABEL = "Create new workspace";
        public final static String DEFAULT_ICON_PATH = "icons/addItem.gif";
 
+       private String slcRole = "ROLE_SLC";
+
        /* DEPENDENCY INJECTION */
        private Repository repository;
 
@@ -56,16 +60,19 @@ public class CreateWorkspace extends AbstractHandler {
                try {
                        session = repository.login();
                        session.getWorkspace().createWorkspace(workspaceName);
+                       JcrUtils.logoutQuietly(session);
+                       // init new workspace
+                       session = repository.login(workspaceName);
+                       JcrUtils.addPrivilege(session, "/", slcRole, Privilege.JCR_ALL);
                        CommandHelpers.callCommand(RefreshDistributionsView.ID);
                } catch (RepositoryException re) {
                        throw new ArgeoException(
                                        "Unexpected error while creating the new workspace.", re);
                } finally {
-                       if (session != null)
-                               session.logout();
+                       JcrUtils.logoutQuietly(session);
                }
                if (log.isTraceEnabled())
-                       log.debug("WORKSPACE " + workspaceName + " CREATED");
+                       log.trace("WORKSPACE " + workspaceName + " CREATED");
                return null;
        }
 
@@ -73,4 +80,9 @@ public class CreateWorkspace extends AbstractHandler {
        public void setRepository(Repository repository) {
                this.repository = repository;
        }
+
+       public void setSlcRole(String slcRole) {
+               this.slcRole = slcRole;
+       }
+
 }
\ No newline at end of file