You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2015/05/28 10:07:42 UTC
svn commit: r1682165 - in /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/
org.apache.sling.launchpad.karaf-launchpad...
Author: olli
Date: Thu May 28 08:07:42 2015
New Revision: 1682165
URL: http://svn.apache.org/r1682165
Log:
SLING-3821 run launchpad integration tests against Sling on Karaf
* add configurations to fix LaunchpadConfigInstallerTest and ServletResolverConfigTest (also AnonymousAccessTest, AuthRequestLoginTest, RedirectOnLogoutTest)
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
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-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=1682165&r1=1682164&r2=1682165&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 Thu May 28 08:07:42 2015
@@ -32,7 +32,10 @@ public class SlingLaunchpadJackrabbitDer
return OptionUtils.combine(launchpadConfiguration(),
editConfigurationFilePut("etc/custom.properties", "sling.run.modes", "jackrabbit"),
addBootFeature("sling-jcr-jackrabbit-security"),
- addBootFeature("sling-launchpad-jackrabbit-derby")
+ addBootFeature("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=1682165&r1=1682164&r2=1682165&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 Thu May 28 08:07:42 2015
@@ -31,7 +31,10 @@ public class SlingLaunchpadOakTarConfigu
public Option[] configuration() {
return OptionUtils.combine(launchpadConfiguration(),
editConfigurationFilePut("etc/custom.properties", "sling.run.modes", "oak,oak_tar"),
- addBootFeature("sling-launchpad-oak-tar")
+ addBootFeature("sling-launchpad-oak-tar"),
+ // 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")
);
}