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

[ro...@apache.org]

Author: rombert
Date: Tue Aug  4 09:00:39 2015
New Revision: 1694016

URL: http://svn.apache.org/r1694016
Log:
Revert "SLING-4556 - NPE in DiscoveryServiceImpl#activate due to"

The changes from r1693392 caused the Launchpad to stop working
in the jackrabbit run mode. Reverting until a fix is found.

Modified:
    sling/trunk/launchpad/builder/src/main/provisioning/boot.txt
    sling/trunk/launchpad/builder/src/main/provisioning/oak.txt
    sling/trunk/launchpad/builder/src/main/provisioning/sling.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=1694016&r1=1694015&r2=1694016&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/boot.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/boot.txt Tue Aug  4 09:00:39 2015
@@ -43,8 +43,7 @@
     org.apache.sling/org.apache.sling.launchpad.installer/1.2.2
     org.apache.sling/org.apache.sling.installer.core/3.6.6
     org.apache.sling/org.apache.sling.installer.provider.file/1.1.0
-    org.apache.sling/org.apache.sling.installer.factory.configuration/1.1.2
     org.apache.felix/org.apache.felix.configadmin/1.8.6
     org.apache.felix/org.apache.felix.eventadmin/1.4.2
     # dependency with javax.inject - required for Sling Models (SLING-4710)
-    org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0
\ No newline at end of file
+    org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0

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=1694016&r1=1694015&r2=1694016&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/oak.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/oak.txt Tue Aug  4 09:00:39 2015
@@ -27,6 +27,7 @@
     org.apache.felix/org.apache.felix.jaas/0.0.2
 
 [artifacts startLevel=15 runModes=oak]
+    org.apache.sling/org.apache.sling.jcr.oak.server/0.0.2-SNAPSHOT
     com.google.guava/guava/15.0
     org.apache.jackrabbit/oak-core/${oak.version}
     org.apache.jackrabbit/oak-commons/${oak.version}
@@ -36,11 +37,6 @@
 [artifacts startLevel=15 runModes=oak_mongo]
     org.mongodb/mongo-java-driver/2.13.0
 
-# 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]
-    org.apache.sling/org.apache.sling.jcr.oak.server/0.0.2-SNAPSHOT
-
 [configurations runModes=oak]
   org.apache.felix.jaas.Configuration.factory-GuestLoginModule
     jaas.controlFlag="optional"

Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1694016&r1=1694015&r2=1694016&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Tue Aug  4 09:00:39 2015
@@ -71,6 +71,7 @@
     org.apache.sling/org.apache.sling.models.impl/1.2.0
     org.apache.felix/org.apache.felix.http.whiteboard/2.3.2
     org.apache.sling/org.apache.sling.installer.console/1.0.0
+    org.apache.sling/org.apache.sling.installer.factory.configuration/1.1.2
     org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.16
 
 [artifacts startLevel=5]