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 2018/04/24 13:45:26 UTC
svn commit: r1829999 - in /jackrabbit/oak/trunk: oak-parent/pom.xml
oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java
Author: mreutegg
Date: Tue Apr 24 13:45:26 2018
New Revision: 1829999
URL: http://svn.apache.org/viewvc?rev=1829999&view=rev
Log:
OAK-7438: Expose mongo.url as build property
Modified:
jackrabbit/oak/trunk/oak-parent/pom.xml
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1829999&r1=1829998&r2=1829999&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Tue Apr 24 13:45:26 2018
@@ -48,6 +48,7 @@
<mongo.port>27017</mongo.port>
<mongo.db>MongoMKDB</mongo.db>
<mongo.db2>MongoMKDB2</mongo.db2>
+ <mongo.url/>
<segment.db>SegmentMK</segment.db>
<lucene.version>4.7.1</lucene.version>
<solr.version>5.5.5</solr.version>
@@ -291,6 +292,7 @@
<mongo.port>${mongo.port}</mongo.port>
<mongo.db>${mongo.db}</mongo.db>
<mongo.db2>${mongo.db2}</mongo.db2>
+ <mongo.url>${mongo.url}</mongo.url>
<segment.db>${segment.db}</segment.db>
<nsfixtures>${fixtures}</nsfixtures>
<derby.stream.error.file>${project.build.directory}/derby.log</derby.stream.error.file>
@@ -309,6 +311,7 @@
<mongo.port>${mongo.port}</mongo.port>
<mongo.db>${mongo.db}</mongo.db>
<mongo.db2>${mongo.db2}</mongo.db2>
+ <mongo.url>${mongo.url}</mongo.url>
<nsfixtures>${fixtures}</nsfixtures>
<derby.stream.error.file>${project.build.directory}/derby.log</derby.stream.error.file>
</systemPropertyVariables>
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java?rev=1829999&r1=1829998&r2=1829999&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java Tue Apr 24 13:45:26 2018
@@ -37,9 +37,16 @@ public class MongoUtils {
public static final String DB =
System.getProperty("mongo.db", "MongoMKDB");
- public static final String URL =
- System.getProperty("mongo.url", "mongodb://" + HOST + ":" + PORT + "/" + DB +
- "?connectTimeoutMS=3000&serverSelectionTimeoutMS=3000");
+ public static final String URL = createMongoURL();
+
+ private static String createMongoURL() {
+ String mongoUrl = System.getProperty("mongo.url");
+ if (mongoUrl == null || mongoUrl.isEmpty()) {
+ mongoUrl = "mongodb://" + HOST + ":" + PORT + "/" + DB +
+ "?connectTimeoutMS=3000&serverSelectionTimeoutMS=3000";
+ }
+ return mongoUrl;
+ }
protected static Exception exception;