Fcrepo 1555

fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraLdpIT.java

@@ -31,6 +31,7 @@
 import static java.util.regex.Pattern.compile;
 import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
 import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
+import static javax.ws.rs.core.Response.Status.CONFLICT;
 import static javax.ws.rs.core.Response.Status.CREATED;
 import static javax.ws.rs.core.Response.Status.NOT_MODIFIED;
 import static javax.ws.rs.core.Response.Status.NO_CONTENT;
@@ -1597,7 +1598,7 @@ public void testRepeatedPut() throws Exception {
 
         final HttpPut secondPut = new HttpPut(serverAddress + pid);
         secondPut.setHeader("Content-Type", "text/turtle");
-        assertEquals(400, getStatus(secondPut));
+        assertEquals(CONFLICT.getStatusCode(), getStatus(secondPut));
     }
 
     @Test

fcrepo-http-commons/src/main/java/org/fcrepo/http/commons/exceptionhandlers/MalformedRdfExceptionMapper.java

@@ -17,6 +17,7 @@
 
 import static javax.ws.rs.core.Response.status;
 import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
+import static javax.ws.rs.core.Response.Status.CONFLICT;
 import static org.fcrepo.kernel.RdfLexicon.CONSTRAINED_BY;
 
 import javax.ws.rs.core.Link;
@@ -25,7 +26,6 @@
 import javax.ws.rs.ext.Provider;
 
 import org.fcrepo.kernel.exception.MalformedRdfException;
-
 import org.apache.commons.codec.binary.Base64;
 
 /**
@@ -39,6 +39,10 @@ public class MalformedRdfExceptionMapper implements ExceptionMapper<MalformedRdf
     public Response toResponse(final MalformedRdfException e) {
         final Link link = Link.fromUri(getConstraintUri(e)).rel(CONSTRAINED_BY.getURI()).build();
         final String msg = e.getMessage();
+
+        if (msg.contains("server-managed predicate")) {
+            return status(CONFLICT).entity(msg).links(link).build();
+        }
         if (msg.matches(".*org.*Exception: .*")) {
             return status(BAD_REQUEST).entity(msg.replaceAll("org.*Exception: ", "")).links(link).build();
         }

fcrepo-kernel-impl/src/main/java/org/fcrepo/kernel/impl/rdf/JcrRdfTools.java

@@ -322,10 +322,11 @@ public void removeProperty(final FedoraResource resource,
 
         if (isManagedPredicate.apply(predicate)) {
 
-            throw new ServerManagedPropertyException("Could not remove triple containing predicate "
-                    + predicate.toString()
-                    + " to node "
-                    + node.getPath());
+            throw new ServerManagedPropertyException("Could not remove triple containing server-managed "
+                        + "predicate "
+                        + predicate.toString()
+                        + " to node "
+                        + node.getPath());
         }
 
         if (objectNode.isURIResource()