Modified: jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml?rev=1673133&r1=1673132&r2=1673133&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml (original) +++ jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml Mon Apr 13 08:28:21 2015 @@ -35,7 +35,6 @@ <include>org.apache.jackrabbit:jackrabbit-api</include> <include>org.apache.jackrabbit:jackrabbit-jcr-commons</include> <include>org.apache.jackrabbit:oak-commons</include> - <include>org.apache.jackrabbit:oak-mk-api</include> <include>org.apache.jackrabbit:oak-core</include> <include>org.apache.jackrabbit:oak-jcr</include> <include>org.apache.jackrabbit:oak-lucene</include>
Modified: jackrabbit/oak/trunk/oak-it/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/pom.xml?rev=1673133&r1=1673132&r2=1673133&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-it/pom.xml (original) +++ jackrabbit/oak/trunk/oak-it/pom.xml Mon Apr 13 08:28:21 2015 @@ -36,7 +36,6 @@ </properties> <modules> - <module>mk</module> <module>osgi</module> </modules> Modified: jackrabbit/oak/trunk/oak-run/README.md URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/README.md?rev=1673133&r1=1673132&r2=1673133&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/README.md (original) +++ jackrabbit/oak/trunk/oak-run/README.md Mon Apr 13 08:28:21 2015 @@ -220,7 +220,7 @@ See the relevant documentation for more Oak server mode --------------- -The Oak server mode starts a MicroKernel or full Oak instance with the +The Oak server mode starts a NodeStore or full Oak instance with the standard JCR plugins and makes it available over a simple HTTP mapping defined in the `oak-http` component. To start this mode, use: @@ -242,7 +242,6 @@ to be used. The following fixtures are c | Oak-Mongo | Oak with the default Mongo backend | | Oak-Mongo-FDS | Oak with the default Mongo backend and FileDataStore | | Oak-MongoNS | Oak with the Mongo NodeStore | -| Oak-MongoMK | Oak with the Mongo MicroKernel | | Oak-Tar | Oak with the Tar backend (aka Segment NodeStore) | | Oak-Tar-FDS | Oak with the Tar backend and FileDataStore | @@ -257,7 +256,6 @@ Depending on the fixture the following o --clusterIds - Cluster Ids for the Mongo setup: a comma separated list of integers --base <file> - Tar: Path to the base file --mmap <64bit?> - TarMK memory mapping (the default on 64 bit JVMs) - --mk - Start in MicroKernel mode exposing the MicroKernel API --rdbjdbcuri - JDBC URL for RDB persistence --rdbjdbcuser - JDBC username (defaults to "") --rdbjdbcpasswd - JDBC password (defaults to "") @@ -351,7 +349,6 @@ Finally the benchmark runner supports th | Oak-Mongo | Oak with the default Mongo backend | | Oak-Mongo-FDS | Oak with the default Mongo backend and FileDataStore | | Oak-MongoNS | Oak with the Mongo NodeStore | -| Oak-MongoMK | Oak with the Mongo MicroKernel | | Oak-Tar | Oak with the Tar backend (aka Segment NodeStore) | | Oak-RDB | Oak with the DocumentMK/RDB persistence | @@ -526,7 +523,6 @@ Finally the scalability runner supports | Oak-Mongo | Oak with the default Mongo backend | | Oak-Mongo-FDS | Oak with the default Mongo backend and FileDataStore | | Oak-MongoNS | Oak with the Mongo NodeStore | -| Oak-MongoMK | Oak with the Mongo MicroKernel | | Oak-Tar | Oak with the Tar backend (aka Segment NodeStore) | | Oak-RDB | Oak with the DocumentMK/RDB persistence | Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java?rev=1673133&r1=1673132&r2=1673133&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java Mon Apr 13 08:28:21 2015 @@ -17,14 +17,11 @@ package org.apache.jackrabbit.oak.fixture; import java.io.File; -import java.net.UnknownHostException; import javax.sql.DataSource; import org.apache.commons.io.FileUtils; -import org.apache.jackrabbit.mk.api.MicroKernel; import org.apache.jackrabbit.oak.Oak; -import org.apache.jackrabbit.oak.kernel.NodeStoreKernel; import org.apache.jackrabbit.oak.plugins.document.DocumentMK; import org.apache.jackrabbit.oak.plugins.document.rdb.RDBBlobStore; import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDataSourceFactory; @@ -65,8 +62,6 @@ public abstract class OakFixture { return String.format("%s-%d", name, System.currentTimeMillis()); } - public abstract MicroKernel getMicroKernel() throws Exception; - public abstract Oak getOak(int clusterId) throws Exception; public abstract Oak[] setUpCluster(int n) throws Exception; @@ -88,10 +83,6 @@ public abstract class OakFixture { public static OakFixture getMemory(String name, final long cacheSize) { return new OakFixture(name) { - @Override - public MicroKernel getMicroKernel() { - return new NodeStoreKernel(new MemoryNodeStore()); - } @Override public Oak getOak(int clusterId) throws Exception { @@ -160,18 +151,6 @@ public abstract class OakFixture { } @Override - public MicroKernel getMicroKernel() throws UnknownHostException { - MongoConnection mongo = new MongoConnection(uri); - DocumentMK.Builder mkBuilder = new DocumentMK.Builder(). - setMongoDB(mongo.getDB()). - memoryCacheSize(cacheSize). - setPersistentCache("target/persistentCache,time"). - setLogging(false); - setupBlobStore(mkBuilder); - return mkBuilder.open(); - } - - @Override public Oak getOak(int clusterId) throws Exception { MongoConnection mongo = new MongoConnection(uri); DocumentMK.Builder mkBuilder = new DocumentMK.Builder(). @@ -254,21 +233,6 @@ public abstract class OakFixture { } @Override - public MicroKernel getMicroKernel() { - DataSource ds = RDBDataSourceFactory.forJdbcUrl(jdbcuri, jdbcuser, jdbcpasswd); - DocumentMK.Builder mkBuilder = new DocumentMK.Builder(). - setRDBConnection(ds, getOptions(dropDBAfterTest, tablePrefix)). - memoryCacheSize(cacheSize). - setPersistentCache("target/persistentCache,time"). - setLogging(false); - BlobStore blobStore = getBlobStore(); - if (blobStore != null) { - mkBuilder.setBlobStore(blobStore); - } - return mkBuilder.open(); - } - - @Override public Oak getOak(int clusterId) throws Exception { DataSource ds = RDBDataSourceFactory.forJdbcUrl(jdbcuri, jdbcuser, jdbcpasswd); DocumentMK.Builder mkBuilder = new DocumentMK.Builder() @@ -345,12 +309,6 @@ public abstract class OakFixture { } @Override - public MicroKernel getMicroKernel() throws Exception { - FileStore fs = new FileStore(base, maxFileSizeMB, cacheSizeMB, memoryMapping); - return new NodeStoreKernel(new SegmentNodeStore(fs)); - } - - @Override public Oak getOak(int clusterId) throws Exception { FileStore fs = new FileStore(base, maxFileSizeMB, cacheSizeMB, memoryMapping); return new Oak(new SegmentNodeStore(fs)); Modified: jackrabbit/oak/trunk/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/pom.xml?rev=1673133&r1=1673132&r2=1673133&view=diff ============================================================================== --- jackrabbit/oak/trunk/pom.xml (original) +++ jackrabbit/oak/trunk/pom.xml Mon Apr 13 08:28:21 2015 @@ -40,8 +40,6 @@ <module>oak-commons</module> <module>oak-blob</module> <module>oak-blob-cloud</module> - <module>oak-mk-api</module> - <module>oak-mk</module> <module>oak-core</module> <module>oak-jcr</module> <module>oak-upgrade</module>
