removed unused configuration unpackWaitTime

sijpesteijn · Apr 26, 2015 · 7fec9c3 · 7fec9c3
1 parent 76733e0
commit 7fec9c3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -75,11 +75,6 @@ Configuration:
         <td></td>
         <td>Classpath entries for the jvm.</td>
     </tr>
-    <tr>
-        <td>unpackWaitTime</td>
-        <td>3000 milliseconds</td>
-        <td>Time to wait after unpacking a fitnesse.</td>
-    </tr>
     <tr>
         <td>fitNesseAuthenticateStart</td>
         <td>no auth</td>
@@ -109,7 +104,6 @@ Configuration example with defaults and example values:
 			&lt;wikiRoot&gt;${basedir}&lt;/wikiRoot&gt;
 			&lt;nameRootPage&gt;FitNesseRoot&lt;/nameRootPage&gt;
 			&lt;retainDays&gt;14&lt;/retainDays&gt;
-			&lt;unpackWaitTime&gt;3000&lt;/unpackWaitTime&gt;
 			&lt;jvmArguments&gt;
 				&lt;jvmArgument&gt;CM_SYSTEM=fitnesse.wiki.cmSystems.GitCmSystem&lt;/jvmArgument&gt;
 			&lt;/jvmArguments&gt;

diff --git a/src/main/java/nl/sijpesteijn/testing/fitnesse/plugins/AbstractFitNesseMojo.java b/src/main/java/nl/sijpesteijn/testing/fitnesse/plugins/AbstractFitNesseMojo.java
@@ -85,13 +85,6 @@ public abstract class AbstractFitNesseMojo extends AbstractMojo {
     @Parameter(property = "logDirectory", defaultValue = "${basedir}/log/")
     private String logDirectory;
 
-    /**
-     * The time to wait after a fitnesse has been started.
-     */
-    @Parameter(property = "unpackWaitTime", defaultValue = "3000")
-    private long unpackWaitTime;
-
-
     /**
      * fitNesse user:password or file
      */
@@ -164,7 +157,7 @@ protected final FitNesseCommanderConfig getCommanderConfig(final List<Dependency
             final String classpathString = createClasspathString(jvmDependencies, jarLocator.getFitNesseJarPath());
 
             return new FitNesseCommanderConfig(port, wikiRoot, nameRootPage, logDirectory, retainDays,
-                    classpathString, jvmArguments, unpackWaitTime, getLog(),
+                    classpathString, jvmArguments, getLog(),
                     fitNesseAuthenticateStart, fitNesseAuthenticateStop, fitNesseUpdatePrevents, fitNesseVerbose);
         } catch (MafiaException e) {
             throw new MojoFailureException("Could not get command configuration.", e);

diff --git a/src/main/java/nl/sijpesteijn/testing/fitnesse/plugins/runner/FitNesseCommanderConfig.java b/src/main/java/nl/sijpesteijn/testing/fitnesse/plugins/runner/FitNesseCommanderConfig.java
@@ -49,12 +49,6 @@ public class FitNesseCommanderConfig {
      */
     private final String nameRootPage;
 
-    /**
-     * Time to wait after unpacking a new fitnesse.
-     */
-    private final long unpackWaitTime;
-
-
     /**
      * fitNesse authentication in start -a username:password
      *                         or filename
@@ -103,7 +97,7 @@ public class FitNesseCommanderConfig {
     public FitNesseCommanderConfig(final int fitNessePort, final String wikiRoot, final String nameRootPage,
                                    final String fitNesseLogDirectory, final int retainDays,
                                    final String classpathString,
-                                   final List<String> jvmArguments, final long unpackWaitTime, final Log log, 
+                                   final List<String> jvmArguments, final Log log, 
                                    final String fitNesseAuthenticateStart,
                                    final String fitNesseAuthenticateStop,
                                    final Boolean fitNesseUpdatePrevents,
@@ -115,7 +109,6 @@ public FitNesseCommanderConfig(final int fitNessePort, final String wikiRoot, fi
         this.retainDays = retainDays;
         this.classpathString = classpathString;
         this.jvmArguments = jvmArguments;
-        this.unpackWaitTime = unpackWaitTime;
         this.log = log;
         this.fitNesseAuthenticateStart = fitNesseAuthenticateStart;
         this.fitNesseAuthenticateStop = fitNesseAuthenticateStop;
@@ -196,10 +189,6 @@ public final String getClasspathString() {
         return classpathString;
     }
 
-    public long getUnpackWaitTime() {
-        return unpackWaitTime;
-    }
-
     /**
      * Get the start authenticate String / File
      * @return

diff --git a/src/test/java/nl/sijpesteijn/testing/fitnesse/plugins/AbstractFitNesseTest.java b/src/test/java/nl/sijpesteijn/testing/fitnesse/plugins/AbstractFitNesseTest.java
@@ -25,6 +25,6 @@ public class AbstractFitNesseTest {
 
     public static FitNesseCommanderConfig getFitnesseCommanderConfig() {
         return new FitNesseCommanderConfig(PORT, WIKI_ROOT, NAME_ROOT_PAGE, LOG_DIRECTORY,0,
-                FITNESSE_JAR_PATH, jvmArguments, 3000 ,mockLog, null, null, null, null);
+                FITNESSE_JAR_PATH, jvmArguments ,mockLog, null, null, null, null);
     }
 }
diff --git a/src/test/java/nl/sijpesteijn/testing/fitnesse/plugins/runner/FitNesseCommanderTest.java b/src/test/java/nl/sijpesteijn/testing/fitnesse/plugins/runner/FitNesseCommanderTest.java
@@ -43,7 +43,7 @@ public void startNoJvmArguments() throws Throwable {
 
             FitNesseCommanderConfig config = new FitNesseCommanderConfig(PORT, WIKI_ROOT, NAME_ROOT_PAGE,
                     LOG_DIRECTORY, 0, FITNESSE_JAR_PATH,
-                    null, 3000, mockLog, null, null, null, null);
+                    null, mockLog, null, null, null, null);
             commander = new FitNesseCommander(config);
             commander.start();
             assertFalse(commander.hasError());
@@ -60,7 +60,7 @@ public void startNoJvmArguments() throws Throwable {
     public void failureWikiRoot() throws Exception {
         FitNesseCommanderConfig config = new FitNesseCommanderConfig(PORT, "$&#&^&$", NAME_ROOT_PAGE,
                 null, 0, FITNESSE_JAR_PATH,
-                null, 3000, mockLog, null, null, null, null);
+                null, mockLog, null, null, null, null);
         commander = new FitNesseCommander(config);
         commander.start();
     }