svn commit: r1722134 - in /sling/trunk/contrib/crankstart/launcher/src: main/java/org/apache/sling/crankstart/junit/ test/java/org/apache/sling/crankstart/launcher/

[bdelacretaz]

Author: bdelacretaz
Date: Tue Dec 29 14:09:08 2015
New Revision: 1722134

URL: http://svn.apache.org/viewvc?rev=1722134&view=rev
Log:
SLING-4728 - clarify parameter

Modified:
    
sling/trunk/contrib/crankstart/launcher/src/main/java/org/apache/sling/crankstart/junit/CrankstartSetup.java
    
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/BasicLauncherIT.java
    
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeAIT.java
    
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeBIT.java

Modified: 
sling/trunk/contrib/crankstart/launcher/src/main/java/org/apache/sling/crankstart/junit/CrankstartSetup.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/crankstart/launcher/src/main/java/org/apache/sling/crankstart/junit/CrankstartSetup.java?rev=1722134&r1=1722133&r2=1722134&view=diff
==============================================================================
--- 
sling/trunk/contrib/crankstart/launcher/src/main/java/org/apache/sling/crankstart/junit/CrankstartSetup.java
 (original)
+++ 
sling/trunk/contrib/crankstart/launcher/src/main/java/org/apache/sling/crankstart/junit/CrankstartSetup.java
 Tue Dec 29 14:09:08 2015
@@ -38,15 +38,15 @@ public class CrankstartSetup extends Ext
     
     private VariableResolver variablesResolver = new 
PropertiesVariableResolver(replacementProps, Launcher.VARIABLE_OVERRIDE_PREFIX);
     
-    private String [] modelPaths;
+    private String [] classpathModelPaths;
     
     @Override
     public String toString() {
         return getClass().getSimpleName() + ", port " + port + ", OSGi storage 
" + storagePath;
     }
     
-    public CrankstartSetup withModels(String ... modelPaths) {
-        this.modelPaths = modelPaths;
+    public CrankstartSetup withModelResources(String ... classpathModelPaths) {
+        this.classpathModelPaths = classpathModelPaths;
         return this;
     }
             
@@ -86,11 +86,8 @@ public class CrankstartSetup extends Ext
     
     @Override
     protected void before() throws Throwable {
-        setup();
-    }
-     
-    public synchronized void setup() throws Exception {
         if(crankstartThread != null) {
+            log.debug("Already running");
             return;
         }
         
@@ -117,7 +114,7 @@ public class CrankstartSetup extends Ext
         }
         
         final Launcher launcher = new 
Launcher().withVariableResolver(variablesResolver);
-        for(String path : modelPaths) {
+        for(String path : classpathModelPaths) {
             mergeModelResource(launcher, path);
         }
         launcher.computeEffectiveModel();

Modified: 
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/BasicLauncherIT.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/BasicLauncherIT.java?rev=1722134&r1=1722133&r2=1722134&view=diff
==============================================================================
--- 
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/BasicLauncherIT.java
 (original)
+++ 
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/BasicLauncherIT.java
 Tue Dec 29 14:09:08 2015
@@ -29,7 +29,7 @@ import org.junit.Test;
 public class BasicLauncherIT {
     
     @ClassRule
-    public static CrankstartSetup C = new 
CrankstartSetup().withModels(U.DEFAULT_MODELS);
+    public static CrankstartSetup C = new 
CrankstartSetup().withModelResources(U.DEFAULT_MODELS);
     
     private DefaultHttpClient client;
     private static WebconsoleClient osgiConsole;

Modified: 
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeAIT.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeAIT.java?rev=1722134&r1=1722133&r2=1722134&view=diff
==============================================================================
--- 
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeAIT.java
 (original)
+++ 
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeAIT.java
 Tue Dec 29 14:09:08 2015
@@ -20,7 +20,7 @@ import org.junit.Test;
 public class RunModeAIT {
     
     @ClassRule
-    public static CrankstartSetup C = new 
CrankstartSetup().withModels(U.DEFAULT_MODELS);
+    public static CrankstartSetup C = new 
CrankstartSetup().withModelResources(U.DEFAULT_MODELS);
     
     private WebconsoleClient osgiConsole;
     private DefaultHttpClient client;

Modified: 
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeBIT.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeBIT.java?rev=1722134&r1=1722133&r2=1722134&view=diff
==============================================================================
--- 
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeBIT.java
 (original)
+++ 
sling/trunk/contrib/crankstart/launcher/src/test/java/org/apache/sling/crankstart/launcher/RunModeBIT.java
 Tue Dec 29 14:09:08 2015
@@ -20,7 +20,7 @@ import org.junit.Test;
 public class RunModeBIT {
     
     @ClassRule
-    public static CrankstartSetup C = new 
CrankstartSetup().withModels(U.DEFAULT_MODELS);
+    public static CrankstartSetup C = new 
CrankstartSetup().withModelResources(U.DEFAULT_MODELS);
     
     private WebconsoleClient osgiConsole;
     private DefaultHttpClient client;