From aba7e4bb66e49be8397b0aef94dc4cc66ac7ce49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esm=C3=A9=20Cowles?= Date: Fri, 8 May 2015 16:22:58 -0400 Subject: [PATCH] Using premis:hasMessageDigest for checksums --- .../test/java/org/fcrepo/integration/http/api/FedoraLdpIT.java | 3 +++ fcrepo-kernel-impl/src/main/resources/fedora-node-types.cnd | 2 +- .../src/main/java/org/fcrepo/kernel/FedoraJcrTypes.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraLdpIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraLdpIT.java index 1ff5ccedcf..f1aacb193c 100644 --- a/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraLdpIT.java +++ b/fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraLdpIT.java @@ -57,6 +57,7 @@ import static org.fcrepo.kernel.RdfLexicon.FIRST_PAGE; import static org.fcrepo.kernel.RdfLexicon.HAS_CHILD; import static org.fcrepo.kernel.RdfLexicon.HAS_MEMBER_RELATION; +import static org.fcrepo.kernel.RdfLexicon.HAS_MESSAGE_DIGEST; import static org.fcrepo.kernel.RdfLexicon.HAS_OBJECT_COUNT; import static org.fcrepo.kernel.RdfLexicon.HAS_OBJECT_SIZE; import static org.fcrepo.kernel.RdfLexicon.HAS_PRIMARY_IDENTIFIER; @@ -466,6 +467,8 @@ public void testGetNonRDFSourceDescription() throws Exception { createURI(REPOSITORY_NAMESPACE + "NonRdfSourceDescription"))); assertTrue("Binary should be a ldp:NonRDFSource", graphStore.contains(ANY, createURI(serverAddress + pid + "/x"), rdfType, NON_RDF_SOURCE.asNode())); + assertTrue("Binary should have a checksum", + graphStore.contains(ANY, createURI(serverAddress + pid + "/x"), HAS_MESSAGE_DIGEST.asNode(), ANY)); } @Test diff --git a/fcrepo-kernel-impl/src/main/resources/fedora-node-types.cnd b/fcrepo-kernel-impl/src/main/resources/fedora-node-types.cnd index 58403a0ee3..c87652cfb5 100644 --- a/fcrepo-kernel-impl/src/main/resources/fedora-node-types.cnd +++ b/fcrepo-kernel-impl/src/main/resources/fedora-node-types.cnd @@ -68,7 +68,7 @@ [fedora:Binary] > fedora:Resource mixin - premis:hasOriginalName (STRING) - premis:hasSize (LONG) COPY - - fedora:digest (URI) COPY + - premis:hasMessageDigest (URI) COPY [fedora:Blanknode] > mix:referenceable mixin diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/FedoraJcrTypes.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/FedoraJcrTypes.java index 3c6799fec3..45e46fc360 100644 --- a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/FedoraJcrTypes.java +++ b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/FedoraJcrTypes.java @@ -55,7 +55,7 @@ public interface FedoraJcrTypes { String CONTENT_SIZE = "premis:hasSize"; - String CONTENT_DIGEST = "fedora:digest"; + String CONTENT_DIGEST = "premis:hasMessageDigest"; String FCR_METADATA = "fcr:metadata";