svn commit: r1754619 - in /sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam: SlingOptions.java SlingVersionResolver.java

[olli]

Author: olli
Date: Sat Jul 30 11:48:38 2016
New Revision: 1754619

URL: http://svn.apache.org/viewvc?rev=1754619&view=rev
Log:
update SlingOptions and SlingVersionResolver (repoinit)

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/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java

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=1754619&r1=1754618&r2=1754619&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
 Sat Jul 30 11:48:38 2016
@@ -446,12 +446,18 @@ public class SlingOptions {
             sling(),
             slingServlets(),
             slingInstaller(),
+            slingJcrRepoinit(),
             slingExtensionAdapter(),
             slingExtensionBundleresource(),
             slingExtensionDiscoveryOak(),
             
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.prefs").version(versionResolver),
             
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.webconsole.plugins.memoryusage").version(versionResolver),
             
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.webconsole.plugins.packageadmin").version(versionResolver),
+            
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.karaf-repoinit").version(versionResolver),
+            
newConfiguration("org.apache.sling.jcr.repoinit.impl.RepositoryInitializer")
+                .put("model.section.name", "")
+                .put("text.url", 
"classpath://org.apache.sling.karaf-repoinit/repoinit.txt")
+                .asOption(),
             
newConfiguration("org.apache.sling.resourceresolver.impl.observation.OsgiObservationBridge")
                 .put("resource.change.types", "[\"ADDED\", \"CHANGED\", 
\"REMOVED\"]")
                 .put("resource.paths", "/")
@@ -825,6 +831,7 @@ public class SlingOptions {
         return composite(
             slingJcrOak(),
             slingLaunchpadOak(),
+            paxUrlClasspath(), // for reading repoinit from bundle
             
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment").version(versionResolver),
             newConfiguration("org.apache.felix.http")
                 .put("org.osgi.service.http.port", httpPort)

Modified: 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java?rev=1754619&r1=1754618&r2=1754619&view=diff
==============================================================================
--- 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
 (original)
+++ 
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
 Sat Jul 30 11:48:38 2016
@@ -155,11 +155,12 @@ public class SlingVersionResolver implem
         
versions.put("org.apache.sling:org.apache.sling.jcr.jackrabbit.usermanager", 
"2.2.4");
         versions.put("org.apache.sling:org.apache.sling.jcr.oak.server", 
"1.0.1-SNAPSHOT");
         versions.put("org.apache.sling:org.apache.sling.jcr.registration", 
"1.0.2");
-        versions.put("org.apache.sling:org.apache.sling.jcr.repoinit", 
"1.0.0");
+        versions.put("org.apache.sling:org.apache.sling.jcr.repoinit", 
"1.0.1-SNAPSHOT");
         versions.put("org.apache.sling:org.apache.sling.jcr.resource", 
"2.8.0");
         versions.put("org.apache.sling:org.apache.sling.jcr.webconsole", 
"1.0.2");
         versions.put("org.apache.sling:org.apache.sling.jcr.webdav", "2.3.4");
         versions.put("org.apache.sling:org.apache.sling.jmx.provider", 
"1.0.2");
+        versions.put("org.apache.sling:org.apache.sling.karaf-repoinit", 
"0.1.1-SNAPSHOT");
         versions.put("org.apache.sling:org.apache.sling.launchpad.content", 
"2.0.8");
         versions.put("org.apache.sling:org.apache.sling.models.api", "1.2.2");
         versions.put("org.apache.sling:org.apache.sling.models.impl", "1.2.8");
@@ -169,7 +170,7 @@ public class SlingVersionResolver implem
         
versions.put("org.apache.sling:org.apache.sling.nosql.mongodb-resourceprovider",
 "1.1.0");
         versions.put("org.apache.sling:org.apache.sling.provisioning.model", 
"1.4.4");
         versions.put("org.apache.sling:org.apache.sling.query", "3.0.0");
-        versions.put("org.apache.sling:org.apache.sling.repoinit.parser", 
"1.0.2");
+        versions.put("org.apache.sling:org.apache.sling.repoinit.parser", 
"1.0.3-SNAPSHOT");
         versions.put("org.apache.sling:org.apache.sling.resource.inventory", 
"1.0.4");
         versions.put("org.apache.sling:org.apache.sling.resourcemerger", 
"1.3.0");
         versions.put("org.apache.sling:org.apache.sling.resourceresolver", 
"1.4.16");