Trying to rebase on master, many failures, etc.

fcrepo · Aug 5, 2014 · 8c27e18 · 8c27e18
1 parent 6301a10
commit 8c27e18
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 722 deletions.
diff --git a/fcrepo-kernel/pom.xml b/fcrepo-kernel/pom.xml
@@ -76,10 +76,20 @@
       <groupId>org.modeshape</groupId>
       <artifactId>modeshape-jcr-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.modeshape</groupId>
+      <artifactId>modeshape-jcr</artifactId>
+    </dependency>
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.4</version>
+    </dependency>
+
 
     <dependency>
       <groupId>javax.inject</groupId>

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/LowLevelCacheEntry.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/LowLevelCacheEntry.java
diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/impl/CacheEntryFactory.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/impl/CacheEntryFactory.java
diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/impl/DistributedFixityCheck.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/impl/DistributedFixityCheck.java
diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/impl/FileSystemBinaryStoreEntry.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/impl/FileSystemBinaryStoreEntry.java