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 ju...@apache.org on 2014/02/19 12:22:44 UTC
svn commit: r1569690 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/
oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ oak-jcr/src/test...
Author: jukka
Date: Wed Feb 19 11:22:43 2014
New Revision: 1569690
URL: http://svn.apache.org/r1569690
Log:
OAK-1434: Cleanup dependencies of oak-core
Drop Oak(MicroKernel) since it's just a wrapper for Oak(new KernelNodeStore(MicroKernel)).
Also change the default Oak() constructor to use MemoryNodeStore instead of MicroKernelImpl.
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/ClusterPermissionsTest.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoMKRepositoryStub.java
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=1569690&r1=1569689&r2=1569690&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 Feb 19 11:22:43 2014
@@ -45,19 +45,17 @@ import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import com.google.common.io.Closer;
-import org.apache.jackrabbit.mk.api.MicroKernel;
-import org.apache.jackrabbit.mk.core.MicroKernelImpl;
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.api.ContentSession;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean;
import org.apache.jackrabbit.oak.core.ContentRepositoryImpl;
-import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
import org.apache.jackrabbit.oak.plugins.commit.ConflictHook;
import org.apache.jackrabbit.oak.plugins.index.AsyncIndexUpdate;
import org.apache.jackrabbit.oak.plugins.index.CompositeIndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.IndexUpdateProvider;
+import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
import org.apache.jackrabbit.oak.spi.commit.BackgroundObserver;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
@@ -280,14 +278,9 @@ public class Oak {
this.store = checkNotNull(store);
}
- public Oak(MicroKernel kernel) {
- this(new KernelNodeStore(checkNotNull(kernel)));
- }
-
public Oak() {
- this(new MicroKernelImpl());
+ this(new MemoryNodeStore());
// this(new DocumentMK.Builder().open());
- // this(new LogWrapper(new MicroKernelImpl()));
// this(new LogWrapper(new DocumentMK.Builder().open()));
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/ClusterPermissionsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/ClusterPermissionsTest.java?rev=1569690&r1=1569689&r2=1569690&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/ClusterPermissionsTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/ClusterPermissionsTest.java Wed Feb 19 11:22:43 2014
@@ -37,6 +37,7 @@ import org.apache.jackrabbit.oak.api.Roo
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
+import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexProvider;
import org.apache.jackrabbit.oak.plugins.index.reference.ReferenceEditorProvider;
@@ -62,8 +63,8 @@ import static org.junit.Assert.assertTru
public class ClusterPermissionsTest {
- private DocumentMK mk1;
- private DocumentMK mk2;
+ private DocumentNodeStore ns1;
+ private DocumentNodeStore ns2;
private ContentRepository contentRepository1;
private ContentRepository contentRepository2;
private UserManager userManager1;
@@ -87,12 +88,12 @@ public class ClusterPermissionsTest {
builder = new DocumentMK.Builder();
builder.setDocumentStore(ds).setBlobStore(bs).setAsyncDelay(1);
- mk1 = builder.setClusterId(1).open();
+ ns1 = builder.setClusterId(1).getNodeStore();
builder = new DocumentMK.Builder();
builder.setDocumentStore(ds).setBlobStore(bs).setAsyncDelay(1);
- mk2 = builder.setClusterId(2).open();
+ ns2 = builder.setClusterId(2).getNodeStore();
- Oak oak = new Oak(mk1)
+ Oak oak = new Oak(ns1)
.with(new InitialContent())
.with(new ReferenceEditorProvider())
.with(new ReferenceIndexProvider())
@@ -106,7 +107,7 @@ public class ClusterPermissionsTest {
userManager1 = securityProvider1.getConfiguration(UserConfiguration.class).getUserManager(root1, namePathMapper);
aclMgr1 = securityProvider1.getConfiguration(AuthorizationConfiguration.class).getAccessControlManager(root1, namePathMapper);
- oak = new Oak(mk2)
+ oak = new Oak(ns2)
.with(new InitialContent())
.with(new ReferenceEditorProvider())
.with(new ReferenceIndexProvider())
@@ -124,8 +125,8 @@ public class ClusterPermissionsTest {
@After
public void after() {
- mk1.dispose();
- mk2.dispose();
+ ns1.dispose();
+ ns2.dispose();
}
protected ConfigurationParameters getSecurityConfigParameters() {
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java?rev=1569690&r1=1569689&r2=1569690&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java Wed Feb 19 11:22:43 2014
@@ -24,7 +24,6 @@ import java.util.concurrent.ScheduledExe
import javax.annotation.Nonnull;
import javax.jcr.Repository;
-import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.jcr.repository.RepositoryImpl;
import org.apache.jackrabbit.oak.plugins.commit.ConflictValidatorProvider;
@@ -86,10 +85,6 @@ public class Jcr {
this(new Oak());
}
- public Jcr(MicroKernel kernel) {
- this(new Oak(kernel));
- }
-
public Jcr(NodeStore store) {
this(new Oak(store));
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java?rev=1569690&r1=1569689&r2=1569690&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java Wed Feb 19 11:22:43 2014
@@ -31,6 +31,7 @@ import javax.jcr.UnsupportedRepositoryOp
import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
+import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.test.NotExecutableException;
import org.apache.jackrabbit.test.RepositoryStub;
@@ -83,10 +84,12 @@ public class OakDocumentRDBRepositoryStu
}
protected Repository createRepository(String url, String username, String password) {
- DocumentMK m = new DocumentMK.Builder().setClusterId(1).memoryCacheSize(64 * 1024 * 1024)
- .setRDBConnection(url, username, password).open();
- Jcr jcr = new Jcr(m);
- return jcr.createRepository();
+ DocumentNodeStore m = new DocumentMK.Builder()
+ .setClusterId(1)
+ .memoryCacheSize(64 * 1024 * 1024)
+ .setRDBConnection(url, username, password)
+ .getNodeStore();
+ return new Jcr(m).createRepository();
}
public static boolean isAvailable() {
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoMKRepositoryStub.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoMKRepositoryStub.java?rev=1569690&r1=1569689&r2=1569690&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoMKRepositoryStub.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoMKRepositoryStub.java Wed Feb 19 11:22:43 2014
@@ -28,7 +28,9 @@ import javax.jcr.Session;
import javax.jcr.UnsupportedRepositoryOperationException;
import com.mongodb.BasicDBObject;
+
import org.apache.jackrabbit.api.JackrabbitSession;
+import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.apache.jackrabbit.test.NotExecutableException;
@@ -87,11 +89,12 @@ public class OakMongoMKRepositoryStub ex
}
protected Repository createRepository(MongoConnection connection) {
- DocumentMK m = new DocumentMK.Builder().setClusterId(1).
- memoryCacheSize(64 * 1024 * 1024).
- setMongoDB(connection.getDB()).open();
- Jcr jcr = new Jcr(m);
- return jcr.createRepository();
+ DocumentMK m = new DocumentMK.Builder()
+ .setClusterId(1)
+ .memoryCacheSize(64 * 1024 * 1024)
+ .setMongoDB(connection.getDB())
+ .open();
+ return new Jcr(new KernelNodeStore(m)).createRepository();
}
/**