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/10/04 13:17:06 UTC
svn commit: r1811068 - in
/sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests:
pom.xml
src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
src/test/resources/
Author: olli
Date: Wed Oct 4 13:17:05 2017
New Revision: 1811068
URL: http://svn.apache.org/viewvc?rev=1811068&view=rev
Log:
SLING-7177 Switch to RepositoryInitializer factory configurations
use RepositoryInitializer factory configurations
Removed:
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/resources/
Modified:
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml
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/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml?rev=1811068&r1=1811067&r2=1811068&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml Wed Oct 4 13:17:05 2017
@@ -38,7 +38,6 @@
<properties>
<org.apache.karaf.version>4.1.2</org.apache.karaf.version>
<org.ops4j.pax.exam.version>4.11.0</org.ops4j.pax.exam.version>
- <repoinit.filename>${project.basedir}/src/test/resources/repoinit.txt</repoinit.filename>
</properties>
<scm>
@@ -236,7 +235,6 @@
<configuration>
<configClass>org.apache.sling.karaf.tests.configuration.SlingLaunchpadOakTarConfiguration</configClass>
<propagatedProperties>
- repoinit.filename,
http.port
</propagatedProperties>
</configuration>
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=1811068&r1=1811067&r2=1811068&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 Wed Oct 4 13:17:05 2017
@@ -18,47 +18,22 @@
*/
package org.apache.sling.karaf.tests.configuration;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
import org.apache.sling.karaf.testing.KarafTestSupport;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.OptionUtils;
-import org.ops4j.pax.tinybundles.core.TinyBundles;
-import org.osgi.framework.Constants;
import static org.ops4j.pax.exam.CoreOptions.cleanCaches;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.streamBundle;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
public class SlingLaunchpadOakTarConfiguration extends KarafTestSupport {
- private Option testBundle() throws Exception {
- final String filename = System.getProperty("repoinit.filename");
- final InputStream repoinit = new FileInputStream(filename);
- return streamBundle(
- TinyBundles.bundle()
- .add("repoinit.txt", repoinit)
- .set(Constants.BUNDLE_MANIFESTVERSION, "2")
- .set(Constants.BUNDLE_SYMBOLICNAME, "repoinit")
- .build()
- ).start();
- }
-
@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/sling.txt",
- "raw:classpath://org.apache.sling.karaf-repoinit/sling-discovery.txt",
- "raw:classpath://org.apache.sling.karaf-repoinit/sling-event.txt",
- "raw:classpath://org.apache.sling.karaf-repoinit/sling-i18n.txt",
- "raw:classpath://org.apache.sling.karaf-repoinit/sling-installer-jcr.txt",
- "raw:classpath://org.apache.sling.karaf-repoinit/sling-scripting.txt",
- "raw:classpath://org.apache.sling.karaf-repoinit/sling-xss.txt",
- "raw:classpath://repoinit/repoinit.txt"
+ final String[] scripts = new String[]{
+ "create path /repoinit/provisioningModelTest\ncreate service user provisioningModelUser"
};
return OptionUtils.combine(baseConfiguration(),
cleanCaches(true),
@@ -70,7 +45,7 @@ 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.jcr.repoinit.impl.RepositoryInitializer.config", "references", references),
+ editConfigurationFilePut("etc/org.apache.sling.jcr.repoinit.RepositoryInitializer-test.config", "scripts", scripts),
editConfigurationFilePut("etc/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.config", "whitelist.bypass", true),
addSlingFeatures(
"sling-launchpad-oak-tar",
@@ -84,8 +59,6 @@ public class SlingLaunchpadOakTarConfigu
"sling-installer-provider-jcr",
"sling-jcr-jackrabbit-security"
),
- // bundle for test (contains repoinit.txt)
- testBundle(),
// legacy
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.json").versionAsInProject(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.compat").versionAsInProject(),