sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o...@apache.org
Subject svn commit: r1690900 - /sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/SlingLaunchpadConfiguration.java
Date Tue, 14 Jul 2015 11:18:08 GMT
Author: olli
Date: Tue Jul 14 11:18:08 2015
New Revision: 1690900

URL: http://svn.apache.org/r1690900
Log:
SLING-3821 run launchpad integration tests against Sling on Karaf

* add Sling’s default admin credentials used in tests to Karaf’s users.properties

Modified:
    sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/SlingLaunchpadConfiguration.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=1690900&r1=1690899&r2=1690900&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 11:18:08 2015
@@ -29,6 +29,7 @@ public abstract class SlingLaunchpadConf
     public Option[] launchpadConfiguration() {
         final int httpPort = 8888; // TODO findFreePort();
         return OptionUtils.combine(baseConfiguration(),
+            editConfigurationFilePut("etc/users.properties", "admin", "admin,_g_:admingroup"),
// Sling’s default admin credentials used in tests
             editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", "org.osgi.service.http.port",
Integer.toString(httpPort)),
             addSlingFeatures(
                 "sling-launchpad-content",



Mime
View raw message