Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 730B217450 for ; Mon, 23 Mar 2015 16:12:24 +0000 (UTC) Received: (qmail 68934 invoked by uid 500); 23 Mar 2015 16:12:24 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 68880 invoked by uid 500); 23 Mar 2015 16:12:24 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 68870 invoked by uid 99); 23 Mar 2015 16:12:24 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Mar 2015 16:12:24 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 199E8AC0270 for ; Mon, 23 Mar 2015 16:12:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@sling.apache.org From: rombert@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150323161224.199E8AC0270@hades.apache.org> 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 @@ ${oak.version} oak + + org.mongodb + mongo-java-driver + 2.11.4 + oak_mongo + 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