Merge pull request #233 from gregjan/mode-3.7.1

fixed fcrepo for modeshape 3.7.1 Resolves: https://www.pivotaltracker.com/story/show/64183776
fcrepo · Feb 11, 2014 · 598d850 · 598d850
2 parents 4692be2 + c580735
commit 598d850
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/fcrepo-auth-roles-basic/src/main/java/org/fcrepo/auth/roles/basic/BasicRolesPEP.java b/fcrepo-auth-roles-basic/src/main/java/org/fcrepo/auth/roles/basic/BasicRolesPEP.java
@@ -55,7 +55,7 @@ public boolean rolesHaveModeShapePermission(final String absPath,
                 LOGGER.debug("Denying writer role permission to perform an action on an ACL node.");
                 return false;
             } else {
-                LOGGER.debug("Granting writer role permission to perform any action on a non-ACL nodes.");
+                LOGGER.debug("Granting writer role permission to perform any action on a non-ACL node.");
                 return true;
             }
         }

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/rdf/impl/PropertiesRdfContext.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/rdf/impl/PropertiesRdfContext.java
@@ -28,10 +28,12 @@
 import static org.modeshape.jcr.api.JcrConstants.JCR_CONTENT;
 import static org.slf4j.LoggerFactory.getLogger;
 
-import java.security.AccessControlException;
 import java.util.Iterator;
+
+import javax.jcr.AccessDeniedException;
 import javax.jcr.Property;
 import javax.jcr.RepositoryException;
+
 import org.fcrepo.kernel.rdf.GraphSubjects;
 import org.fcrepo.kernel.rdf.impl.mappings.PropertyToTriple;
 import org.fcrepo.kernel.rdf.impl.mappings.ZippingIterator;
@@ -91,7 +93,7 @@ private void putPropertiesIntoContext() throws RepositoryException {
             if (node().hasNode(JCR_CONTENT)) {
                 contentNode = node().getNode(JCR_CONTENT);
             }
-        } catch (final AccessControlException e) {
+        } catch (final AccessDeniedException e) {
             LOGGER.trace("Access denied to content node", e);
         }
         if (contentNode != null) {