You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by th...@apache.org on 2013/06/05 13:44:32 UTC
svn commit: r1489822 - in /jackrabbit/oak/trunk/oak-core: pom.xml
src/main/java/org/apache/jackrabbit/oak/Oak.java
Author: thomasm
Date: Wed Jun 5 11:44:32 2013
New Revision: 1489822
URL: http://svn.apache.org/r1489822
Log:
OAK-856 Use in-memory MongoMK (prepare, but not yet enable)
Modified:
jackrabbit/oak/trunk/oak-core/pom.xml
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1489822&r1=1489821&r2=1489822&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Wed Jun 5 11:44:32 2013
@@ -164,6 +164,12 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-mongomk</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-mk</artifactId>
<version>${project.version}</version>
</dependency>
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java?rev=1489822&r1=1489821&r2=1489822&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java Wed Jun 5 11:44:32 2013
@@ -32,6 +32,8 @@ import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.mk.core.MicroKernelImpl;
+import org.apache.jackrabbit.mongomk.MongoMK;
+import org.apache.jackrabbit.mongomk.util.LogWrapper;
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.api.ContentSession;
import org.apache.jackrabbit.oak.api.Root;
@@ -112,6 +114,9 @@ public class Oak {
public Oak() {
this(new MicroKernelImpl());
+ // this(new MongoMK.Builder().open());
+ // this(new LogWrapper(new MicroKernelImpl()));
+ // this(new LogWrapper(new MongoMK.Builder().open()));
}
/**