You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/10/18 23:27:52 UTC
[sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests]
21/44: SLING-3821 Run launchpad integration tests against Sling on Karaf
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-launchpad-oak-tar-integration-tests.git
commit 852f12a5e0135b20e6c9fc6551b06f4a723121fa
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Jan 13 08:11:57 2017 +0000
SLING-3821 Run launchpad integration tests against Sling on Karaf
adjust configurations (PAXEXAM-805)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1778509 13f79535-47bb-0310-9956-ffa450edef68
---
.../tests/configuration/SlingLaunchpadOakTarConfiguration.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java b/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
index 0e36834..44a4b3c 100644
--- a/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
+++ b/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
@@ -50,6 +50,10 @@ public class SlingLaunchpadOakTarConfiguration extends KarafTestSupport {
@Configuration
public Option[] configuration() throws Exception {
final int httpPort = Integer.getInteger("http.port");
+ final String[] references = new String[]{
+ "raw:classpath://org.apache.sling.karaf-repoinit/repoinit.txt",
+ "raw:classpath://repoinit/repoinit.txt"
+ };
return OptionUtils.combine(baseConfiguration(),
cleanCaches(true),
// configurations for tests
@@ -60,9 +64,9 @@ public class SlingLaunchpadOakTarConfiguration extends KarafTestSupport {
editConfigurationFilePut("etc/org.apache.sling.servlets.resolver.SlingServletResolver.config", "servletresolver.cacheSize", "0"),
editConfigurationFilePut("etc/org.apache.sling.jcr.webdav.impl.servlets.SimpleWebDavServlet.config", "dav.root", "/dav"),
editConfigurationFilePut("etc/org.apache.sling.jcr.davex.impl.servlets.SlingDavExServlet.config", "alias", "/server"),
- editConfigurationFilePut("etc/org.apache.sling.resourceresolver.impl.observation.OsgiObservationBridge.config", "enabled", "true"),
- editConfigurationFilePut("etc/org.apache.sling.jcr.repoinit.impl.RepositoryInitializer.config", "references", "[\"raw:classpath://org.apache.sling.karaf-repoinit/repoinit.txt\", \"raw:classpath://repoinit/repoinit.txt\"]"),
- editConfigurationFilePut("etc/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.config", "whitelist.bypass", "true"),
+ editConfigurationFilePut("etc/org.apache.sling.resourceresolver.impl.observation.OsgiObservationBridge.config", "enabled", true),
+ editConfigurationFilePut("etc/org.apache.sling.jcr.repoinit.impl.RepositoryInitializer.config", "references", references),
+ editConfigurationFilePut("etc/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.config", "whitelist.bypass", true),
addSlingFeatures(
"sling-launchpad-oak-tar",
"sling-launchpad-content",
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.