You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2015/10/07 16:33:08 UTC

svn commit: r1707317 - in /sling/trunk/launchpad/builder/src/main/provisioning: boot.txt oak.txt

Author: olli
Date: Wed Oct  7 14:33:08 2015
New Revision: 1707317

URL: http://svn.apache.org/viewvc?rev=1707317&view=rev
Log:
SLING-4871 use component configurations instead of framework properties

* remove repository.home from settings
* add repository.home for org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService
* add localIndexDir for org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService

Modified:
    sling/trunk/launchpad/builder/src/main/provisioning/boot.txt
    sling/trunk/launchpad/builder/src/main/provisioning/oak.txt

Modified: sling/trunk/launchpad/builder/src/main/provisioning/boot.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/boot.txt?rev=1707317&r1=1707316&r2=1707317&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/boot.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/boot.txt Wed Oct  7 14:33:08 2015
@@ -26,7 +26,6 @@
 # and cannot be changed after the first startup
 [settings]
     sling.run.mode.install.options=oak|oak_tar,oak_mongo
-    repository.home=${sling.home}/repository
 
 [artifacts]
     org.slf4j/slf4j-api/1.7.6

Modified: sling/trunk/launchpad/builder/src/main/provisioning/oak.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/oak.txt?rev=1707317&r1=1707316&r2=1707317&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/oak.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/oak.txt Wed Oct  7 14:33:08 2015
@@ -74,9 +74,13 @@
     userPrivilegeNames=["jcr:all"]
     groupPrivilegeNames=["jcr:read"]
 
+  org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService
+    localIndexDir="sling/repository/index"
+
 [configurations runModes=oak_tar]
   org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService
     name="Default\ NodeStore"
+    repository.home="sling/repository"
 
 [configurations runModes=oak_mongo]
   org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService