(2);
- projections.add(new Projection(sourceName, workspaceName, false, mirrorRules));
- projections.add(this.systemSourceProjection);
- this.federatedSource.addWorkspace(workspaceName, projections, isDefault);
- }
- }
+ addWorkspace(workspaceName, isDefault);
} else {
// We're not sharing a '/jcr:system' branch, so we need to make sure there is one in the source.
// Note that this doesn't always work with some connectors (e.g., the FileSystem or SVN connectors)
Index: modeshape-jcr/src/main/java/org/modeshape/jcr/JcrSession.java
===================================================================
--- modeshape-jcr/src/main/java/org/modeshape/jcr/JcrSession.java (revision 1904)
+++ modeshape-jcr/src/main/java/org/modeshape/jcr/JcrSession.java (working copy)
@@ -477,7 +477,9 @@ class JcrSession implements Session {
|| hasRole(ModeShapeRoles.READWRITE, workspaceName)
|| hasRole(ModeShapeRoles.ADMIN, workspaceName);
} else if (ModeShapePermissions.REGISTER_NAMESPACE.equals(action)
- || ModeShapePermissions.REGISTER_TYPE.equals(action) || ModeShapePermissions.UNLOCK_ANY.equals(action)) {
+ || ModeShapePermissions.REGISTER_TYPE.equals(action) || ModeShapePermissions.UNLOCK_ANY.equals(action)
+ || ModeShapePermissions.CREATE_WORKSPACE.equals(action)
+ || ModeShapePermissions.DELETE_WORKSPACE.equals(action)) {
hasPermission &= hasRole(ModeShapeRoles.ADMIN, workspaceName);
} else {
hasPermission &= hasRole(ModeShapeRoles.ADMIN, workspaceName) || hasRole(ModeShapeRoles.READWRITE, workspaceName);
Index: modeshape-jcr/src/main/java/org/modeshape/jcr/JcrWorkspace.java
===================================================================
--- modeshape-jcr/src/main/java/org/modeshape/jcr/JcrWorkspace.java (revision 1904)
+++ modeshape-jcr/src/main/java/org/modeshape/jcr/JcrWorkspace.java (working copy)
@@ -749,25 +749,91 @@ class JcrWorkspace implements Workspace {
versionManager().restore(versions, removeExisting);
}
+ /**
+ * {@inheritDoc}
+ *
+ * The caller must have {@link ModeShapePermissions#CREATE_WORKSPACE permission to create workspaces}, and must have
+ * {@link ModeShapePermissions#READ read permission} on the source workspace.
+ *
+ *
+ * @see javax.jcr.Workspace#createWorkspace(java.lang.String, java.lang.String)
+ */
@Override
public void createWorkspace( String name,
String srcWorkspace )
throws AccessDeniedException, UnsupportedRepositoryOperationException, NoSuchWorkspaceException, RepositoryException {
- throw new UnsupportedRepositoryOperationException();
+ CheckArg.isNotNull(name, "name");
+ CheckArg.isNotNull(srcWorkspace, "srcWorkspace");
+ session.checkLive();
+ try {
+ session.checkPermission(srcWorkspace, null, ModeShapePermissions.READ);
+ session.checkPermission(name, null, ModeShapePermissions.CREATE_WORKSPACE);
+ repository.createWorkspace(name, srcWorkspace);
+ } catch (AccessControlException e) {
+ throw new AccessDeniedException(e);
+ } catch (InvalidWorkspaceException e) {
+ throw new NoSuchWorkspaceException(e);
+ } catch (RepositorySourceException e) {
+ throw new RepositoryException(e);
+ }
}
+ /**
+ * {@inheritDoc}
+ *
+ * The caller must have {@link ModeShapePermissions#CREATE_WORKSPACE permission to create workspaces}.
+ *
+ *
+ * @see javax.jcr.Workspace#createWorkspace(java.lang.String)
+ */
@Override
public void createWorkspace( String name )
throws AccessDeniedException, UnsupportedRepositoryOperationException, RepositoryException {
- throw new UnsupportedRepositoryOperationException();
+ CheckArg.isNotNull(name, "name");
+ session.checkLive();
+ try {
+ session.checkPermission(name, null, ModeShapePermissions.CREATE_WORKSPACE);
+ repository.createWorkspace(name, null);
+ } catch (AccessControlException e) {
+ throw new AccessDeniedException(e);
+ } catch (InvalidWorkspaceException e) {
+ throw new RepositoryException(e);
+ } catch (RepositorySourceException e) {
+ throw new RepositoryException(e);
+ }
}
+ /**
+ * {@inheritDoc}
+ *
+ * It is not possible to delete the current workspace. Also, the caller must have
+ * {@link ModeShapePermissions#DELETE_WORKSPACE permission to delete workspaces}.
+ *
+ *
+ * @see javax.jcr.Workspace#deleteWorkspace(java.lang.String)
+ */
@Override
public void deleteWorkspace( String name )
throws AccessDeniedException, UnsupportedRepositoryOperationException, NoSuchWorkspaceException, RepositoryException {
- throw new UnsupportedRepositoryOperationException();
+ CheckArg.isNotNull(name, "name");
+ session.checkLive();
+ try {
+ session.checkPermission(name, null, ModeShapePermissions.DELETE_WORKSPACE);
+ repository.destroyWorkspace(name, this);
+ } catch (AccessControlException e) {
+ throw new AccessDeniedException(e);
+ } catch (InvalidWorkspaceException e) {
+ throw new RepositoryException(e);
+ } catch (RepositorySourceException e) {
+ throw new RepositoryException(e);
+ }
}
+ /**
+ * {@inheritDoc}
+ *
+ * @see javax.jcr.Workspace#getVersionManager()
+ */
@Override
public VersionManager getVersionManager() {
return versionManager;
Index: modeshape-jcr/src/main/java/org/modeshape/jcr/ModeShapePermissions.java
===================================================================
--- modeshape-jcr/src/main/java/org/modeshape/jcr/ModeShapePermissions.java (revision 1904)
+++ modeshape-jcr/src/main/java/org/modeshape/jcr/ModeShapePermissions.java (working copy)
@@ -24,6 +24,7 @@
package org.modeshape.jcr;
import javax.jcr.Session;
+import javax.jcr.Workspace;
/**
* The set of constants that can be used for action literals with the {@link Session#checkPermission(String, String)} method.
@@ -87,4 +88,16 @@ public interface ModeShapePermissions {
*/
public static final String READ = "read";
+ /**
+ * The {@link #CREATE_WORKSPACE create_workspace} permission allows the user the ability to
+ * {@link Workspace#createWorkspace(String) create new workspaces}.
+ */
+ public static final String CREATE_WORKSPACE = "create_workspace";
+
+ /**
+ * The {@link #DELETE_WORKSPACE delete_workspace} permission allows the user the ability to
+ * {@link Workspace#deleteWorkspace(String) delete workspaces}.
+ */
+ public static final String DELETE_WORKSPACE = "delete_workspace";
+
}
Index: modeshape-jcr/src/main/java/org/modeshape/jcr/ModeShapeRoles.java
===================================================================
--- modeshape-jcr/src/main/java/org/modeshape/jcr/ModeShapeRoles.java (revision 1904)
+++ modeshape-jcr/src/main/java/org/modeshape/jcr/ModeShapeRoles.java (working copy)
@@ -87,6 +87,18 @@ import javax.security.auth.Subject;
* |
* Allows |
*
+ *
+ * | create_workspace |
+ * |
+ * |
+ * Allows |
+ *
+ *
+ * | delete_workspace |
+ * |
+ * |
+ * Allows |
+ *
*
*
*/
Index: modeshape-jcr/src/test/java/org/modeshape/jcr/JcrRepositoryTest.java
===================================================================
--- modeshape-jcr/src/test/java/org/modeshape/jcr/JcrRepositoryTest.java (revision 1904)
+++ modeshape-jcr/src/test/java/org/modeshape/jcr/JcrRepositoryTest.java (working copy)
@@ -33,6 +33,7 @@ import java.security.PrivilegedExceptionAction;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.Set;
import java.util.UUID;
import javax.jcr.Credentials;
import javax.jcr.Repository;
@@ -55,6 +56,7 @@ import org.modeshape.graph.Node;
import org.modeshape.graph.JaasSecurityContext.UserPasswordCallbackHandler;
import org.modeshape.graph.connector.RepositoryConnection;
import org.modeshape.graph.connector.RepositoryConnectionFactory;
+import org.modeshape.graph.connector.RepositorySource;
import org.modeshape.graph.connector.RepositorySourceException;
import org.modeshape.graph.connector.inmemory.InMemoryRepositorySource;
import org.modeshape.graph.observe.MockObservable;
@@ -76,7 +78,7 @@ public class JcrRepositoryTest {
private JcrSession session;
@BeforeClass
- public static void beforeClass() {
+ public static void beforeAll() {
// Initialize IDTrust
String configFile = "security/jaas.conf.xml";
IDTrustConfiguration idtrustConfig = new IDTrustConfiguration();
@@ -89,7 +91,7 @@ public class JcrRepositoryTest {
}
@Before
- public void before() throws Exception {
+ public void beforeEach() throws Exception {
MockitoAnnotations.initMocks(this);
sourceName = "repository";
@@ -108,9 +110,8 @@ public class JcrRepositoryTest {
*
* @see org.modeshape.graph.connector.RepositoryConnectionFactory#createConnection(java.lang.String)
*/
- @SuppressWarnings( "synthetic-access" )
public RepositoryConnection createConnection( String sourceName ) throws RepositorySourceException {
- return sourceName.equals(sourceName) ? source.getConnection() : null;
+ return sourceName.equals(source().getName()) ? source().getConnection() : null;
}
};
@@ -119,7 +120,7 @@ public class JcrRepositoryTest {
repository = new JcrRepository(context, connectionFactory, sourceName, new MockObservable(), null, descriptors, null);
// Set up the graph that goes directly to the source ...
- sourceGraph = Graph.create(source, context);
+ sourceGraph = Graph.create(source(), context);
// Set up the graph that goes directly to the system source ...
systemGraph = repository.createSystemGraph(context);
@@ -136,6 +137,10 @@ public class JcrRepositoryTest {
}
}
+ protected RepositorySource source() {
+ return source;
+ }
+
@Test
public void shouldFailIfWorkspacesSharingSystemBranchConstantIsFalse() {
// Check that the debugging flag is ALWAYS set to true...
@@ -577,4 +582,48 @@ public class JcrRepositoryTest {
assertThat(readerNode.isLocked(), is(false));
}
+ @Test
+ public void shouldHaveAvailableWorkspacesMatchingThoseInSourceContainingJustDefaultWorkspace() throws Exception {
+ // Set up the source ...
+ source = new InMemoryRepositorySource();
+ source.setName(sourceName);
+ sourceGraph = Graph.create(source(), context);
+
+ // Create the repository ...
+ repository = new JcrRepository(context, connectionFactory, sourceName, new MockObservable(), null, descriptors, null);
+
+ // Get the available workspaces ...
+ session = createSession();
+ Set jcrWorkspaces = setOf(session.getWorkspace().getAccessibleWorkspaceNames());
+
+ // Check against the session ...
+ Set graphWorkspaces = sourceGraph.getWorkspaces();
+ assertThat(jcrWorkspaces, is(graphWorkspaces));
+ }
+
+ @Test
+ public void shouldHaveAvailableWorkspacesMatchingThoseInSourceContainingPredefinedWorkspaces() throws Exception {
+ // Set up the source ...
+ source = new InMemoryRepositorySource();
+ source.setName(sourceName);
+ source.setPredefinedWorkspaceNames(new String[] {"ws1", "ws2", "ws3"});
+ source.setDefaultWorkspaceName("ws1");
+ sourceGraph = Graph.create(source(), context);
+
+ // Create the repository ...
+ repository = new JcrRepository(context, connectionFactory, sourceName, new MockObservable(), null, descriptors, null);
+
+ // Get the available workspaces ...
+ session = createSession();
+ Set jcrWorkspaces = setOf(session.getWorkspace().getAccessibleWorkspaceNames());
+
+ // Check against the session ...
+ Set graphWorkspaces = sourceGraph.getWorkspaces();
+ assertThat(jcrWorkspaces, is(graphWorkspaces));
+ }
+
+ protected Set setOf( T... values ) {
+ return org.modeshape.common.collection.Collections.unmodifiableSet(values);
+ }
+
}