Author: olli Date: Sun Jul 5 10:16:44 2015 New Revision: 1689230 URL: http://svn.apache.org/r1689230 Log: SLING-3017 use Sling’s Karaf Features from POM
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/SlingLaunchpadConfiguration.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/JackrabbitSlingIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/OakSlingIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthFormIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthOpenidIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthSelectorIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingLoginIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingOauthIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsSchedulerIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsThreadsIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionAdapterIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionBundleresourceIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryImplIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryStandaloneIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDistributionIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionEventIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionExplorerIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionFsresourceIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionHealthcheckIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionI18nIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionJmxProviderIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionModelsIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionQueryIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionResourceInventoryIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionResourcemergerIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionSecurityIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionThreaddumpIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionUrlrewriterIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionValidationIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionXssIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingFragmentsIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingInstallerIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingInstallerProviderFileIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingInstallerProviderJcrIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrCompilerIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrOakIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadContentIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitDerbyIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakMongoIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakTarIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingGroovyIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJavaIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJavascriptIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJspIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingSightlyIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingThymeleafIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingServletsIT.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/TikaSlingIT.java Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml Sun Jul 5 10:16:44 2015 @@ -85,6 +85,14 @@ <version>2.4.2</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.launchpad.karaf-features</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + <scope>test</scope> + </dependency> <!-- bnd --> <dependency> <groupId>biz.aQute.bnd</groupId> Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java Sun Jul 5 10:16:44 2015 @@ -40,6 +40,7 @@ import static org.ops4j.pax.exam.CoreOpt import static org.ops4j.pax.exam.CoreOptions.streamBundle; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFileExtend; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel; @@ -111,8 +112,8 @@ public abstract class KarafTestSupport { return editConfigurationFileExtend("etc/org.apache.karaf.features.cfg", "featuresBoot", "," + feature); } - protected String featureRepositories() { - return "mvn:org.apache.sling/org.apache.sling.launchpad.karaf-features/0.1.1-SNAPSHOT/xml/features"; + protected Option addSlingFeatures(final String... features) { + return features(maven().groupId("org.apache.sling").artifactId("org.apache.sling.launchpad.karaf-features").type("xml").classifier("features").versionAsInProject(), features); } protected Option karafTestSupportBundle() { @@ -140,7 +141,6 @@ public abstract class KarafTestSupport { .unpackDirectory(new File("target/paxexam/" + getClass().getSimpleName())), keepRuntimeFolder(), logLevel(LogLevelOption.LogLevel.INFO), - editConfigurationFileExtend("etc/org.apache.karaf.features.cfg", "featuresRepositories", "," + featureRepositories()), editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", Integer.toString(rmiRegistryPort)), editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiServerPort", Integer.toString(rmiServerPort)), editConfigurationFilePut("etc/org.apache.karaf.shell.cfg", "sshPort", Integer.toString(sshPort)), Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/SlingLaunchpadConfiguration.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/SlingLaunchpadConfiguration.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/SlingLaunchpadConfiguration.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/SlingLaunchpadConfiguration.java Sun Jul 5 10:16:44 2015 @@ -30,12 +30,7 @@ public abstract class SlingLaunchpadConf final int httpPort = 8888; // TODO findFreePort(); return OptionUtils.combine(baseConfiguration(), editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", "org.osgi.service.http.port", Integer.toString(httpPort)), - addBootFeature("sling-launchpad-content"), - addBootFeature("sling-auth-form"), - addBootFeature("sling-auth-openid"), - addBootFeature("sling-auth-selector"), - addBootFeature("sling-scripting-groovy"), - addBootFeature("sling-installer-provider-jcr"), + addSlingFeatures("sling-launchpad-content", "sling-auth-form", "sling-auth-openid", "sling-auth-selector", "sling-scripting-groovy", "sling-installer-provider-jcr"), // misc (legacy, snapshots, ...) stuff mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.compat").version("1.0.3-SNAPSHOT"), // test support Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/JackrabbitSlingIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/JackrabbitSlingIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/JackrabbitSlingIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/JackrabbitSlingIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class JackrabbitSlingIT extends K @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("jackrabbit-sling") + addSlingFeatures("jackrabbit-sling") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/OakSlingIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/OakSlingIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/OakSlingIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/OakSlingIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class OakSlingIT extends KarafTes @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("oak-sling") + addSlingFeatures("oak-sling") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthFormIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthFormIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthFormIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthFormIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingAuthFormIT extends Kar @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-auth-form") + addSlingFeatures("sling-auth-form") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthOpenidIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthOpenidIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthOpenidIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthOpenidIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingAuthOpenidIT extends K @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-auth-openid") + addSlingFeatures("sling-auth-openid") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthSelectorIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthSelectorIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthSelectorIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthSelectorIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingAuthSelectorIT extends @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-auth-selector") + addSlingFeatures("sling-auth-selector") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingLoginIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingLoginIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingLoginIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingLoginIT.java Sun Jul 5 10:16:44 2015 @@ -40,8 +40,7 @@ public class SlingAuthXingLoginIT extend public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), withDerby(), - addBootFeature("sling-jcr-jackrabbit"), - addBootFeature("sling-auth-xing-login") + addSlingFeatures("sling-jcr-jackrabbit", "sling-auth-xing-login") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingOauthIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingOauthIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingOauthIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingOauthIT.java Sun Jul 5 10:16:44 2015 @@ -40,8 +40,7 @@ public class SlingAuthXingOauthIT extend public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), withDerby(), - addBootFeature("sling-jcr-jackrabbit"), - addBootFeature("sling-auth-xing-oauth") + addSlingFeatures("sling-jcr-jackrabbit", "sling-auth-xing-oauth") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsSchedulerIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsSchedulerIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsSchedulerIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsSchedulerIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingCommonsSchedulerIT ext @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-commons-scheduler") + addSlingFeatures("sling-commons-scheduler") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsThreadsIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsThreadsIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsThreadsIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsThreadsIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingCommonsThreadsIT exten @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-commons-threads") + addSlingFeatures("sling-commons-threads") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionAdapterIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionAdapterIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionAdapterIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionAdapterIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionAdapterIT ext @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-adapter") + addSlingFeatures("sling-extension-adapter") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionBundleresourceIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionBundleresourceIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionBundleresourceIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionBundleresourceIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionBundleresourc @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-bundleresource") + addSlingFeatures("sling-extension-bundleresource") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionDiscoveryIT e @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-discovery") + addSlingFeatures("sling-extension-discovery") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryImplIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryImplIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryImplIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryImplIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionDiscoveryImpl @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-discovery-impl") + addSlingFeatures("sling-extension-discovery-impl") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryStandaloneIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryStandaloneIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryStandaloneIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryStandaloneIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionDiscoveryStan @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-discovery-standalone") + addSlingFeatures("sling-extension-discovery-standalone") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDistributionIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDistributionIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDistributionIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDistributionIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionDistributionI @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-distribution") + addSlingFeatures("sling-extension-distribution") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionEventIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionEventIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionEventIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionEventIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionEventIT exten @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-event") + addSlingFeatures("sling-extension-event") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionExplorerIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionExplorerIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionExplorerIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionExplorerIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionExplorerIT ex @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-explorer") + addSlingFeatures("sling-extension-explorer") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionFsresourceIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionFsresourceIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionFsresourceIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionFsresourceIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionFsresourceIT @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-fsresource") + addSlingFeatures("sling-extension-fsresource") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionHealthcheckIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionHealthcheckIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionHealthcheckIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionHealthcheckIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionHealthcheckIT @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-healthcheck") + addSlingFeatures("sling-extension-healthcheck") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionI18nIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionI18nIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionI18nIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionI18nIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionI18nIT extend @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-i18n") + addSlingFeatures("sling-extension-i18n") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionJmxProviderIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionJmxProviderIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionJmxProviderIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionJmxProviderIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionJmxProviderIT @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-jmx-provider") + addSlingFeatures("sling-extension-jmx-provider") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionModelsIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionModelsIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionModelsIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionModelsIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionModelsIT exte @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-models") + addSlingFeatures("sling-extension-models") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionQueryIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionQueryIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionQueryIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionQueryIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionQueryIT exten @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-query") + addSlingFeatures("sling-extension-query") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionResourceInventoryIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionResourceInventoryIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionResourceInventoryIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionResourceInventoryIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionResourceInven @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-resource-inventory") + addSlingFeatures("sling-extension-resource-inventory") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionResourcemergerIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionResourcemergerIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionResourcemergerIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionResourcemergerIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionResourcemerge @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-resourcemerger") + addSlingFeatures("sling-extension-resourcemerger") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionSecurityIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionSecurityIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionSecurityIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionSecurityIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionSecurityIT ex @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-security") + addSlingFeatures("sling-extension-security") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionThreaddumpIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionThreaddumpIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionThreaddumpIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionThreaddumpIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionThreaddumpIT @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-threaddump") + addSlingFeatures("sling-extension-threaddump") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionUrlrewriterIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionUrlrewriterIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionUrlrewriterIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionUrlrewriterIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionUrlrewriterIT @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-urlrewriter") + addSlingFeatures("sling-extension-urlrewriter") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionValidationIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionValidationIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionValidationIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionValidationIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionValidationIT @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-validation") + addSlingFeatures("sling-extension-validation") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionXssIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionXssIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionXssIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionXssIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingExtensionXssIT extends @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-extension-xss") + addSlingFeatures("sling-extension-xss") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingFragmentsIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingFragmentsIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingFragmentsIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingFragmentsIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingFragmentsIT extends Ka @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-fragments") + addSlingFeatures("sling-fragments") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingIT.java Sun Jul 5 10:16:44 2015 @@ -47,7 +47,7 @@ public class SlingIT extends KarafTestSu @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling") + addSlingFeatures("sling") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingInstallerIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingInstallerIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingInstallerIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingInstallerIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingInstallerIT extends Ka @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-installer") + addSlingFeatures("sling-installer") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingInstallerProviderFileIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingInstallerProviderFileIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingInstallerProviderFileIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingInstallerProviderFileIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingInstallerProviderFileI @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-installer-provider-file") + addSlingFeatures("sling-installer-provider-file") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingInstallerProviderJcrIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingInstallerProviderJcrIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingInstallerProviderJcrIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingInstallerProviderJcrIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingInstallerProviderJcrIT @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-installer-provider-jcr") + addSlingFeatures("sling-installer-provider-jcr") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrCompilerIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrCompilerIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrCompilerIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrCompilerIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingJcrCompilerIT extends @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-jcr-compiler") + addSlingFeatures("sling-jcr-compiler") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingJcrIT extends KarafTes @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-jcr") + addSlingFeatures("sling-jcr") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitIT.java Sun Jul 5 10:16:44 2015 @@ -40,7 +40,7 @@ public class SlingJcrJackrabbitIT extend public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), withDerby(), - addBootFeature("sling-jcr-jackrabbit") + addSlingFeatures("sling-jcr-jackrabbit") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java Sun Jul 5 10:16:44 2015 @@ -40,7 +40,7 @@ public class SlingJcrJackrabbitSecurityI public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), withDerby(), - addBootFeature("sling-jcr-jackrabbit-security") + addSlingFeatures("sling-jcr-jackrabbit-security") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrOakIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrOakIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrOakIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrOakIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingJcrOakIT extends Karaf @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-jcr-oak") + addSlingFeatures("sling-jcr-oak") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadContentIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadContentIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadContentIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadContentIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingLaunchpadContentIT ext @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-launchpad-content") + addSlingFeatures("sling-launchpad-content") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitDerbyIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitDerbyIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitDerbyIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitDerbyIT.java Sun Jul 5 10:16:44 2015 @@ -48,7 +48,7 @@ public class SlingLaunchpadJackrabbitDer @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-launchpad-jackrabbit-derby") + addSlingFeatures("sling-launchpad-jackrabbit-derby") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakMongoIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakMongoIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakMongoIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakMongoIT.java Sun Jul 5 10:16:44 2015 @@ -91,7 +91,7 @@ public class SlingLaunchpadOakMongoIT ex wrappedBundle(mavenBundle().groupId("net.java.dev.jna").artifactId("jna-platform").version("4.1.0")), mavenBundle().groupId("org.apache.commons").artifactId("commons-compress").version("1.9"), mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version("3.4"), - addBootFeature("sling-launchpad-oak-mongo") + addSlingFeatures("sling-launchpad-oak-mongo") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakTarIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakTarIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakTarIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakTarIT.java Sun Jul 5 10:16:44 2015 @@ -46,7 +46,7 @@ public class SlingLaunchpadOakTarIT exte @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-launchpad-oak-tar") + addSlingFeatures("sling-launchpad-oak-tar") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingGroovyIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingGroovyIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingGroovyIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingGroovyIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingScriptingGroovyIT exte @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-scripting-groovy") + addSlingFeatures("sling-scripting-groovy") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingScriptingIT extends Ka @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-scripting") + addSlingFeatures("sling-scripting") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJavaIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJavaIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJavaIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJavaIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingScriptingJavaIT extend @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-scripting-java") + addSlingFeatures("sling-scripting-java") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJavascriptIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJavascriptIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJavascriptIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJavascriptIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingScriptingJavascriptIT @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-scripting-javascript") + addSlingFeatures("sling-scripting-javascript") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJspIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJspIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJspIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJspIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingScriptingJspIT extends @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-scripting-jsp") + addSlingFeatures("sling-scripting-jsp") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingSightlyIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingSightlyIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingSightlyIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingSightlyIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingScriptingSightlyIT ext @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-scripting-sightly") + addSlingFeatures("sling-scripting-sightly") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingThymeleafIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingThymeleafIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingThymeleafIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingThymeleafIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingScriptingThymeleafIT e @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-scripting-thymeleaf") + addSlingFeatures("sling-scripting-thymeleaf") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingServletsIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingServletsIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingServletsIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingServletsIT.java Sun Jul 5 10:16:44 2015 @@ -39,7 +39,7 @@ public class SlingServletsIT extends Kar @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("sling-servlets") + addSlingFeatures("sling-servlets") ); } Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/TikaSlingIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/TikaSlingIT.java?rev=1689230&r1=1689229&r2=1689230&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/TikaSlingIT.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/TikaSlingIT.java Sun Jul 5 10:16:44 2015 @@ -40,7 +40,7 @@ public class TikaSlingIT extends KarafTe @Configuration public Option[] configuration() { return OptionUtils.combine(baseConfiguration(), - addBootFeature("tika-sling") + addSlingFeatures("tika-sling") ); }