svn commit: r1539371 - in /sling/whiteboard/bdelacretaz/sling-pax-util/src: main/java/org/apache/sling/paxexam/util/ test/java/org/apache/sling/paxexam/util/

[bdelacretaz]

Author: bdelacretaz
Date: Wed Nov  6 15:43:16 2013
New Revision: 1539371

URL: http://svn.apache.org/r1539371
Log:
Use specific launchpad version

Modified:
    
sling/whiteboard/bdelacretaz/sling-pax-util/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
    
sling/whiteboard/bdelacretaz/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
    
sling/whiteboard/bdelacretaz/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java

Modified: 
sling/whiteboard/bdelacretaz/sling-pax-util/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/sling-pax-util/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java?rev=1539371&r1=1539370&r2=1539371&view=diff
==============================================================================
--- 
sling/whiteboard/bdelacretaz/sling-pax-util/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
 (original)
+++ 
sling/whiteboard/bdelacretaz/sling-pax-util/src/main/java/org/apache/sling/paxexam/util/SlingPaxOptions.java
 Wed Nov  6 15:43:16 2013
@@ -73,7 +73,8 @@ public class SlingPaxOptions {
         return Arrays.asList(runModes.split(","));
     }
     
-    public static CompositeOption defaultLaunchpadOptions() {
+    /** @param launchpadVersion null means use the latest */
+    public static CompositeOption defaultLaunchpadOptions(String 
launchpadVersion) {
         final String paxLogLevel = System.getProperty("pax.exam.log.level", 
"INFO");
         
         final int slingStartLevel = DEFAULT_SLING_START_LEVEL;
@@ -88,7 +89,7 @@ public class SlingPaxOptions {
                 systemProperty( 
"org.ops4j.pax.logging.DefaultServiceLog.level" ).value(paxLogLevel),
                 SlingPaxOptions.felixRemoteShellBundles(),
                 SlingPaxOptions.slingBootstrapBundles(),
-                SlingPaxOptions.slingLaunchpadBundles(null),
+                SlingPaxOptions.slingLaunchpadBundles(launchpadVersion),
                 CoreOptions.frameworkStartLevel(slingStartLevel),
                 
CoreOptions.frameworkProperty(PROP_TELNET_PORT).value(telnetPort),
                 CoreOptions.frameworkProperty(PROP_HTTP_PORT).value(httpPort)

Modified: 
sling/whiteboard/bdelacretaz/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java?rev=1539371&r1=1539370&r2=1539371&view=diff
==============================================================================
--- 
sling/whiteboard/bdelacretaz/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
 (original)
+++ 
sling/whiteboard/bdelacretaz/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
 Wed Nov  6 15:43:16 2013
@@ -42,7 +42,7 @@ public class SlingRepositoryTest {
     
     @org.ops4j.pax.exam.Configuration
     public Option[] config() {
-        return SlingPaxOptions.defaultLaunchpadOptions().getOptions();
+        return 
SlingPaxOptions.defaultLaunchpadOptions("7-SNAPSHOT").getOptions();
     }
 
     @Test

Modified: 
sling/whiteboard/bdelacretaz/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java?rev=1539371&r1=1539370&r2=1539371&view=diff
==============================================================================
--- 
sling/whiteboard/bdelacretaz/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
 (original)
+++ 
sling/whiteboard/bdelacretaz/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
 Wed Nov  6 15:43:16 2013
@@ -45,7 +45,7 @@ public class SlingSetupTest {
     
     @org.ops4j.pax.exam.Configuration
     public Option[] config() {
-        return SlingPaxOptions.defaultLaunchpadOptions().getOptions();
+        return 
SlingPaxOptions.defaultLaunchpadOptions("7-SNAPSHOT").getOptions();
     }
 
     private void assertBundleActive(String symbolicName) {