jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1411627 - in /jackrabbit/oak/trunk: oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/BaseMongoMicroKernelFixture.java oak-mongomk/pom.xml oak-parent/pom.xml
Date Tue, 20 Nov 2012 11:52:11 GMT
Author: jukka
Date: Tue Nov 20 11:52:11 2012
New Revision: 1411627

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

Inherit MongoDB options from the parent POM for uniformity

Modified:
    jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/BaseMongoMicroKernelFixture.java
    jackrabbit/oak/trunk/oak-mongomk/pom.xml
    jackrabbit/oak/trunk/oak-parent/pom.xml

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=1411627&r1=1411626&r2=1411627&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 Nov 20 11:52:11 2012
@@ -36,7 +36,7 @@ public abstract class BaseMongoMicroKern
             Integer.getInteger("mongo.port", 27017);
 
     protected static final String DB =
-            System.getProperty("mongo.db", "mk-tf");
+            System.getProperty("mongo.db", "MongoMKDB");
 
     private static MongoConnection mongoConnection = null;
 

Modified: jackrabbit/oak/trunk/oak-mongomk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/pom.xml?rev=1411627&r1=1411626&r2=1411627&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-mongomk/pom.xml Tue Nov 20 11:52:11 2012
@@ -34,13 +34,6 @@
   <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>
@@ -75,10 +68,6 @@
                         <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-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1411627&r1=1411626&r2=1411627&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Tue Nov 20 11:52:11 2012
@@ -42,6 +42,10 @@
     </project.reporting.outputEncoding>
     <jackrabbit.version>2.5.2</jackrabbit.version>
     <guava.version>13.0.1</guava.version>
+    <mongo.host>127.0.0.1</mongo.host>
+    <mongo.port>27017</mongo.port>
+    <mongo.db>MongoMKDB</mongo.db>
+    <mongo.db2>MongoMKDB2</mongo.db2>
   </properties>
 
   <issueManagement>
@@ -113,6 +117,10 @@
             <argLine>${test.opts}</argLine>
             <systemPropertyVariables>
               <known.issues>${known.issues}</known.issues>
+              <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>
@@ -123,6 +131,10 @@
             <argLine>${test.opts}</argLine>
             <systemPropertyVariables>
               <known.issues>${known.issues}</known.issues>
+              <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>



Mime
View raw message