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 2017/01/13 08:11:57 UTC
svn commit: r1778509 - /sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java

Author: olli
Date: Fri Jan 13 08:11:57 2017
New Revision: 1778509

URL: http://svn.apache.org/viewvc?rev=1778509&view=rev
Log:
SLING-3821 Run launchpad integration tests against Sling on Karaf

adjust configurations (PAXEXAM-805)

Modified:
    sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java

Modified: sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java?rev=1778509&r1=1778508&r2=1778509&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java Fri Jan 13 08:11:57 2017
@@ -50,6 +50,10 @@ public class SlingLaunchpadOakTarConfigu
     @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 SlingLaunchpadOakTarConfigu
             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",