use VANN vocabulary for namespace registry

fcrepo · Jul 22, 2013 · 9fca5ff · awoods · Jul 24, 2013 · cbeer
1 parent a6b8ff1
commit 9fca5ff
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/RdfLexicon.java b/fcrepo-kernel/src/main/java/org/fcrepo/RdfLexicon.java
@@ -88,7 +88,9 @@ public final class RdfLexicon {
 
     // NAMESPACES
     public static final Property HAS_NAMESPACE_PREFIX =
-            createProperty(INTERNAL_NAMESPACE + "hasNamespace");
+            createProperty("http://purl.org/vocab/vann/preferredNamespacePrefix");
+    public static final Property HAS_NAMESPACE_URI =
+            createProperty("http://purl.org/vocab/vann/preferredNamespaceUri");
 
 
     // OTHER SERVICES

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/utils/JcrRdfTools.java b/fcrepo-kernel/src/main/java/org/fcrepo/utils/JcrRdfTools.java
@@ -234,6 +234,10 @@ public static Model getJcrNamespaceModel(final Session session)
             model.add(ResourceFactory.createResource(entry.getValue()),
                     RdfLexicon.HAS_NAMESPACE_PREFIX, ResourceFactory
                             .createPlainLiteral(entry.getKey()));
+
+            model.add(ResourceFactory.createResource(entry.getValue()),
+                    RdfLexicon.HAS_NAMESPACE_URI, ResourceFactory
+                            .createPlainLiteral(entry.getValue()));
         }
 
         return model;

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/utils/JcrRdfToolsTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/utils/JcrRdfToolsTest.java
@@ -45,6 +45,7 @@
 import static org.fcrepo.RdfLexicon.HAS_LOCATION;
 import static org.fcrepo.RdfLexicon.HAS_MEMBER_OF_RESULT;
 import static org.fcrepo.RdfLexicon.HAS_NAMESPACE_PREFIX;
+import static org.fcrepo.RdfLexicon.HAS_NAMESPACE_URI;
 import static org.fcrepo.RdfLexicon.HAS_VERSION;
 import static org.fcrepo.RdfLexicon.HAS_VERSION_LABEL;
 import static org.fcrepo.RdfLexicon.IS_FIXITY_RESULT_OF;
@@ -916,6 +917,10 @@ public void testGetJcrNamespaceModel() throws Exception {
         assertTrue(jcrNamespaceModel.contains(
                 createResource("registered-uri#"), HAS_NAMESPACE_PREFIX,
                 "some-prefix"));
+
+        assertTrue(jcrNamespaceModel.contains(
+                createResource("registered-uri#"), HAS_NAMESPACE_URI,
+                "registered-uri#"));
     }
 
     @Test