Author: olli Date: Tue Jul 14 09:37:35 2015 New Revision: 1690884 URL: http://svn.apache.org/r1690884 Log: SLING-3821 run launchpad integration tests against Sling on Karaf
* add features sling-scripting-javascript and sling-scripting-jsp to SlingLaunchpadConfiguration * add bundles org.apache.sling.jcr.jackrabbit.accessmanager and org.apache.sling.jcr.jackrabbit.usermanager to SlingLaunchpadOakTarConfiguration * style Modified: 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-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadJackrabbitDerbyConfiguration.java sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java 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=1690884&r1=1690883&r2=1690884&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 Tue Jul 14 09:37:35 2015 @@ -30,7 +30,16 @@ 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)), - addSlingFeatures("sling-launchpad-content", "sling-auth-form", "sling-auth-openid", "sling-auth-selector", "sling-scripting-groovy", "sling-installer-provider-jcr"), + addSlingFeatures( + "sling-launchpad-content", + "sling-auth-form", + "sling-auth-openid", + "sling-auth-selector", + "sling-scripting-groovy", + "sling-scripting-javascript", + "sling-scripting-jsp", + "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-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadJackrabbitDerbyConfiguration.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadJackrabbitDerbyConfiguration.java?rev=1690884&r1=1690883&r2=1690884&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadJackrabbitDerbyConfiguration.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadJackrabbitDerbyConfiguration.java Tue Jul 14 09:37:35 2015 @@ -31,7 +31,10 @@ public class SlingLaunchpadJackrabbitDer public Option[] configuration() { return OptionUtils.combine(launchpadConfiguration(), editConfigurationFilePut("etc/custom.properties", "sling.run.modes", "jackrabbit"), - addSlingFeatures("sling-jcr-jackrabbit-security", "sling-launchpad-jackrabbit-derby"), + addSlingFeatures( + "sling-jcr-jackrabbit-security", + "sling-launchpad-jackrabbit-derby" + ), // configurations for tests editConfigurationFilePut("etc/integrationTestsConfig.cfg", "message", "This test config should be loaded at startup"), editConfigurationFilePut("etc/org.apache.sling.servlets.resolver.SlingServletResolver.cfg", "servletresolver.cacheSize", "0") Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java?rev=1690884&r1=1690883&r2=1690884&view=diff ============================================================================== --- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java (original) +++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java Tue Jul 14 09:37:35 2015 @@ -23,6 +23,7 @@ import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.OptionUtils; +import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; public class SlingLaunchpadOakTarConfiguration extends SlingLaunchpadConfiguration { @@ -31,7 +32,11 @@ public class SlingLaunchpadOakTarConfigu public Option[] configuration() { return OptionUtils.combine(launchpadConfiguration(), editConfigurationFilePut("etc/custom.properties", "sling.run.modes", "oak,oak_tar"), - addSlingFeatures("sling-launchpad-oak-tar"), + addSlingFeatures( + "sling-launchpad-oak-tar" + ), + mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.jackrabbit.accessmanager").version("2.1.2"), + mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.jackrabbit.usermanager").version("2.2.2"), // configurations for tests editConfigurationFilePut("etc/integrationTestsConfig.cfg", "message", "This test config should be loaded at startup"), editConfigurationFilePut("etc/org.apache.sling.servlets.resolver.SlingServletResolver.cfg", "servletresolver.cacheSize", "0")