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

[cz...@apache.org]

Author: cziegeler
Date: Tue Feb 16 06:51:56 2016
New Revision: 1730635

URL: http://svn.apache.org/viewvc?rev=1730635&view=rev
Log:
SLING-5524 : Remove Oak runmode

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=1730635&r1=1730634&r2=1730635&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/boot.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/boot.txt Tue Feb 16 06:51:56 2016
@@ -25,7 +25,7 @@
 # oak_tar and oak_mongo run modes are mutually exclusive,
 # and cannot be changed after the first startup
 [settings]
-    sling.run.mode.install.options=oak|oak_tar,oak_mongo
+    sling.run.mode.install.options=oak_tar,oak_mongo
 
 [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=1730635&r1=1730634&r2=1730635&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/oak.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/oak.txt Tue Feb 16 06:51:56 2016
@@ -23,10 +23,10 @@
     oak.version=1.3.14
 
 # The segment node store is used via a configuration
-[artifacts startLevel=10 runModes=oak]
+[artifacts startLevel=10]
     org.apache.felix/org.apache.felix.jaas/0.0.4
 
-[artifacts startLevel=15 runModes=oak]
+[artifacts startLevel=15]
     org.apache.jackrabbit/oak-core/${oak.version}
     org.apache.jackrabbit/oak-commons/${oak.version}
     org.apache.jackrabbit/oak-lucene/${oak.version}
@@ -37,10 +37,10 @@
 
 # start the Oak server instance after all components have been configured
 # and started to avoid restarting that component ( see SLING-4556 )
-[artifacts startLevel=16 runModes=oak]
+[artifacts startLevel=16]
     org.apache.sling/org.apache.sling.jcr.oak.server/1.0.1-SNAPSHOT
 
-[configurations runModes=oak]
+[configurations]
   org.apache.felix.jaas.Configuration.factory-GuestLoginModule
     jaas.controlFlag="optional"
     jaas.classname="org.apache.jackrabbit.oak.spi.security.authentication.GuestLoginModule"