commit 428423158219bf8d27bb38ee03683bc45d0ad6db
author Bertrand Delacretaz <bdelacretaz@apache.org> Tue Dec 29 14:09:08 2015 +0000
committer Bertrand Delacretaz <bdelacretaz@apache.org> Tue Dec 29 14:09:08 2015 +0000
tree 997940d05811eaf601a5cdee4d4c2e492b0e4fd8
parent 3d69efb11cd102cb81d1927920cb25be1b4e5cfb

SLING-4728 - clarify parameter

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1722134 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/sling/crankstart/junit/CrankstartSetup.java

diff --git a/src/main/java/org/apache/sling/crankstart/junit/CrankstartSetup.java b/src/main/java/org/apache/sling/crankstart/junit/CrankstartSetup.java
index 4f80ce9..3123377 100644
--- a/src/main/java/org/apache/sling/crankstart/junit/CrankstartSetup.java
+++ b/src/main/java/org/apache/sling/crankstart/junit/CrankstartSetup.java
@@ -38,15 +38,15 @@
     
     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 @@
     
     @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 @@
         }
         
         final Launcher launcher = new Launcher().withVariableResolver(variablesResolver);
-        for(String path : modelPaths) {
+        for(String path : classpathModelPaths) {
             mergeModelResource(launcher, path);
         }
         launcher.computeEffectiveModel();

src/test/java/org/apache/sling/crankstart/launcher/BasicLauncherIT.java

diff --git a/src/test/java/org/apache/sling/crankstart/launcher/BasicLauncherIT.java b/src/test/java/org/apache/sling/crankstart/launcher/BasicLauncherIT.java
index 691853e..e81ccf9 100644
--- a/src/test/java/org/apache/sling/crankstart/launcher/BasicLauncherIT.java
+++ b/src/test/java/org/apache/sling/crankstart/launcher/BasicLauncherIT.java
@@ -29,7 +29,7 @@
 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;

src/test/java/org/apache/sling/crankstart/launcher/RunModeAIT.java

diff --git a/src/test/java/org/apache/sling/crankstart/launcher/RunModeAIT.java b/src/test/java/org/apache/sling/crankstart/launcher/RunModeAIT.java
index 1c741b3..ffbcc84 100644
--- a/src/test/java/org/apache/sling/crankstart/launcher/RunModeAIT.java
+++ b/src/test/java/org/apache/sling/crankstart/launcher/RunModeAIT.java
@@ -20,7 +20,7 @@
 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;

src/test/java/org/apache/sling/crankstart/launcher/RunModeBIT.java

diff --git a/src/test/java/org/apache/sling/crankstart/launcher/RunModeBIT.java b/src/test/java/org/apache/sling/crankstart/launcher/RunModeBIT.java
index f36e09f..b930a2c 100644
--- a/src/test/java/org/apache/sling/crankstart/launcher/RunModeBIT.java
+++ b/src/test/java/org/apache/sling/crankstart/launcher/RunModeBIT.java
@@ -20,7 +20,7 @@
 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;