jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1410046 - in /jackrabbit/oak/trunk: ./ oak-mongomk/ oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/ oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/multitenancy/
Date Thu, 15 Nov 2012 21:57:24 GMT
Author: jukka
Date: Thu Nov 15 21:57:23 2012
New Revision: 1410046

URL: http://svn.apache.org/viewvc?rev=1410046&view=rev
Log:
OAK-293: MongoDB-based MicroKernel

Add a way to specify custom MongoDB settings

Modified:
    jackrabbit/oak/trunk/README.md
    jackrabbit/oak/trunk/oak-mongomk/pom.xml
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/AbstractMongoConnectionTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/multitenancy/MultiTenancyTest.java

Modified: jackrabbit/oak/trunk/README.md
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/README.md?rev=1410046&r1=1410045&r2=1410046&view=diff
==============================================================================
--- jackrabbit/oak/trunk/README.md (original)
+++ jackrabbit/oak/trunk/README.md Thu Nov 15 21:57:23 2012
@@ -29,6 +29,25 @@ the above integration testing build pass
 you can enable integration tests by default by setting the
 `OAK_INTEGRATION_TESTING` environment variable.
 
+MongoDB integration
+-------------------
+
+Parts of the Oak build expects a MongoDB instance to be available for
+testing. By default a MongoDB instance running on localhost is expected,
+and the relevant tests are simply skipped if such an instance is not found.
+You can also configure the build to use custom MongoDB settings with the
+following properties (shown with their default values):
+
+    -Dmongo.host=127.0.0.1
+    -Dmongo.port=27017
+    -Dmongo.db=MongoMKDB
+    -Dmongo.db2=MongoMKDB2
+
+Note that the configured test databases will be *dropped* by the test cases.
+
+Components
+----------
+
 The build consists of the following main components:
 
   - oak-parent    - parent POM
@@ -36,10 +55,12 @@ The build consists of the following main
   - oak-mk-api    - MicroKernel API
   - oak-mk        - default MicroKernel implementation
   - oak-mk-remote - MicroKernel remoting
+  - oak-mongomk   - MongoDB-based MicroKernel
   - [oak-core][1] - Oak repository API and implementation
   - oak-jcr       - JCR binding for the Oak repository
   - oak-sling     - integration with Apache Sling
   - oak-http      - HTTP binding for Oak
+  - oak-lucene    - Lucene-based query index
   - oak-run       - runnable jar packaging
   - oak-it        - integration tests
     - oak-it/mk   - integration tests for MicroKernel

Modified: jackrabbit/oak/trunk/oak-mongomk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/pom.xml?rev=1410046&r1=1410045&r2=1410046&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-mongomk/pom.xml Thu Nov 15 21:57:23 2012
@@ -34,6 +34,13 @@
   <name>Oak Mongo MicroKernel</name>
   <packaging>bundle</packaging>
 
+  <properties>
+    <mongo.host>127.0.0.1</mongo.host>
+    <mongo.port>27017</mongo.port>
+    <mongo.db>MongoMKDB</mongo.db>
+    <mongo.db2>MongoMKDB2</mongo.db2>
+  </properties>
+
     <build>
         <plugins>
             <plugin>
@@ -68,6 +75,10 @@
                         <java.util.logging.config.file>
                             src/test/resources/logging.properties
                         </java.util.logging.config.file>
+                        <mongo.host>${mongo.host}</mongo.host>
+                        <mongo.port>${mongo.port}</mongo.port>
+                        <mongo.db>${mongo.db}</mongo.db>
+                        <mongo.db2>${mongo.db2}</mongo.db2>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>

Modified: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/AbstractMongoConnectionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/AbstractMongoConnectionTest.java?rev=1410046&r1=1410045&r2=1410046&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/AbstractMongoConnectionTest.java
(original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/AbstractMongoConnectionTest.java
Thu Nov 15 21:57:23 2012
@@ -23,7 +23,6 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 
 import com.mongodb.BasicDBObject;
-import com.mongodb.DB;
 
 /**
  * Base class for test cases that need a {@link MongoConnection}

Modified: 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-mongomk/src/test/java/org/apache/jackrabbit/mongomk/multitenancy/MultiTenancyTest.java?rev=1410046&r1=1410045&r2=1410046&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/multitenancy/MultiTenancyTest.java
(original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/multitenancy/MultiTenancyTest.java
Thu Nov 15 21:57:23 2012
@@ -39,7 +39,7 @@ import com.mongodb.DB;
 public class MultiTenancyTest extends AbstractMongoConnectionTest {
 
     private static final String DB2 =
-            System.getProperty("mongo.db", "MongoMKDB2");
+            System.getProperty("mongo.db2", "MongoMKDB2");
 
     private static MongoConnection mongoConnection2;
     private static MongoConnection mongoConnection3;



Mime
View raw message