Merge pull request #514 from fcrepo4/remove-fcr-namespaces

Remove fcr:namespaces endpoint
fcrepo · Oct 13, 2014 · dfa3aab · dfa3aab
2 parents bed38d6 + 9b52232
commit dfa3aab
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 538 deletions.
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoryNamespaces.java b/fcrepo-http-api/src/main/java/org/fcrepo/http/api/repository/FedoraRepositoryNamespaces.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
@@ -162,8 +162,7 @@ void init() throws IOException {
             }
 
             final List<String> otherTemplates =
-                    ImmutableList.of("jcr:namespaces", "jcr:nodetypes",
-                            "node", "fcr:versions", "fcr:lock", "fcr:fixity");
+                    ImmutableList.of("jcr:nodetypes", "node", "fcr:versions", "fcr:lock", "fcr:fixity");
 
             for (final String key : otherTemplates) {
                 final Template template =

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
@@ -22,7 +22,6 @@
 import static org.fcrepo.jcr.FedoraJcrTypes.ROOT;
 import static org.fcrepo.kernel.RdfLexicon.HAS_FIXITY_SERVICE;
 import static org.fcrepo.kernel.RdfLexicon.HAS_LOCK;
-import static org.fcrepo.kernel.RdfLexicon.HAS_NAMESPACE_SERVICE;
 import static org.fcrepo.kernel.RdfLexicon.HAS_SERIALIZATION;
 import static org.fcrepo.kernel.RdfLexicon.HAS_SITEMAP;
 import static org.fcrepo.kernel.RdfLexicon.HAS_TRANSACTION_SERVICE;
@@ -41,7 +40,6 @@
 import org.fcrepo.http.api.FedoraVersioning;
 import org.fcrepo.http.api.repository.FedoraRepositorySitemap;
 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.commons.api.rdf.UriAwareResourceModelFactory;
 import org.fcrepo.kernel.FedoraResource;
@@ -163,11 +161,6 @@ private void addRepositoryStatements(final UriInfo uriInfo, final Model model,
                 .getBaseUriBuilder().path(FedoraRepositoryTransactions.class)
                 .build().toASCIIString()));
 
-        // fcr:namespaces
-        model.add(s, HAS_NAMESPACE_SERVICE, createResource(uriInfo
-                .getBaseUriBuilder().path(FedoraRepositoryNamespaces.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
@@ -15,7 +15,6 @@
     <div class="collapse navbar-collapse navbar-ex1-collapse">
         <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:nodetypes">Types</a></li>
         </ul>
     </div>

diff --git a/fcrepo-http-api/src/main/resources/views/jcr-namespaces.vsl b/fcrepo-http-api/src/main/resources/views/jcr-namespaces.vsl
diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraRepositoryNamespacesTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraRepositoryNamespacesTest.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
@@ -19,7 +19,6 @@
 import static org.fcrepo.http.commons.test.util.TestHelpers.getUriInfoImpl;
 import static org.fcrepo.jcr.FedoraJcrTypes.ROOT;
 import static org.fcrepo.kernel.RdfLexicon.HAS_FIXITY_SERVICE;
-import static org.fcrepo.kernel.RdfLexicon.HAS_NAMESPACE_SERVICE;
 import static org.fcrepo.kernel.RdfLexicon.HAS_SERIALIZATION;
 import static org.fcrepo.kernel.RdfLexicon.HAS_SITEMAP;
 import static org.fcrepo.kernel.RdfLexicon.HAS_TRANSACTION_SERVICE;
@@ -115,7 +114,6 @@ public void shouldDecorateModeRootNodesWithRepositoryWideLinks()
 
         assertTrue(model.contains(graphSubject, HAS_SITEMAP));
         assertTrue(model.contains(graphSubject, HAS_TRANSACTION_SERVICE));
-        assertTrue(model.contains(graphSubject, HAS_NAMESPACE_SERVICE));
     }
 
     @Test

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraHtmlIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraHtmlIT.java
@@ -60,12 +60,4 @@ public void testGetDatastreamNode() throws Exception {
         method.addHeader("Accept", "text/html");
         assertEquals(200, getStatus(method));
     }
-
-    @Test
-    public void testGetNamespaces() throws Exception {
-
-        final HttpGet method = new HttpGet(serverAddress + "fcr:namespaces");
-        method.addHeader("Accept", "text/html");
-        assertEquals(200, getStatus(method));
-    }
 }