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 e1d346adaa811c0f5b86d4b86d20ac1f0dd9511e Author: Oliver Lietz <[email protected]> AuthorDate: Fri Oct 28 07:46:56 2016 +0000 enable repoinit and LoginAdminWhitelist (adjust test configuration) git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1766949 13f79535-47bb-0310-9956-ffa450edef68 --- .../configuration/SlingLaunchpadOakTarConfiguration.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 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 791688e..b5769fc 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 @@ -35,6 +35,7 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfi public class SlingLaunchpadOakTarConfiguration extends KarafTestSupport { + // TODO SLING-6136/KARAF-4760 private Option testBundle() throws Exception { final String filename = System.getProperty("repoinit.filename"); final InputStream repoinit = new FileInputStream(filename); @@ -62,7 +63,7 @@ public class SlingLaunchpadOakTarConfiguration extends KarafTestSupport { // TODO PAXWEB-935 editConfigurationFilePut("etc/org.apache.sling.jcr.webdav.impl.servlets.SimpleWebDavServlet.cfg", "dav.root", "/dav"), editConfigurationFilePut("etc/org.apache.sling.jcr.davex.impl.servlets.SlingDavExServlet.cfg", "alias", "/server"), editConfigurationFilePut("etc/org.apache.sling.resourceresolver.impl.observation.OsgiObservationBridge.cfg", "enabled", "true"), - editConfigurationFilePut("etc/org.apache.sling.jcr.repoinit.impl.RepositoryInitializer.cfg", "references", "raw:classpath://repoinit/repoinit.txt"), + // TODO SLING-6136/KARAF-4760 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\"]"), addSlingFeatures( "sling-launchpad-oak-tar", "sling-launchpad-content", @@ -73,19 +74,12 @@ public class SlingLaunchpadOakTarConfiguration extends KarafTestSupport { "sling-scripting-javascript", "sling-scripting-jsp", "sling-installer-provider-jcr", - "sling-jcr-jackrabbit-security", - "sling-jcr-repoinit" + "sling-jcr-jackrabbit-security" ), // bundle for test (contains repoinit.txt) testBundle(), // misc (legacy, snapshots, ...) stuff mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.compat").versionAsInProject(), - // Pax Url TODO: feature? - mavenBundle().groupId("org.ops4j.pax.url").artifactId("pax-url-commons").version("2.4.7"), - mavenBundle().groupId("org.ops4j.pax.url").artifactId("pax-url-classpath").version("2.4.7"), - mavenBundle().groupId("org.ops4j.base").artifactId("ops4j-base-lang").version("1.5.0"), - mavenBundle().groupId("org.ops4j.base").artifactId("ops4j-base-util-property").version("1.5.0"), - mavenBundle().groupId("org.ops4j.pax.swissbox").artifactId("pax-swissbox-property").version("1.8.2"), // test support mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.junit.core").versionAsInProject(), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.junit.remote").versionAsInProject(), -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
