Author: mreutegg
Date: Tue Jan 28 12:56:09 2014
New Revision: 1562055
URL: http://svn.apache.org/r1562055
Log:
OAK-1360: Rename o.a.j.o.plugins.mongomk to o.a.j.o.plugins.document
- move MongoBlob* to document.mongo package
- clean up occurrences of MongoDB in JavaDoc
Added:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlob.java
(contents, props changed)
- copied, changed from r1562049,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoBlob.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java
(contents, props changed)
- copied, changed from r1562049,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoBlobStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/RevisionEntry.java
(contents, props changed)
- copied, changed from r1562049,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionEntry.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/
- copied from r1562049,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/blob/gridfs/
Removed:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionEntry.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoBlob.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoBlobStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/blob/gridfs/BaseCommand.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/blob/gridfs/Command.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/blob/gridfs/CommandExecutor.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/blob/gridfs/DefaultCommandExecutor.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/blob/gridfs/GetBlobLengthCommandGridFS.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/blob/gridfs/MongoGridFSBlobStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/blob/gridfs/ReadBlobCommandGridFS.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/blob/gridfs/WriteBlobCommandGridFS.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/rdbpersistence/
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocOffHeapCache.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/BaseCommand.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/Command.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/CommandExecutor.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/DefaultCommandExecutor.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/GetBlobLengthCommandGridFS.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/MongoGridFSBlobStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/ReadBlobCommandGridFS.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/WriteBlobCommandGridFS.java
jackrabbit/oak/trunk/oak-core/src/main/resources/OSGI-INF/metatype/metatype.properties
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoBlobStoreTest.java
jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/BaseMongoMicroKernelFixture.java
jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoGridFSMicroKernelFixture.java
jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoMicroKernelFixture.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java?rev=1562055&r1=1562054&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
Tue Jan 28 12:56:09 2014
@@ -26,7 +26,6 @@ import java.util.UUID;
import org.apache.jackrabbit.mk.api.MicroKernelException;
import org.apache.jackrabbit.mk.util.StringUtils;
-import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,7 +36,7 @@ import static org.apache.jackrabbit.oak.
*/
public class ClusterNodeInfo {
- private static final Logger LOG =
LoggerFactory.getLogger(MongoDocumentStore.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(ClusterNodeInfo.class);
/**
* The prefix for random (non-reusable) keys.
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java?rev=1562055&r1=1562054&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java
Tue Jan 28 12:56:09 2014
@@ -92,7 +92,7 @@ class Collision {
* Marks the commit root of the change to the given <code>document</code>
in
* <code>revision</code>.
*
- * @param document the MongoDB document.
+ * @param document the document.
* @param revision the revision of the commit to annotated with a collision
* marker.
* @param store the document store.
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java?rev=1562055&r1=1562054&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
Tue Jan 28 12:56:09 2014
@@ -166,14 +166,14 @@ public class Commit {
}
/**
- * Apply the changes to the document store (to update MongoDB).
+ * Apply the changes to the document store.
*/
void applyToDocumentStore() {
applyToDocumentStore(null);
}
/**
- * Apply the changes to the document store (to update MongoDB).
+ * Apply the changes to the document store.
*
* @param baseBranchRevision the base revision of this commit. Currently
only
* used for branch commits.
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java?rev=1562055&r1=1562054&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
Tue Jan 28 12:56:09 2014
@@ -46,7 +46,7 @@ import org.apache.jackrabbit.oak.cache.C
import org.apache.jackrabbit.oak.cache.EmpiricalWeigher;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.document.Node.Children;
-import org.apache.jackrabbit.oak.plugins.document.blob.MongoBlobStore;
+import org.apache.jackrabbit.oak.plugins.document.mongo.MongoBlobStore;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
@@ -56,7 +56,7 @@ import org.apache.jackrabbit.oak.plugins
import static com.google.common.base.Preconditions.checkNotNull;
/**
- * A MicroKernel implementation that stores the data in a MongoDB.
+ * A MicroKernel implementation that stores the data in a {@link
DocumentStore}.
*/
public class DocumentMK implements MicroKernel {
@@ -64,27 +64,27 @@ public class DocumentMK implements Micro
* The threshold where special handling for many child node starts.
*/
static final int MANY_CHILDREN_THRESHOLD = Integer.getInteger(
- "oak.mongoMK.manyChildren", 50);
+ "oak.documentMK.manyChildren", 50);
/**
* Enable the LIRS cache.
*/
static final boolean LIRS_CACHE = Boolean.parseBoolean(
- System.getProperty("oak.mongoMK.lirsCache", "false"));
+ System.getProperty("oak.documentMK.lirsCache", "false"));
/**
* Enable fast diff operations.
*/
private static final boolean FAST_DIFF = Boolean.parseBoolean(
- System.getProperty("oak.mongoMK.fastDiff", "true"));
+ System.getProperty("oak.documentMK.fastDiff", "true"));
/**
- * The MongoDB store.
+ * The node store.
*/
protected final DocumentNodeStore nodeStore;
/**
- * The MongoDB store (might be used by multiple MongoMKs).
+ * The document store (might be used by multiple DocumentMKs).
*/
protected final DocumentStore store;
@@ -99,7 +99,7 @@ public class DocumentMK implements Micro
this.store = nodeStore.getDocumentStore();
diffCache = builder.buildCache(builder.getDiffCacheSize());
- diffCacheStats = new CacheStats(diffCache, "MongoMk-DiffCache",
+ diffCacheStats = new CacheStats(diffCache, "DocumentMk-DiffCache",
builder.getWeigher(), builder.getDiffCacheSize());
}
@@ -228,7 +228,7 @@ public class DocumentMK implements Micro
}
}
// TODO this does not work well for large child node lists
- // use a MongoDB index instead
+ // use a document store index instead
int max = MANY_CHILDREN_THRESHOLD;
Children fromChildren, toChildren;
fromChildren = nodeStore.getChildren(from, null, max);
@@ -656,7 +656,7 @@ public class DocumentMK implements Micro
private DocumentNodeStore nodeStore;
private DocumentStore documentStore;
private BlobStore blobStore;
- private int clusterId = Integer.getInteger("oak.mongoMK.clusterId",
0);
+ private int clusterId =
Integer.getInteger("oak.documentMK.clusterId", 0);
private int asyncDelay = 1000;
private boolean timing;
private boolean logging;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1562055&r1=1562054&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Tue Jan 28 12:56:09 2014
@@ -73,7 +73,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Implementation of a NodeStore on MongoDB.
+ * Implementation of a NodeStore on {@link DocumentStore}.
*/
public final class DocumentNodeStore
implements NodeStore, RevisionContext, Observable {
@@ -88,19 +88,19 @@ public final class DocumentNodeStore
/**
* Do not cache more than this number of children for a document.
*/
- private static final int NUM_CHILDREN_CACHE_LIMIT =
Integer.getInteger("oak.mongoMK.childrenCacheLimit", 16 * 1024);
+ private static final int NUM_CHILDREN_CACHE_LIMIT =
Integer.getInteger("oak.documentMK.childrenCacheLimit", 16 * 1024);
/**
* When trying to access revisions that are older than this many
* milliseconds, a warning is logged. The default is one minute.
*/
private static final int WARN_REVISION_AGE =
- Integer.getInteger("oak.mongoMK.revisionAge", 60 * 1000);
+ Integer.getInteger("oak.documentMK.revisionAge", 60 * 1000);
/**
* Enable background operations
*/
- private static final boolean ENABLE_BACKGROUND_OPS =
Boolean.parseBoolean(System.getProperty("oak.mongoMK.backgroundOps", "true"));
+ private static final boolean ENABLE_BACKGROUND_OPS =
Boolean.parseBoolean(System.getProperty("oak.documentMK.backgroundOps",
"true"));
/**
* How long to remember the relative order of old revision of all cluster
@@ -109,7 +109,7 @@ public final class DocumentNodeStore
private static final int REMEMBER_REVISION_ORDER_MILLIS = 60 * 60 * 1000;
/**
- * The MongoDB store (might be used by multiple MongoMKs).
+ * The document store (might be used by multiple node stores).
*/
protected final DocumentStore store;
@@ -222,7 +222,7 @@ public final class DocumentNodeStore
private final CacheStats docChildrenCacheStats;
/**
- * The MongoDB blob store.
+ * The blob store.
*/
private final BlobStore blobStore;
@@ -259,7 +259,7 @@ public final class DocumentNodeStore
}
this.store = s;
int cid = builder.getClusterId();
- cid = Integer.getInteger("oak.mongoMK.clusterId", cid);
+ cid = Integer.getInteger("oak.documentMK.clusterId", cid);
if (cid == 0) {
clusterNodeInfo = ClusterNodeInfo.getInstance(store);
// TODO we should ensure revisions generated from now on
@@ -277,15 +277,15 @@ public final class DocumentNodeStore
//TODO Make stats collection configurable as it add slight overhead
nodeCache = builder.buildCache(builder.getNodeCacheSize());
- nodeCacheStats = new CacheStats(nodeCache, "MongoMk-Node",
+ nodeCacheStats = new CacheStats(nodeCache, "DocumentMk-Node",
builder.getWeigher(), builder.getNodeCacheSize());
nodeChildrenCache = builder.buildCache(builder.getChildrenCacheSize());
- nodeChildrenCacheStats = new CacheStats(nodeChildrenCache,
"MongoMk-NodeChildren",
+ nodeChildrenCacheStats = new CacheStats(nodeChildrenCache,
"DocumentMk-NodeChildren",
builder.getWeigher(), builder.getChildrenCacheSize());
docChildrenCache =
builder.buildCache(builder.getDocChildrenCacheSize());
- docChildrenCacheStats = new CacheStats(docChildrenCache,
"MongoMk-DocChildren",
+ docChildrenCacheStats = new CacheStats(docChildrenCache,
"DocumentMk-DocChildren",
builder.getWeigher(), builder.getDocChildrenCacheSize());
// check if root node exists
@@ -798,7 +798,7 @@ public final class DocumentNodeStore
TreeSet<String> names = new
TreeSet<String>(docChildren.childNames);
// incomplete cache entries must not be updated with
// names at the end of the list because there might be
- // a next name in MongoDB smaller than the one added
+ // a next name in DocumentStore smaller than the one added
if (!docChildren.isComplete) {
for (String childPath : added) {
String name = PathUtils.getName(childPath);
@@ -1055,18 +1055,18 @@ public final class DocumentNodeStore
@Nonnull CommitHook commitHook,
@Nullable CommitInfo info)
throws CommitFailedException {
- return asMongoRootBuilder(builder).merge(commitHook, info);
+ return asDocumentRootBuilder(builder).merge(commitHook, info);
}
@Nonnull
@Override
public NodeState rebase(@Nonnull NodeBuilder builder) {
- return asMongoRootBuilder(builder).rebase();
+ return asDocumentRootBuilder(builder).rebase();
}
@Override
public NodeState reset(@Nonnull NodeBuilder builder) {
- return asMongoRootBuilder(builder).reset();
+ return asDocumentRootBuilder(builder).reset();
}
@Override
@@ -1287,7 +1287,7 @@ public final class DocumentNodeStore
return (name == null ? "" : name) + path + "@" + readRevision;
}
- private static DocumentRootBuilder asMongoRootBuilder(NodeBuilder builder)
+ private static DocumentRootBuilder asDocumentRootBuilder(NodeBuilder
builder)
throws IllegalArgumentException {
if (!(builder instanceof DocumentRootBuilder)) {
throw new IllegalArgumentException("builder must be a " +
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java?rev=1562055&r1=1562054&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
Tue Jan 28 12:56:09 2014
@@ -53,8 +53,8 @@ import static org.apache.jackrabbit.oak.
* The OSGi service to start/stop a DocumentNodeStore instance.
*/
@Component(metatype = true,
- label = "%oak.mongons.label",
- description = "%oak.mongons.description",
+ label = "%oak.documentns.label",
+ description = "%oak.documentns.description",
policy = ConfigurationPolicy.REQUIRE
)
public class DocumentNodeStoreService {
@@ -117,12 +117,12 @@ public class DocumentNodeStoreService {
MongoClientURI mongoURI = new MongoClientURI(uri,builder);
if(logger.isInfoEnabled()){
- //Take care around not logging the uri directly as it
- //might contain passwords
- String type = useMK ? "MicroKernel" : "NodeStore" ;
- logger.info("Starting MongoDB {} with host={}, db={}, cache size
(MB)={}, Off Heap Cache size (MB)={}",
- new Object[] {type,mongoURI.getHosts(), db, cacheSize,
offHeapCache});
- logger.info("Mongo Connection details
{}",MongoConnection.toString(mongoURI.getOptions()));
+ // Take care around not logging the uri directly as it
+ // might contain passwords
+ String type = useMK ? "MK" : "NodeStore" ;
+ logger.info("Starting Document{} with host={}, db={}, cache size
(MB)={}, Off Heap Cache size (MB)={}",
+ new Object[] {type, mongoURI.getHosts(), db, cacheSize,
offHeapCache});
+ logger.info("Mongo Connection details {}",
MongoConnection.toString(mongoURI.getOptions()));
}
MongoClient client = new MongoClient(mongoURI);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java?rev=1562055&r1=1562054&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java
Tue Jan 28 12:56:09 2014
@@ -129,7 +129,7 @@ public interface DocumentStore {
UpdateOp updateOp);
/**
- * Create or update a document. For MongoDb, this is using "findAndModify"
with
+ * Create or update a document. For MongoDB, this is using "findAndModify"
with
* the "upsert" flag (insert or update). The returned document is
immutable.
*
* @param <T> the document type
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java?rev=1562055&r1=1562054&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
Tue Jan 28 12:56:09 2014
@@ -1082,7 +1082,7 @@ public class NodeDocument extends Docume
static final class Children implements CacheValue, Cloneable {
/**
- * The child node names, ordered as stored in MongoDB.
+ * The child node names, ordered as stored in DocumentStore.
*/
ArrayList<String> childNames = new ArrayList<String>();
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java?rev=1562055&r1=1562054&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java
Tue Jan 28 12:56:09 2014
@@ -27,7 +27,7 @@ import javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
/**
- * A MongoDB "update" operation for one document.
+ * A DocumentStore "update" operation for one document.
*/
public final class UpdateOp {
@@ -188,12 +188,12 @@ public final class UpdateOp {
}
/**
- * A MongoDB operation for a given key within a document.
+ * A DocumentStore operation for a given key within a document.
*/
public static final class Operation {
/**
- * The MongoDB operation type.
+ * The DocumentStore operation type.
*/
public enum Type {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocOffHeapCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocOffHeapCache.java?rev=1562055&r1=1562054&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocOffHeapCache.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocOffHeapCache.java
Tue Jan 28 12:56:09 2014
@@ -90,7 +90,7 @@ public class NodeDocOffHeapCache
.recordStats()
.build();
- offHeapCacheStats = new CacheStats(offHeapCache,
"MongoMk-Documents-L2", builder.getWeigher(),
+ offHeapCacheStats = new CacheStats(offHeapCache,
"DocumentMk-Documents-L2", builder.getWeigher(),
builder.getOffHeapCacheSize());
final long bufferSize = Ram.Gb(1);
Copied:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlob.java
(from r1562049,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoBlob.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlob.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlob.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoBlob.java&r1=1562049&r2=1562055&rev=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoBlob.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlob.java
Tue Jan 28 12:56:09 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.document.blob;
+package org.apache.jackrabbit.oak.plugins.document.mongo;
import com.mongodb.BasicDBObject;
Propchange:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlob.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlob.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java
(from r1562049,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoBlobStore.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoBlobStore.java&r1=1562049&r2=1562055&rev=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoBlobStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java
Tue Jan 28 12:56:09 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.document.blob;
+package org.apache.jackrabbit.oak.plugins.document.mongo;
import java.io.IOException;
Propchange:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java?rev=1562055&r1=1562054&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
Tue Jan 28 12:56:09 2014
@@ -44,7 +44,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
import org.apache.jackrabbit.oak.plugins.document.Revision;
-import org.apache.jackrabbit.oak.plugins.document.RevisionEntry;
import org.apache.jackrabbit.oak.plugins.document.StableRevisionComparator;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Key;
Copied:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/RevisionEntry.java
(from r1562049,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionEntry.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/RevisionEntry.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/RevisionEntry.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionEntry.java&r1=1562049&r2=1562055&rev=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionEntry.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/RevisionEntry.java
Tue Jan 28 12:56:09 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.document;
+package org.apache.jackrabbit.oak.plugins.document.mongo;
import java.util.Collections;
import java.util.Map;
@@ -22,6 +22,7 @@ import java.util.Set;
import javax.annotation.Nonnull;
+import org.apache.jackrabbit.oak.plugins.document.Revision;
import org.bson.BSONObject;
import com.mongodb.DBObject;
Propchange:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/RevisionEntry.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/RevisionEntry.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/BaseCommand.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/BaseCommand.java?rev=1562055&r1=1562049&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/BaseCommand.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/BaseCommand.java
Tue Jan 28 12:56:09 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.document.blob.gridfs;
+package org.apache.jackrabbit.oak.plugins.document.mongo.gridfs;
/**
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/Command.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/Command.java?rev=1562055&r1=1562049&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/Command.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/Command.java
Tue Jan 28 12:56:09 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.document.blob.gridfs;
+package org.apache.jackrabbit.oak.plugins.document.mongo.gridfs;
/**
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/CommandExecutor.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/CommandExecutor.java?rev=1562055&r1=1562049&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/CommandExecutor.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/CommandExecutor.java
Tue Jan 28 12:56:09 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.document.blob.gridfs;
+package org.apache.jackrabbit.oak.plugins.document.mongo.gridfs;
import java.io.IOException;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/DefaultCommandExecutor.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/DefaultCommandExecutor.java?rev=1562055&r1=1562049&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/DefaultCommandExecutor.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/DefaultCommandExecutor.java
Tue Jan 28 12:56:09 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.document.blob.gridfs;
+package org.apache.jackrabbit.oak.plugins.document.mongo.gridfs;
import java.io.IOException;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/GetBlobLengthCommandGridFS.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/GetBlobLengthCommandGridFS.java?rev=1562055&r1=1562049&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/GetBlobLengthCommandGridFS.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/GetBlobLengthCommandGridFS.java
Tue Jan 28 12:56:09 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.document.blob.gridfs;
+package org.apache.jackrabbit.oak.plugins.document.mongo.gridfs;
import com.mongodb.BasicDBObject;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/MongoGridFSBlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/MongoGridFSBlobStore.java?rev=1562055&r1=1562049&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/MongoGridFSBlobStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/MongoGridFSBlobStore.java
Tue Jan 28 12:56:09 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.document.blob.gridfs;
+package org.apache.jackrabbit.oak.plugins.document.mongo.gridfs;
import java.io.IOException;
import java.io.InputStream;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/ReadBlobCommandGridFS.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/ReadBlobCommandGridFS.java?rev=1562055&r1=1562049&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/ReadBlobCommandGridFS.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/ReadBlobCommandGridFS.java
Tue Jan 28 12:56:09 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.document.blob.gridfs;
+package org.apache.jackrabbit.oak.plugins.document.mongo.gridfs;
import java.io.InputStream;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/WriteBlobCommandGridFS.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/WriteBlobCommandGridFS.java?rev=1562055&r1=1562049&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/WriteBlobCommandGridFS.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/gridfs/WriteBlobCommandGridFS.java
Tue Jan 28 12:56:09 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.document.blob.gridfs;
+package org.apache.jackrabbit.oak.plugins.document.mongo.gridfs;
import java.io.BufferedInputStream;
import java.io.IOException;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/resources/OSGI-INF/metatype/metatype.properties
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1562055&r1=1562054&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/resources/OSGI-INF/metatype/metatype.properties
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/resources/OSGI-INF/metatype/metatype.properties
Tue Jan 28 12:56:09 2014
@@ -19,9 +19,9 @@
# suppress inspection "UnusedProperty" for whole file
-oak.mongons.label=Apache Jackrabbit Oak MongoNodeStore Service
-oak.mongons.description= Configure an instance of the MongoDB \
- based MongoNodeStore implementation
+oak.documentns.label=Apache Jackrabbit Oak DocumentNodeStore Service
+oak.documentns.description= Configure an instance of the MongoDB \
+ based DocumentNodeStore implementation
host.name = MongoDB Host
host.description = The host to connect to.
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoBlobStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoBlobStoreTest.java?rev=1562055&r1=1562054&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoBlobStoreTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoBlobStoreTest.java
Tue Jan 28 12:56:09 2014
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.plugins.document.blob;
import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
+import org.apache.jackrabbit.oak.plugins.document.mongo.MongoBlobStore;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.junit.After;
import org.junit.Assume;
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=1562055&r1=1562054&r2=1562055&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 12:56:09 2014
@@ -20,7 +20,7 @@ import org.apache.jackrabbit.mk.api.Micr
import org.apache.jackrabbit.mk.blobs.BlobStore;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
-import org.apache.jackrabbit.oak.plugins.document.blob.MongoBlobStore;
+import org.apache.jackrabbit.oak.plugins.document.mongo.MongoBlobStore;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import com.mongodb.BasicDBObject;
Modified:
jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoGridFSMicroKernelFixture.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoGridFSMicroKernelFixture.java?rev=1562055&r1=1562054&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoGridFSMicroKernelFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoGridFSMicroKernelFixture.java
Tue Jan 28 12:56:09 2014
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.mk.test;
import org.apache.jackrabbit.mk.blobs.BlobStore;
-import
org.apache.jackrabbit.oak.plugins.document.blob.gridfs.MongoGridFSBlobStore;
+import
org.apache.jackrabbit.oak.plugins.document.mongo.gridfs.MongoGridFSBlobStore;
import com.mongodb.DB;
Modified:
jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoMicroKernelFixture.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoMicroKernelFixture.java?rev=1562055&r1=1562054&r2=1562055&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoMicroKernelFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoMicroKernelFixture.java
Tue Jan 28 12:56:09 2014
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.mk.test;
import org.apache.jackrabbit.mk.blobs.BlobStore;
-import org.apache.jackrabbit.oak.plugins.document.blob.MongoBlobStore;
+import org.apache.jackrabbit.oak.plugins.document.mongo.MongoBlobStore;
import com.mongodb.DB;
