Remove FedoraRepositoryWorkspaces; per awoods response to Fedora Repo…

… 4 Workspace question
fcrepo · Sep 25, 2014 · a4f0495 · a4f0495
1 parent 8c0f022
commit a4f0495
Show file tree

Hide file tree

Showing 15 changed files with 5 additions and 762 deletions.
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoryWorkspaces.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoryWorkspaces.java
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/responses/StreamingBaseHtmlProvider.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/responses/StreamingBaseHtmlProvider.java
@@ -163,7 +163,7 @@ void init() throws IOException {
 
             final List<String> otherTemplates =
                     ImmutableList.of("search:results", "jcr:namespaces",
-                            "jcr:workspaces", "jcr:nodetypes",
+                            "jcr:nodetypes",
                             "node", "fcr:versions", "fcr:lock");
 
             for (final String key : otherTemplates) {

diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/url/HttpApiResources.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/url/HttpApiResources.java
@@ -28,7 +28,6 @@
 import static org.fcrepo.kernel.RdfLexicon.HAS_SITEMAP;
 import static org.fcrepo.kernel.RdfLexicon.HAS_TRANSACTION_SERVICE;
 import static org.fcrepo.kernel.RdfLexicon.HAS_VERSION_HISTORY;
-import static org.fcrepo.kernel.RdfLexicon.HAS_WORKSPACE_SERVICE;
 import static org.fcrepo.kernel.RdfLexicon.RDFS_LABEL;
 import static org.fcrepo.kernel.RdfLexicon.REPOSITORY_NAMESPACE;
 import static org.fcrepo.kernel.RdfLexicon.DC_NAMESPACE;
@@ -46,7 +45,6 @@
 import org.fcrepo.http.api.repository.FedoraRepositoryExport;
 import org.fcrepo.http.api.repository.FedoraRepositoryNamespaces;
 import org.fcrepo.http.api.repository.FedoraRepositoryTransactions;
-import org.fcrepo.http.api.repository.FedoraRepositoryWorkspaces;
 import org.fcrepo.http.commons.api.rdf.UriAwareResourceModelFactory;
 import org.fcrepo.kernel.FedoraResource;
 import org.fcrepo.kernel.exception.RepositoryRuntimeException;
@@ -177,11 +175,6 @@ private void addRepositoryStatements(final UriInfo uriInfo, final Model model,
                 .getBaseUriBuilder().path(FedoraRepositoryNamespaces.class)
                 .build().toASCIIString()));
 
-        // fcr:workspaces
-        model.add(s, HAS_WORKSPACE_SERVICE, createResource(uriInfo
-                .getBaseUriBuilder().path(FedoraRepositoryWorkspaces.class)
-                .build().toASCIIString()));
-
         final Property dcFormat = createProperty(DC_NAMESPACE + "format");
         // fcr:export?format=xyz
         for (final String key : serializers.keySet()) {

diff --git a/fcrepo-http-api/src/main/resources/views/common-header.vsl b/fcrepo-http-api/src/main/resources/views/common-header.vsl
@@ -16,7 +16,6 @@
         <ul class="nav navbar-nav">
             <li><a href="$uriInfo.baseUriBuilder.build()">Home</a></li>
             <li><a href="$uriInfo.baseUriBuilder.build()fcr:namespaces">Namespaces</a></li>
-            <li><a href="$uriInfo.baseUriBuilder.build()fcr:workspaces">Workspaces</a></li>
             <li><a href="$uriInfo.baseUriBuilder.build()fcr:nodetypes">Types</a></li>
         </ul>
         <form class="navbar-form navbar-left" role="search" method="GET" action="$uriInfo.baseUriBuilder.build()fcr:search">

diff --git a/fcrepo-http-api/src/main/resources/views/jcr-workspaces.vsl b/fcrepo-http-api/src/main/resources/views/jcr-workspaces.vsl
diff --git a/...http-api/src/test/java/org/fcrepo/http/api/repository/FedoraRepositoryWorkspacesTest.java b/...http-api/src/test/java/org/fcrepo/http/api/repository/FedoraRepositoryWorkspacesTest.java
diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/url/HttpApiResourcesTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/url/HttpApiResourcesTest.java
@@ -26,7 +26,6 @@
 import static org.fcrepo.kernel.RdfLexicon.HAS_SITEMAP;
 import static org.fcrepo.kernel.RdfLexicon.HAS_TRANSACTION_SERVICE;
 import static org.fcrepo.kernel.RdfLexicon.HAS_VERSION_HISTORY;
-import static org.fcrepo.kernel.RdfLexicon.HAS_WORKSPACE_SERVICE;
 import static org.jgroups.util.Util.assertFalse;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -116,7 +115,6 @@ public void shouldDecorateModeRootNodesWithRepositoryWideLinks()
         assertTrue(model.contains(graphSubject, HAS_SITEMAP));
         assertTrue(model.contains(graphSubject, HAS_TRANSACTION_SERVICE));
         assertTrue(model.contains(graphSubject, HAS_NAMESPACE_SERVICE));
-        assertTrue(model.contains(graphSubject, HAS_WORKSPACE_SERVICE));
     }
 
     @Test