Propchange:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/impl/MongoMKWaitForCommitTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/impl/MongoMKWaitForCommitTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/impl/SimpleNodeScenario.java
(from r1494076,
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/SimpleNodeScenario.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/impl/SimpleNodeScenario.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/impl/SimpleNodeScenario.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/SimpleNodeScenario.java&r1=1494076&r2=1494120&rev=1494120&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/SimpleNodeScenario.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/impl/SimpleNodeScenario.java
Tue Jun 18 12:46:15 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mongomk.impl;
+package org.apache.jackrabbit.oak.plugins.mongomk.impl;
import org.apache.jackrabbit.mk.api.MicroKernel;
Propchange:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/impl/SimpleNodeScenario.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/impl/SimpleNodeScenario.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/impl/command/ConcurrentWriteMultipleMkMongoTest.java
(from r1494076,
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/command/ConcurrentWriteMultipleMkMongoTest.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/impl/command/ConcurrentWriteMultipleMkMongoTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/impl/command/ConcurrentWriteMultipleMkMongoTest.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/command/ConcurrentWriteMultipleMkMongoTest.java&r1=1494076&r2=1494120&rev=1494120&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/command/ConcurrentWriteMultipleMkMongoTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/impl/command/ConcurrentWriteMultipleMkMongoTest.java
Tue Jun 18 12:46:15 2013
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mongomk.impl.command;
+package org.apache.jackrabbit.oak.plugins.mongomk.impl.command;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import org.apache.jackrabbit.mk.api.MicroKernel;
-import org.apache.jackrabbit.mongomk.AbstractMongoConnectionTest;
-import org.apache.jackrabbit.mongomk.MongoMK;
+import org.apache.jackrabbit.oak.plugins.mongomk.AbstractMongoConnectionTest;
+import org.apache.jackrabbit.oak.plugins.mongomk.MongoMK;
import org.junit.Ignore;
import org.junit.Test;
Propchange:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/impl/command/ConcurrentWriteMultipleMkMongoTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/impl/command/ConcurrentWriteMultipleMkMongoTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/multitenancy/MultiTenancyTest.java
(from r1494076,
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/multitenancy/MultiTenancyTest.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/multitenancy/MultiTenancyTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/multitenancy/MultiTenancyTest.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/multitenancy/MultiTenancyTest.java&r1=1494076&r2=1494120&rev=1494120&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/multitenancy/MultiTenancyTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/multitenancy/MultiTenancyTest.java
Tue Jun 18 12:46:15 2013
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mongomk.multitenancy;
+package org.apache.jackrabbit.oak.plugins.mongomk.multitenancy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.apache.jackrabbit.mk.api.MicroKernel;
-import org.apache.jackrabbit.mongomk.AbstractMongoConnectionTest;
-import org.apache.jackrabbit.mongomk.MongoMK;
-import org.apache.jackrabbit.mongomk.util.MongoConnection;
+import org.apache.jackrabbit.oak.plugins.mongomk.AbstractMongoConnectionTest;
+import org.apache.jackrabbit.oak.plugins.mongomk.MongoMK;
+import org.apache.jackrabbit.oak.plugins.mongomk.util.MongoConnection;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
Propchange:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/multitenancy/MultiTenancyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/multitenancy/MultiTenancyTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/setup.txt
(from r1494076,
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/setup.txt)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/setup.txt?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/setup.txt&p1=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/setup.txt&r1=1494076&r2=1494120&rev=1494120&view=diff
==============================================================================
(empty)
Propchange:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/setup.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/oak/trunk/oak-it/mk/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/pom.xml?rev=1494120&r1=1494119&r2=1494120&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/mk/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/mk/pom.xml Tue Jun 18 12:46:15 2013
@@ -75,17 +75,21 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-mk-remote</artifactId>
+ <artifactId>oak-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-mongomk</artifactId>
+ <artifactId>oak-mk-remote</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.mongodb</groupId>
+ <artifactId>mongo-java-driver</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1</version>
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=1494120&r1=1494119&r2=1494120&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 Jun 18 12:46:15 2013
@@ -18,10 +18,10 @@ package org.apache.jackrabbit.mk.test;
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.mk.blobs.BlobStore;
-import org.apache.jackrabbit.mongomk.DocumentStore;
-import org.apache.jackrabbit.mongomk.MongoMK;
-import org.apache.jackrabbit.mongomk.blob.MongoBlobStore;
-import org.apache.jackrabbit.mongomk.util.MongoConnection;
+import org.apache.jackrabbit.oak.plugins.mongomk.DocumentStore;
+import org.apache.jackrabbit.oak.plugins.mongomk.MongoMK;
+import org.apache.jackrabbit.oak.plugins.mongomk.blob.MongoBlobStore;
+import org.apache.jackrabbit.oak.plugins.mongomk.util.MongoConnection;
import com.mongodb.BasicDBObject;
import com.mongodb.DB;
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=1494120&r1=1494119&r2=1494120&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 Jun 18 12:46:15 2013
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.mk.test;
import org.apache.jackrabbit.mk.blobs.BlobStore;
-import org.apache.jackrabbit.mongomk.blob.gridfs.MongoGridFSBlobStore;
+import
org.apache.jackrabbit.oak.plugins.mongomk.blob.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=1494120&r1=1494119&r2=1494120&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 Jun 18 12:46:15 2013
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.mk.test;
import org.apache.jackrabbit.mk.blobs.BlobStore;
-import org.apache.jackrabbit.mongomk.blob.MongoBlobStore;
+import org.apache.jackrabbit.oak.plugins.mongomk.blob.MongoBlobStore;
import com.mongodb.DB;
Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1494120&r1=1494119&r2=1494120&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Tue Jun 18 12:46:15 2013
@@ -426,14 +426,13 @@
<!-- Test dependencies -->
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-mongomk</artifactId>
- <version>${project.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.mongodb</groupId>
+ <artifactId>mongo-java-driver</artifactId>
<scope>test</scope>
</dependency>
<dependency>
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=1494120&r1=1494119&r2=1494120&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 Jun 18 12:46:15 2013
@@ -29,8 +29,8 @@ import javax.jcr.Session;
import javax.jcr.UnsupportedRepositoryOperationException;
import org.apache.jackrabbit.api.JackrabbitSession;
-import org.apache.jackrabbit.mongomk.MongoMK;
-import org.apache.jackrabbit.mongomk.util.MongoConnection;
+import org.apache.jackrabbit.oak.plugins.mongomk.MongoMK;
+import org.apache.jackrabbit.oak.plugins.mongomk.util.MongoConnection;
import org.apache.jackrabbit.test.NotExecutableException;
import org.apache.jackrabbit.test.RepositoryStub;
Modified: jackrabbit/oak/trunk/oak-mk-perf/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-perf/pom.xml?rev=1494120&r1=1494119&r2=1494120&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk-perf/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-mk-perf/pom.xml Tue Jun 18 12:46:15 2013
@@ -103,13 +103,6 @@
<artifactId>junit</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-mongomk</artifactId>
- <version>${project.version}</version>
- </dependency>
- -->
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-mk</artifactId>
Modified: jackrabbit/oak/trunk/oak-mongomk-perf/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk-perf/pom.xml?rev=1494120&r1=1494119&r2=1494120&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk-perf/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-mongomk-perf/pom.xml Tue Jun 18 12:46:15 2013
@@ -78,11 +78,6 @@
<!-- Oak MongoMK -->
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-mongomk</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
Modified:
jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MongoClearCollections.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MongoClearCollections.java?rev=1494120&r1=1494119&r2=1494120&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MongoClearCollections.java
(original)
+++
jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MongoClearCollections.java
Tue Jun 18 12:46:15 2013
@@ -16,14 +16,12 @@
*/
package org.apache.jackrabbit.mk.testing;
-import java.util.Arrays;
import java.util.Collections;
-import org.apache.jackrabbit.mongomk.impl.MongoConnection;
-import org.apache.jackrabbit.mongomk.impl.model.MongoCommit;
-import org.apache.jackrabbit.mongomk.impl.model.MongoNode;
-import org.apache.jackrabbit.mongomk.impl.model.MongoSync;
-import org.omg.Messaging.SYNC_WITH_TRANSPORT;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.MongoConnection;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.model.MongoCommit;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.model.MongoNode;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.model.MongoSync;
import com.mongodb.BasicDBObject;
import com.mongodb.DB;
Modified:
jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MongoMicroKernelInitializer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MongoMicroKernelInitializer.java?rev=1494120&r1=1494119&r2=1494120&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MongoMicroKernelInitializer.java
(original)
+++
jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MongoMicroKernelInitializer.java
Tue Jun 18 12:46:15 2013
@@ -21,10 +21,10 @@ import java.util.ArrayList;
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.mk.blobs.BlobStore;
import org.apache.jackrabbit.mk.util.Configuration;
-import org.apache.jackrabbit.mongomk.impl.MongoConnection;
-import org.apache.jackrabbit.mongomk.impl.MongoMicroKernel;
-import org.apache.jackrabbit.mongomk.impl.MongoNodeStore;
-import org.apache.jackrabbit.mongomk.impl.blob.*;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.MongoConnection;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.MongoMicroKernel;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.MongoNodeStore;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.blob.*;
import com.mongodb.BasicDBObjectBuilder;
Modified:
jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/MicroKernelPerfClient.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/MicroKernelPerfClient.java?rev=1494120&r1=1494119&r2=1494120&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/MicroKernelPerfClient.java
(original)
+++
jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/MicroKernelPerfClient.java
Tue Jun 18 12:46:15 2013
@@ -23,11 +23,11 @@ import java.util.Map;
import org.apache.jackrabbit.mk.blobs.BlobStore;
import org.apache.jackrabbit.mongomk.api.NodeStore;
-import org.apache.jackrabbit.mongomk.impl.MongoConnection;
-import org.apache.jackrabbit.mongomk.impl.MongoMicroKernel;
-import org.apache.jackrabbit.mongomk.impl.MongoNodeStore;
-import org.apache.jackrabbit.mongomk.impl.json.DefaultJsopHandler;
-import org.apache.jackrabbit.mongomk.impl.json.JsopParser;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.MongoConnection;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.MongoMicroKernel;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.MongoNodeStore;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.json.DefaultJsopHandler;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.json.JsopParser;
import org.apache.jackrabbit.mongomk.perf.RandomJsopGenerator.RandomJsop;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.log4j.Logger;
Modified:
jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/MicroKernelPerfMaster.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/MicroKernelPerfMaster.java?rev=1494120&r1=1494119&r2=1494120&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/MicroKernelPerfMaster.java
(original)
+++
jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/MicroKernelPerfMaster.java
Tue Jun 18 12:46:15 2013
@@ -21,13 +21,13 @@ import java.util.List;
import org.apache.jackrabbit.mk.blobs.BlobStore;
import org.apache.jackrabbit.mongomk.api.NodeStore;
-import org.apache.jackrabbit.mongomk.impl.MongoConnection;
-import org.apache.jackrabbit.mongomk.impl.MongoMicroKernel;
-import org.apache.jackrabbit.mongomk.impl.MongoNodeStore;
-import org.apache.jackrabbit.mongomk.impl.json.DefaultJsopHandler;
-import org.apache.jackrabbit.mongomk.impl.json.JsopParser;
-import org.apache.jackrabbit.mongomk.impl.model.MongoCommit;
-import org.apache.jackrabbit.mongomk.impl.model.MongoSync;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.MongoConnection;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.MongoMicroKernel;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.MongoNodeStore;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.json.DefaultJsopHandler;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.json.JsopParser;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.model.MongoCommit;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.model.MongoSync;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.log4j.Logger;
import org.json.JSONArray;
Modified:
jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/PrepareEnvironment.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/PrepareEnvironment.java?rev=1494120&r1=1494119&r2=1494120&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/PrepareEnvironment.java
(original)
+++
jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/PrepareEnvironment.java
Tue Jun 18 12:46:15 2013
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.mongomk.perf;
-import org.apache.jackrabbit.mongomk.impl.MongoConnection;
+import org.apache.jackrabbit.oak.plugins.mongomk.impl.MongoConnection;
import org.apache.log4j.Logger;
public class PrepareEnvironment {
Modified:
jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/RandomJsopGenerator.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/RandomJsopGenerator.java?rev=1494120&r1=1494119&r2=1494120&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/RandomJsopGenerator.java
(original)
+++
jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/RandomJsopGenerator.java
Tue Jun 18 12:46:15 2013
@@ -22,7 +22,7 @@ import java.util.UUID;
import org.apache.jackrabbit.mk.json.JsopBuilder;
import org.apache.jackrabbit.mongomk.api.model.Node;
-import org.apache.jackrabbit.mongomk.util.NodeBuilder;
+import org.apache.jackrabbit.oak.plugins.mongomk.util.NodeBuilder;
import org.apache.jackrabbit.oak.commons.PathUtils;
public class RandomJsopGenerator {
Modified: jackrabbit/oak/trunk/oak-run/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/pom.xml?rev=1494120&r1=1494119&r2=1494120&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-run/pom.xml Tue Jun 18 12:46:15 2013
@@ -130,16 +130,15 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-mongomk</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.3.158</version>
</dependency>
<dependency>
+ <groupId>org.mongodb</groupId>
+ <artifactId>mongo-java-driver</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-server</artifactId>
<version>${jackrabbit.version}</version>
@@ -168,6 +167,7 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
+
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
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=1494120&r1=1494119&r2=1494120&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 Jun 18 12:46:15 2013
@@ -23,8 +23,8 @@ import javax.jcr.Repository;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.mk.core.MicroKernelImpl;
-import org.apache.jackrabbit.mongomk.MongoMK;
-import org.apache.jackrabbit.mongomk.util.MongoConnection;
+import org.apache.jackrabbit.oak.plugins.mongomk.MongoMK;
+import org.apache.jackrabbit.oak.plugins.mongomk.util.MongoConnection;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.jcr.Jcr;
import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
Modified: jackrabbit/oak/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/pom.xml?rev=1494120&r1=1494119&r2=1494120&view=diff
==============================================================================
--- jackrabbit/oak/trunk/pom.xml (original)
+++ jackrabbit/oak/trunk/pom.xml Tue Jun 18 12:46:15 2013
@@ -41,7 +41,6 @@
<module>oak-mk-api</module>
<module>oak-mk</module>
<module>oak-mk-remote</module>
- <module>oak-mongomk</module>
<module>oak-core</module>
<module>oak-jcr</module>
<module>oak-upgrade</module>
