sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject svn commit: r1668674 - in /sling/trunk/launchpad/builder/src/main: bundles/ config/oak/ config/oak_mongo/ config/oak_tar/ sling/
Date Mon, 23 Mar 2015 16:12:23 GMT
Author: rombert
Date: Mon Mar 23 16:12:23 2015
New Revision: 1668674

URL: http://svn.apache.org/r1668674
Log:
SLING-4050 - Make it easier to run launchpad on Oak/Mongo

Add two new runmodes: oak_tar and oak_mongo. The common configurations
and bundles for both runmodes are kept in the oak runmode.

Added:
    sling/trunk/launchpad/builder/src/main/config/oak_mongo/
    sling/trunk/launchpad/builder/src/main/config/oak_mongo/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg
    sling/trunk/launchpad/builder/src/main/config/oak_tar/
    sling/trunk/launchpad/builder/src/main/config/oak_tar/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg
      - copied, changed from r1668655, sling/trunk/launchpad/builder/src/main/config/oak/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg
Removed:
    sling/trunk/launchpad/builder/src/main/config/oak/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg
Modified:
    sling/trunk/launchpad/builder/src/main/bundles/list.xml
    sling/trunk/launchpad/builder/src/main/sling/common.properties

Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1668674&r1=1668673&r2=1668674&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Mon Mar 23 16:12:23 2015
@@ -611,5 +611,11 @@
             <version>${oak.version}</version>
             <runModes>oak</runModes>
         </bundle>
+        <bundle>
+            <groupId>org.mongodb</groupId>
+            <artifactId>mongo-java-driver</artifactId>
+            <version>2.11.4</version>
+            <runModes>oak_mongo</runModes>
+       </bundle>
     </startLevel>
 </bundles>

Added: sling/trunk/launchpad/builder/src/main/config/oak_mongo/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/config/oak_mongo/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg?rev=1668674&view=auto
==============================================================================
--- sling/trunk/launchpad/builder/src/main/config/oak_mongo/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg
(added)
+++ sling/trunk/launchpad/builder/src/main/config/oak_mongo/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.cfg
Mon Mar 23 16:12:23 2015
@@ -0,0 +1,2 @@
+mongouri=mongodb://localhost:27017
+db=sling

Copied: sling/trunk/launchpad/builder/src/main/config/oak_tar/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg
(from r1668655, sling/trunk/launchpad/builder/src/main/config/oak/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg)
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/config/oak_tar/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg?p2=sling/trunk/launchpad/builder/src/main/config/oak_tar/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg&p1=sling/trunk/launchpad/builder/src/main/config/oak/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg&r1=1668655&r2=1668674&rev=1668674&view=diff
==============================================================================
    (empty)

Modified: sling/trunk/launchpad/builder/src/main/sling/common.properties
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/sling/common.properties?rev=1668674&r1=1668673&r2=1668674&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/sling/common.properties (original)
+++ sling/trunk/launchpad/builder/src/main/sling/common.properties Mon Mar 23 16:12:23 2015
@@ -3,5 +3,6 @@
 
 # jackrabbit and oak run modes are mutually exclusive,
 # and cannot be changed after the first startup
-sling.run.mode.install.options=jackrabbit,oak
+# the same goes for the oak_tar and oak_mongo runmodes
+sling.run.mode.install.options=jackrabbit,oak|oak_tar,oak_mongo
 



Mime
View raw message