You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:20:08 UTC
[sling-org-apache-sling-testing-paxexam] 28/48: SLING-5893 Provide
a default Launchpad Oak Tar configuration as Option for Pax Exam
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.testing.paxexam-0.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit 2f179c63a634263399d1cfc6502d42f794de7919
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Jul 28 09:20:37 2016 +0000
SLING-5893 Provide a default Launchpad Oak Tar configuration as Option for Pax Exam
align to Option slingLaunchpadOakTar with parameters for working directory and HTTP port
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1754375 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java | 5 ++++-
src/main/resources/templates/SlingOptions.txt | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
index 07b6bbe..773750f 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -789,11 +789,14 @@ public class SlingOptions {
);
}
- public static Option slingLaunchpadOakTarConfiguration(final String workingDirectory, final int httpPort) {
+ public static Option slingLaunchpadOakTar(final String workingDirectory, final int httpPort) {
final String slingHome = String.format("%s/sling", workingDirectory);
final String repositoryHome = String.format("%s/repository", slingHome);
final String localIndexDir = String.format("%s/index", repositoryHome);
return composite(
+ slingJcrOak(),
+ slingLaunchpadOak(),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment").version(versionResolver),
newConfiguration("org.apache.felix.http")
.put("org.osgi.service.http.port", httpPort)
.asOption(),
diff --git a/src/main/resources/templates/SlingOptions.txt b/src/main/resources/templates/SlingOptions.txt
index 3d87470..8b63c21 100644
--- a/src/main/resources/templates/SlingOptions.txt
+++ b/src/main/resources/templates/SlingOptions.txt
@@ -98,11 +98,14 @@ public class SlingOptions {
);
}
-[/] public static Option slingLaunchpadOakTarConfiguration(final String workingDirectory, final int httpPort) {
+[/] public static Option slingLaunchpadOakTar(final String workingDirectory, final int httpPort) {
final String slingHome = String.format("%s/sling", workingDirectory);
final String repositoryHome = String.format("%s/repository", slingHome);
final String localIndexDir = String.format("%s/index", repositoryHome);
return composite(
+ slingJcrOak(),
+ slingLaunchpadOak(),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment").version(versionResolver),
newConfiguration("org.apache.felix.http")
.put("org.osgi.service.http.port", httpPort)
.asOption(),
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.