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 bf46c0b377e899b1131946d0e16a53203b2e284b Author: Oliver Lietz <[email protected]> AuthorDate: Thu Sep 1 11:52:22 2016 +0000 SLING-3821 Run launchpad integration tests against Sling on Karaf fix repoinit filename git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1758762 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 6 +++++- .../tests/configuration/SlingLaunchpadOakTarConfiguration.java | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 06028fa..c183b66 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,7 @@ <properties> <org.apache.karaf.version>4.0.5</org.apache.karaf.version> <org.ops4j.pax.exam.version>4.9.1</org.ops4j.pax.exam.version> + <repoinit.filename>${project.basedir}/src/test/resources/repoinit.txt</repoinit.filename> </properties> <dependencies> @@ -228,7 +229,10 @@ <artifactId>exam-maven-plugin</artifactId> <configuration> <configClass>org.apache.sling.karaf.tests.configuration.SlingLaunchpadOakTarConfiguration</configClass> - <propagatedProperties>http.port</propagatedProperties> + <propagatedProperties> + repoinit.filename, + http.port + </propagatedProperties> </configuration> <executions> <execution> 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 c704d24..791688e 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 @@ -36,7 +36,8 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfi public class SlingLaunchpadOakTarConfiguration extends KarafTestSupport { private Option testBundle() throws Exception { - final InputStream repoinit = new FileInputStream("src/test/resources/repoinit.txt"); + final String filename = System.getProperty("repoinit.filename"); + final InputStream repoinit = new FileInputStream(filename); return streamBundle( TinyBundles.bundle() .add("repoinit.txt", repoinit) -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
