Sling patch for rev 1636322 that allows SlingSettingsService to start with launchpad 7

gistfile1.java

ndex: testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
===================================================================
--- testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java	(revision 1636322)
+++ testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java	(working copy)
@@ -16,6 +16,8 @@
  */
 package org.apache.sling.paxexam.util;
 
+import static org.ops4j.pax.exam.CoreOptions.bundle;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
@@ -29,6 +31,7 @@
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.options.DefaultCompositeOption;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 import org.osgi.framework.Bundle;
@@ -48,7 +51,11 @@
     
     @org.ops4j.pax.exam.Configuration
     public Option[] config() {
-        return SlingPaxOptions.defaultLaunchpadOptions(SLING_LAUNCHPAD_VERSION).getOptions();
+        final DefaultCompositeOption opt = new DefaultCompositeOption(
+                SlingPaxOptions.defaultLaunchpadOptions(SLING_LAUNCHPAD_VERSION),
+                bundle("mvn:org.apache.sling/org.apache.sling.launchpad.karaf/0.1.1-SNAPSHOT")
+        );
+        return opt.getOptions();
     }
 
     private void assertBundleActive(String symbolicName) {
@@ -220,7 +227,8 @@
         final String [] services = {
                 "org.apache.sling.engine.SlingRequestProcessor",
                 "org.apache.sling.commons.mime.MimeTypeService",
-                "org.apache.sling.jcr.api.SlingRepository"
+                "org.apache.sling.jcr.api.SlingRepository",
+                "org.apache.sling.settings.SlingSettingsService"
         };
         
         final List<String> missing = new ArrayList<String>();