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 2016/07/28 09:20:37 UTC
svn commit: r1754375 - in
/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main:
java/org/apache/sling/testing/paxexam/SlingOptions.java
resources/templates/SlingOptions.txt
Author: olli
Date: Thu Jul 28 09:20:37 2016
New Revision: 1754375
URL: http://svn.apache.org/viewvc?rev=1754375&view=rev
Log:
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
Modified:
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt
Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java?rev=1754375&r1=1754374&r2=1754375&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java Thu Jul 28 09:20:37 2016
@@ -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(),
Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt
URL: http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt?rev=1754375&r1=1754374&r2=1754375&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt Thu Jul 28 09:20:37 2016
@@ -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(),