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 mr...@apache.org on 2014/01/28 12:28:25 UTC
svn commit: r1562039 [3/3] - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/
oak-core/src/main/java/org/apache/jackrabbit/oak/core/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/
oak-core/src/main/java/or...
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetChildCountTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKGetChildCountTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetChildCountTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetChildCountTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKGetChildCountTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKGetChildCountTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetChildCountTest.java Tue Jan 28 11:28:23 2014
@@ -26,8 +26,8 @@ import org.junit.Test;
/**
* Tests getChildNodeCount.
*/
-@Ignore("MongoMK does not implement getChildNodeCount()")
-public class MongoMKGetChildCountTest extends AbstractMongoConnectionTest {
+@Ignore("DocumentMK does not implement getChildNodeCount()")
+public class DocumentMKGetChildCountTest extends AbstractMongoConnectionTest {
@Test
public void noChild() throws Exception {
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetChildCountTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetChildCountTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetJournalTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKGetJournalTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetJournalTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetJournalTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKGetJournalTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKGetJournalTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetJournalTest.java Tue Jan 28 11:28:23 2014
@@ -27,8 +27,8 @@ import org.junit.Test;
/**
* Tests for {@code MongoMicroKernel#getJournal(String, String, String)}
*/
-@Ignore("MongoMK does not implement getJournal()")
-public class MongoMKGetJournalTest extends AbstractMongoConnectionTest {
+@Ignore("DocumentMK does not implement getJournal()")
+public class DocumentMKGetJournalTest extends AbstractMongoConnectionTest {
@Test
public void simple() throws Exception {
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetJournalTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetJournalTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetRevisionHistoryTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKGetRevisionHistoryTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetRevisionHistoryTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetRevisionHistoryTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKGetRevisionHistoryTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKGetRevisionHistoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetRevisionHistoryTest.java Tue Jan 28 11:28:23 2014
@@ -26,8 +26,8 @@ import org.junit.Test;
/**
* Tests for getRevisionHistory
*/
-@Ignore("MongoMK does not implement getRevisionHistory()")
-public class MongoMKGetRevisionHistoryTest extends AbstractMongoConnectionTest {
+@Ignore("DocumentMK does not implement getRevisionHistory()")
+public class DocumentMKGetRevisionHistoryTest extends AbstractMongoConnectionTest {
@Test
public void maxEntriesZero() throws Exception {
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetRevisionHistoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKGetRevisionHistoryTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKLimitsTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKLimitsTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKLimitsTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKLimitsTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKLimitsTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKLimitsTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKLimitsTest.java Tue Jan 28 11:28:23 2014
@@ -28,7 +28,7 @@ import org.junit.Test;
*
* Tests for MongoMicroKernel limits.
*/
-public class MongoMKLimitsTest extends AbstractMongoConnectionTest {
+public class DocumentMKLimitsTest extends AbstractMongoConnectionTest {
/**
* This test currently fails due to 1000 char limit in property sizes in
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKLimitsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKLimitsTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKWaitForCommitTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKWaitForCommitTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKWaitForCommitTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKWaitForCommitTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKWaitForCommitTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKWaitForCommitTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKWaitForCommitTest.java Tue Jan 28 11:28:23 2014
@@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
-import org.apache.jackrabbit.oak.plugins.document.MongoMK;
+import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -38,8 +38,8 @@ import com.mongodb.DB;
/**
* Tests for {@code MongoMicroKernel#waitForCommit(String, long)}
*/
-@Ignore("MongoMK does not implement waitForCommit()")
-public class MongoMKWaitForCommitTest extends AbstractMongoConnectionTest {
+@Ignore("DocumentMK does not implement waitForCommit()")
+public class DocumentMKWaitForCommitTest extends AbstractMongoConnectionTest {
private MicroKernel mk2;
@@ -48,7 +48,7 @@ public class MongoMKWaitForCommitTest ex
public void setUpConnection() throws Exception {
super.setUpConnection();
DB db = mongoConnection.getDB();
- mk2 = new MongoMK.Builder().setMongoDB(db).open();
+ mk2 = new DocumentMK.Builder().setMongoDB(db).open();
}
@Test
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKWaitForCommitTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKWaitForCommitTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/command/ConcurrentWriteMultipleMkMongoTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/command/ConcurrentWriteMultipleMkMongoTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/command/ConcurrentWriteMultipleMkMongoTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/command/ConcurrentWriteMultipleMkMongoTest.java Tue Jan 28 11:28:23 2014
@@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
-import org.apache.jackrabbit.oak.plugins.document.MongoMK;
+import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.junit.Ignore;
import org.junit.Test;
@@ -54,7 +54,7 @@ public class ConcurrentWriteMultipleMkMo
for (int i = 0; i < numberOfMks; i++) {
String diff = buildPyramidDiff("/", 0, numberOfChildren,
numberOfNodes, prefixes[i], new StringBuilder()).toString();
- MongoMK mk = new MongoMK.Builder().open();
+ DocumentMK mk = new DocumentMK.Builder().open();
GenericWriteTask task = new GenericWriteTask("mk-" + i, mk, diff, 10);
executor.execute(task);
}
@@ -105,7 +105,7 @@ public class ConcurrentWriteMultipleMkMo
private String diff;
private int nodesPerCommit;
- public GenericWriteTask(String id, MongoMK mk, String diff,
+ public GenericWriteTask(String id, DocumentMK mk, String diff,
int nodesPerCommit) {
this.id = id;
this.mk = mk;
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java Tue Jan 28 11:28:23 2014
@@ -24,8 +24,8 @@ import org.apache.jackrabbit.oak.api.Com
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
import org.apache.jackrabbit.oak.plugins.document.Collection;
-import org.apache.jackrabbit.oak.plugins.document.MongoMK;
-import org.apache.jackrabbit.oak.plugins.document.MongoNodeStore;
+import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
+import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
@@ -42,8 +42,8 @@ import static org.junit.Assert.assertEqu
public class CacheInvalidationIT extends AbstractMongoConnectionTest {
- private MongoNodeStore c1;
- private MongoNodeStore c2;
+ private DocumentNodeStore c1;
+ private DocumentNodeStore c2;
@Before
public void prepareStores() throws Exception {
@@ -163,12 +163,12 @@ public class CacheInvalidationIT extends
}
- private void refreshHead(MongoNodeStore store){
+ private void refreshHead(DocumentNodeStore store){
ds(store).find(Collection.NODES, Utils.getIdFromPath("/"), 0);
}
- private static MongoDocumentStore ds(MongoNodeStore ns){
+ private static MongoDocumentStore ds(DocumentNodeStore ns){
return (MongoDocumentStore) ns.getDocumentStore();
}
@@ -201,15 +201,15 @@ public class CacheInvalidationIT extends
c2.dispose();
}
- private void runBgOps(MongoNodeStore ... stores){
- for(MongoNodeStore ns : stores){
+ private void runBgOps(DocumentNodeStore... stores){
+ for(DocumentNodeStore ns : stores){
ns.runBackgroundOperations();
}
}
- private MongoNodeStore createNS(int clusterId) throws Exception {
+ private DocumentNodeStore createNS(int clusterId) throws Exception {
MongoConnection mc = MongoUtils.getConnection();
- return new MongoMK.Builder()
+ return new DocumentMK.Builder()
.setMongoDB(mc.getDB())
.setClusterId(clusterId)
.setAsyncDelay(0) //Set delay to 0 so that effect of changes are immediately reflected
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/multitenancy/MultiTenancyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/multitenancy/MultiTenancyTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/multitenancy/MultiTenancyTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/multitenancy/MultiTenancyTest.java Tue Jan 28 11:28:23 2014
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertTru
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
-import org.apache.jackrabbit.oak.plugins.document.MongoMK;
+import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.junit.After;
@@ -61,13 +61,13 @@ public class MultiTenancyTest extends Ab
// DB1 handled by the AbstractMongoConnectionTest
DB db = mongoConnection.getDB();
- mk1 = new MongoMK.Builder().setMongoDB(db).open();
+ mk1 = new DocumentMK.Builder().setMongoDB(db).open();
DB db2 = mongoConnection2.getDB();
- mk2 = new MongoMK.Builder().setMongoDB(db2).open();
+ mk2 = new DocumentMK.Builder().setMongoDB(db2).open();
DB db3 = mongoConnection3.getDB();
- mk3 = new MongoMK.Builder().setMongoDB(db3).open();
+ mk3 = new DocumentMK.Builder().setMongoDB(db3).open();
}
@After
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=1562039&r1=1562038&r2=1562039&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 Tue Jan 28 11:28:23 2014
@@ -36,12 +36,12 @@ import org.apache.jackrabbit.oak.api.Con
import org.apache.jackrabbit.oak.api.Root;
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.index.property.PropertyIndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexProvider;
import org.apache.jackrabbit.oak.plugins.index.reference.ReferenceEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.reference.ReferenceIndexProvider;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
-import org.apache.jackrabbit.oak.plugins.document.MongoMK;
import org.apache.jackrabbit.oak.plugins.nodetype.TypeEditorProvider;
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
import org.apache.jackrabbit.oak.security.SecurityProviderImpl;
@@ -80,14 +80,14 @@ public class ClusterPermissionsTest {
public void before() throws Exception {
MemoryDocumentStore ds = new MemoryDocumentStore();
MemoryBlobStore bs = new MemoryBlobStore();
- MongoMK.Builder builder;
+ DocumentMK.Builder builder;
- builder = new MongoMK.Builder();
+ builder = new DocumentMK.Builder();
builder.setDocumentStore(ds).setBlobStore(bs).setAsyncDelay(1);
- MongoMK mk1 = builder.setClusterId(1).open();
- builder = new MongoMK.Builder();
+ DocumentMK mk1 = builder.setClusterId(1).open();
+ builder = new DocumentMK.Builder();
builder.setDocumentStore(ds).setBlobStore(bs).setAsyncDelay(1);
- MongoMK mk2 = builder.setClusterId(2).open();
+ DocumentMK mk2 = builder.setClusterId(2).open();
Oak oak = new Oak(mk1)
.with(new InitialContent())
Modified: jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/BaseMongoMicroKernelFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/BaseMongoMicroKernelFixture.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/BaseMongoMicroKernelFixture.java (original)
+++ jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/BaseMongoMicroKernelFixture.java Tue Jan 28 11:28:23 2014
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.mk.test;
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.mk.blobs.BlobStore;
import org.apache.jackrabbit.oak.plugins.document.Collection;
-import org.apache.jackrabbit.oak.plugins.document.MongoMK;
+import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.blob.MongoBlobStore;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
@@ -69,7 +69,7 @@ public abstract class BaseMongoMicroKern
dropCollections(db);
for (int i = 0; i < cluster.length; i++) {
- cluster[i] = new MongoMK.Builder().
+ cluster[i] = new DocumentMK.Builder().
setMongoDB(db).setClusterId(i).open();
}
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddNodesClusterIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddNodesClusterIT.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddNodesClusterIT.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddNodesClusterIT.java Tue Jan 28 11:28:23 2014
@@ -34,9 +34,9 @@ import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
+import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider;
-import org.apache.jackrabbit.oak.plugins.document.MongoMK;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.junit.After;
import org.junit.Assume;
@@ -58,7 +58,7 @@ public class ConcurrentAddNodesClusterIT
private static final String PROP_NAME = "testcount";
private static final ScheduledExecutorService EXECUTOR = Executors.newSingleThreadScheduledExecutor();
- private List<MongoMK> mks = new ArrayList<MongoMK>();
+ private List<DocumentMK> mks = new ArrayList<DocumentMK>();
private List<Thread> workers = new ArrayList<Thread>();
@BeforeClass
@@ -74,7 +74,7 @@ public class ConcurrentAddNodesClusterIT
@After
public void after() throws Exception {
- for (MongoMK mk : mks) {
+ for (DocumentMK mk : mks) {
mk.dispose();
}
dropDB();
@@ -83,7 +83,7 @@ public class ConcurrentAddNodesClusterIT
@Test
public void addNodesConcurrent() throws Exception {
for (int i = 0; i < NUM_CLUSTER_NODES; i++) {
- MongoMK mk = new MongoMK.Builder()
+ DocumentMK mk = new DocumentMK.Builder()
.setMongoDB(createConnection().getDB())
.setClusterId(i + 1).open();
mks.add(mk);
@@ -91,7 +91,7 @@ public class ConcurrentAddNodesClusterIT
Map<String, Exception> exceptions = Collections.synchronizedMap(
new HashMap<String, Exception>());
for (int i = 0; i < mks.size(); i++) {
- MongoMK mk = mks.get(i);
+ DocumentMK mk = mks.get(i);
Repository repo = new Jcr(mk).createRepository();
workers.add(new Thread(new Worker(repo, exceptions), "Worker-" + (i + 1)));
}
@@ -110,14 +110,14 @@ public class ConcurrentAddNodesClusterIT
@Test
public void addNodes() throws Exception {
for (int i = 0; i < 2; i++) {
- MongoMK mk = new MongoMK.Builder()
+ DocumentMK mk = new DocumentMK.Builder()
.setMongoDB(createConnection().getDB())
.setAsyncDelay(0)
.setClusterId(i + 1).open();
mks.add(mk);
}
- final MongoMK mk1 = mks.get(0);
- final MongoMK mk2 = mks.get(1);
+ final DocumentMK mk1 = mks.get(0);
+ final DocumentMK mk2 = mks.get(1);
Repository r1 = new Jcr(mk1).createRepository();
Repository r2 = new Jcr(mk2).createRepository();
@@ -142,15 +142,15 @@ public class ConcurrentAddNodesClusterIT
@Test
public void addNodes2() throws Exception {
for (int i = 0; i < 3; i++) {
- MongoMK mk = new MongoMK.Builder()
+ DocumentMK mk = new DocumentMK.Builder()
.setMongoDB(createConnection().getDB())
.setAsyncDelay(0)
.setClusterId(i + 1).open();
mks.add(mk);
}
- final MongoMK mk1 = mks.get(0);
- final MongoMK mk2 = mks.get(1);
- final MongoMK mk3 = mks.get(2);
+ final DocumentMK mk1 = mks.get(0);
+ final DocumentMK mk2 = mks.get(1);
+ final DocumentMK mk3 = mks.get(2);
Repository r1 = new Jcr(mk1).createRepository();
Repository r2 = new Jcr(mk2).createRepository();
Repository r3 = new Jcr(mk3).createRepository();
@@ -214,14 +214,14 @@ public class ConcurrentAddNodesClusterIT
@Test
public void rebaseVisibility() throws Exception {
for (int i = 0; i < 2; i++) {
- MongoMK mk = new MongoMK.Builder()
+ DocumentMK mk = new DocumentMK.Builder()
.setMongoDB(createConnection().getDB())
.setAsyncDelay(0)
.setClusterId(i + 1).open();
mks.add(mk);
}
- final MongoMK mk1 = mks.get(0);
- final MongoMK mk2 = mks.get(1);
+ final DocumentMK mk1 = mks.get(0);
+ final DocumentMK mk2 = mks.get(1);
Repository r1 = new Jcr(mk1).createRepository();
Repository r2 = new Jcr(mk2).createRepository();
@@ -255,7 +255,7 @@ public class ConcurrentAddNodesClusterIT
EXECUTOR.schedule(new Callable<Object>() {
@Override
public Object call() throws Exception {
- for (MongoMK mk : mks) {
+ for (DocumentMK mk : mks) {
runBackgroundOps(mk);
}
return null;
@@ -279,7 +279,7 @@ public class ConcurrentAddNodesClusterIT
private static void initRepository() throws Exception {
MongoConnection con = createConnection();
- MongoMK mk = new MongoMK.Builder()
+ DocumentMK mk = new DocumentMK.Builder()
.setMongoDB(con.getDB())
.setClusterId(1).open();
Session session = new Jcr(mk).createRepository().login(
@@ -310,8 +310,8 @@ public class ConcurrentAddNodesClusterIT
}
}
- private static void runBackgroundOps(MongoMK mk) throws Exception {
- Method m = MongoMK.class.getDeclaredMethod("runBackgroundOperations");
+ private static void runBackgroundOps(DocumentMK mk) throws Exception {
+ Method m = DocumentMK.class.getDeclaredMethod("runBackgroundOperations");
m.setAccessible(true);
m.invoke(mk);
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java Tue Jan 28 11:28:23 2014
@@ -23,9 +23,9 @@ import java.io.IOException;
import java.util.UUID;
import org.apache.jackrabbit.mk.core.MicroKernelImpl;
-import org.apache.jackrabbit.oak.plugins.document.MongoMK;
+import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
-import org.apache.jackrabbit.oak.plugins.document.MongoNodeStore;
+import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
@@ -52,7 +52,7 @@ public abstract class NodeStoreFixture {
public static final NodeStoreFixture MONGO_MK = new NodeStoreFixture() {
@Override
public NodeStore createNodeStore() {
- return new CloseableNodeStore(new MongoMK.Builder().open());
+ return new CloseableNodeStore(new DocumentMK.Builder().open());
}
@Override
@@ -61,7 +61,7 @@ public abstract class NodeStoreFixture {
try {
connection = new MongoConnection("mongodb://localhost:27017/oak");
DB mongoDB = connection.getDB();
- MongoMK mk = new MongoMK.Builder()
+ DocumentMK mk = new DocumentMK.Builder()
.setMongoDB(mongoDB).open();
return new CloseableNodeStore(mk);
} catch (Exception e) {
@@ -87,13 +87,13 @@ public abstract class NodeStoreFixture {
@Override
public NodeStore createNodeStore() {
String id = UUID.randomUUID().toString();
- return new MongoMK.Builder().setRDBConnection("jdbc:h2:mem:" + id, "sa", "").getNodeStore();
+ return new DocumentMK.Builder().setRDBConnection("jdbc:h2:mem:" + id, "sa", "").getNodeStore();
}
@Override
public NodeStore createNodeStore(int clusterNodeId) {
try {
- return new MongoMK.Builder().setRDBConnection("jdbc:h2:mem:oaknodes-" + clusterNodeId, "sa", "").getNodeStore();
+ return new DocumentMK.Builder().setRDBConnection("jdbc:h2:mem:oaknodes-" + clusterNodeId, "sa", "").getNodeStore();
} catch (Exception e) {
return null;
}
@@ -101,8 +101,8 @@ public abstract class NodeStoreFixture {
@Override
public void dispose(NodeStore nodeStore) {
- if (nodeStore instanceof MongoNodeStore) {
- ((MongoNodeStore) nodeStore).dispose();
+ if (nodeStore instanceof DocumentNodeStore) {
+ ((DocumentNodeStore) nodeStore).dispose();
}
}
};
@@ -122,7 +122,7 @@ public abstract class NodeStoreFixture {
return new NodeStoreFixture() {
@Override
public NodeStore createNodeStore() {
- return new MongoMK.Builder().getNodeStore();
+ return new DocumentMK.Builder().getNodeStore();
}
@Override
@@ -131,7 +131,7 @@ public abstract class NodeStoreFixture {
try {
connection = new MongoConnection(uri);
DB mongoDB = connection.getDB();
- return new MongoMK.Builder()
+ return new DocumentMK.Builder()
.setMongoDB(mongoDB).getNodeStore();
} catch (Exception e) {
return null;
@@ -140,8 +140,8 @@ public abstract class NodeStoreFixture {
@Override
public void dispose(NodeStore nodeStore) {
- if (nodeStore instanceof MongoNodeStore) {
- ((MongoNodeStore) nodeStore).dispose();
+ if (nodeStore instanceof DocumentNodeStore) {
+ ((DocumentNodeStore) nodeStore).dispose();
}
}
};
@@ -171,9 +171,9 @@ public abstract class NodeStoreFixture {
private static class CloseableNodeStore
extends KernelNodeStore implements Closeable {
- private final MongoMK kernel;
+ private final DocumentMK kernel;
- public CloseableNodeStore(MongoMK kernel) {
+ public CloseableNodeStore(DocumentMK kernel) {
super(kernel);
this.kernel = kernel;
}
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=1562039&r1=1562038&r2=1562039&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 Tue Jan 28 11:28:23 2014
@@ -30,7 +30,7 @@ import javax.jcr.Session;
import javax.jcr.UnsupportedRepositoryOperationException;
import org.apache.jackrabbit.api.JackrabbitSession;
-import org.apache.jackrabbit.oak.plugins.document.MongoMK;
+import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.test.NotExecutableException;
import org.apache.jackrabbit.test.RepositoryStub;
@@ -83,7 +83,7 @@ public class OakDocumentRDBRepositoryStu
}
protected Repository createRepository(String url, String username, String password) {
- MongoMK m = new MongoMK.Builder().setClusterId(1).memoryCacheSize(64 * 1024 * 1024)
+ DocumentMK m = new DocumentMK.Builder().setClusterId(1).memoryCacheSize(64 * 1024 * 1024)
.setRDBConnection(url, username, password).open();
Jcr jcr = new Jcr(m);
return jcr.createRepository();
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=1562039&r1=1562038&r2=1562039&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 Tue Jan 28 11:28:23 2014
@@ -29,13 +29,13 @@ import javax.jcr.UnsupportedRepositoryOp
import com.mongodb.BasicDBObject;
import org.apache.jackrabbit.api.JackrabbitSession;
-import org.apache.jackrabbit.oak.plugins.document.MongoMK;
+import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.apache.jackrabbit.test.NotExecutableException;
import org.apache.jackrabbit.test.RepositoryStub;
/**
- * A repository stub implementation for Oak on MongoMK
+ * A repository stub implementation for Oak on DocumentMK
*/
public class OakMongoMKRepositoryStub extends RepositoryStub {
@@ -87,7 +87,7 @@ public class OakMongoMKRepositoryStub ex
}
protected Repository createRepository(MongoConnection connection) {
- MongoMK m = new MongoMK.Builder().setClusterId(1).
+ DocumentMK m = new DocumentMK.Builder().setClusterId(1).
memoryCacheSize(64 * 1024 * 1024).
setMongoDB(connection.getDB()).open();
Jcr jcr = new Jcr(m);
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoNSRepositoryStub.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoNSRepositoryStub.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoNSRepositoryStub.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoNSRepositoryStub.java Tue Jan 28 11:28:23 2014
@@ -21,12 +21,12 @@ import java.util.Properties;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
-import org.apache.jackrabbit.oak.plugins.document.MongoMK;
-import org.apache.jackrabbit.oak.plugins.document.MongoNodeStore;
+import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
+import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
/**
- * A repository stub using the MongoNodeStore.
+ * A repository stub using the DocumentNodeStore.
*/
public class OakMongoNSRepositoryStub extends OakMongoMKRepositoryStub {
@@ -37,7 +37,7 @@ public class OakMongoNSRepositoryStub ex
@Override
protected Repository createRepository(MongoConnection connection) {
- MongoNodeStore store = new MongoMK.Builder().setClusterId(1).
+ DocumentNodeStore store = new DocumentMK.Builder().setClusterId(1).
memoryCacheSize(64 * 1024 * 1024).
setMongoDB(connection.getDB()).getNodeStore();
return new Jcr(store).createRepository();
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakSegmentMKRepositoryStub.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakSegmentMKRepositoryStub.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakSegmentMKRepositoryStub.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakSegmentMKRepositoryStub.java Tue Jan 28 11:28:23 2014
@@ -38,7 +38,7 @@ import org.apache.jackrabbit.test.NotExe
import org.apache.jackrabbit.test.RepositoryStub;
/**
- * A repository stub implementation for Oak on MongoMK
+ * A repository stub implementation for Oak on DocumentMK
*/
public class OakSegmentMKRepositoryStub extends RepositoryStub {
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/AbstractClusterTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/AbstractClusterTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/AbstractClusterTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/AbstractClusterTest.java Tue Jan 28 11:28:23 2014
@@ -32,7 +32,7 @@ import org.junit.After;
import org.junit.Before;
/**
- * A base class for MongoMK cluster tests.
+ * A base class for DocumentMK cluster tests.
*/
public class AbstractClusterTest {
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/SmallFileWriteTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/SmallFileWriteTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/SmallFileWriteTest.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/SmallFileWriteTest.java Tue Jan 28 11:28:23 2014
@@ -33,7 +33,7 @@ public class SmallFileWriteTest extends
private Node root;
/**
- * Iteration counter used to avoid the slit document edge case in MongoMK.
+ * Iteration counter used to avoid the slit document edge case in DocumentMK.
*/
private int iteration = 0;
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java Tue Jan 28 11:28:23 2014
@@ -24,8 +24,8 @@ import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.api.JackrabbitRepository;
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.mk.core.MicroKernelImpl;
-import org.apache.jackrabbit.oak.plugins.document.MongoMK;
-import org.apache.jackrabbit.oak.plugins.document.MongoNodeStore;
+import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
+import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.jcr.Jcr;
@@ -86,15 +86,15 @@ public abstract class OakRepositoryFixtu
final boolean dropDBAfterTest, final long cacheSize) {
return new OakRepositoryFixture("Oak-Mongo") {
private String dbName = database != null ? database : unique;
- private MongoMK[] kernels;
+ private DocumentMK[] kernels;
@Override
protected Repository[] internalSetUpCluster(int n) throws Exception {
Repository[] cluster = new Repository[n];
- kernels = new MongoMK[cluster.length];
+ kernels = new DocumentMK[cluster.length];
for (int i = 0; i < cluster.length; i++) {
MongoConnection mongo =
new MongoConnection(host, port, dbName);
- kernels[i] = new MongoMK.Builder().
+ kernels[i] = new DocumentMK.Builder().
setMongoDB(mongo.getDB()).
setClusterId(i).setLogging(false).open();
Oak oak = new Oak(new KernelNodeStore(kernels[i], cacheSize));
@@ -105,7 +105,7 @@ public abstract class OakRepositoryFixtu
@Override
public void tearDownCluster() {
super.tearDownCluster();
- for (MongoMK kernel : kernels) {
+ for (DocumentMK kernel : kernels) {
kernel.dispose();
}
if (dropDBAfterTest) {
@@ -127,15 +127,15 @@ public abstract class OakRepositoryFixtu
final boolean dropDBAfterTest, final long cacheSize) {
return new OakRepositoryFixture("Oak-MongoNS") {
private String dbName = database != null ? database : unique;
- private MongoNodeStore[] stores;
+ private DocumentNodeStore[] stores;
@Override
protected Repository[] internalSetUpCluster(int n) throws Exception {
Repository[] cluster = new Repository[n];
- stores = new MongoNodeStore[cluster.length];
+ stores = new DocumentNodeStore[cluster.length];
for (int i = 0; i < cluster.length; i++) {
MongoConnection mongo =
new MongoConnection(host, port, dbName);
- stores[i] = new MongoMK.Builder().
+ stores[i] = new DocumentMK.Builder().
setMongoDB(mongo.getDB()).
memoryCacheSize(cacheSize).
setClusterId(i).setLogging(false).getNodeStore();
@@ -147,7 +147,7 @@ public abstract class OakRepositoryFixtu
@Override
public void tearDownCluster() {
super.tearDownCluster();
- for (MongoNodeStore store : stores) {
+ for (DocumentNodeStore store : stores) {
store.dispose();
}
if (dropDBAfterTest) {