svn commit: r1753814 - in /sling/trunk/testing/org.apache.sling.testing.paxexam/src/main: java/org/apache/sling/testing/paxexam/SlingOptions.java resources/templates/SlingOptions.txt

[olli]

Author: olli
Date: Fri Jul 22 17:19:36 2016
New Revision: 1753814

URL: http://svn.apache.org/viewvc?rev=1753814&view=rev
Log:
SLING-5893 Provide a default Launchpad Oak Tar configuration as Option for Pax 
Exam

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=1753814&r1=1753813&r2=1753814&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
 Fri Jul 22 17:19:36 2016
@@ -781,4 +781,22 @@ public class SlingOptions {
         );
     }
 
+    public static Option slingLaunchpadOakTarConfiguration(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(
+            newConfiguration("org.apache.felix.http")
+                .put("org.osgi.service.http.port", httpPort)
+                .asOption(),
+            
newConfiguration("org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService")
+                .put("repository.home", repositoryHome)
+                .put("name", "Default NodeStore")
+                .asOption(),
+            
newConfiguration("org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService")
+                .put("localIndexDir", localIndexDir)
+                .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=1753814&r1=1753813&r2=1753814&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
 Fri Jul 22 17:19:36 2016
@@ -85,4 +85,22 @@ public class SlingOptions {
         );
     }
 
-[/]}
+[/]    public static Option slingLaunchpadOakTarConfiguration(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(
+            newConfiguration("org.apache.felix.http")
+                .put("org.osgi.service.http.port", httpPort)
+                .asOption(),
+            
newConfiguration("org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService")
+                .put("repository.home", repositoryHome)
+                .put("name", "Default NodeStore")
+                .asOption(),
+            
newConfiguration("org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService")
+                .put("localIndexDir", localIndexDir)
+                .asOption()
+        );
+    }
+
+}