From 5983a715eb58d75aed0c868da5f75a25f1962361 Mon Sep 17 00:00:00 2001 From: Arjan Molenaar Date: Thu, 19 Sep 2013 12:13:12 +0200 Subject: [PATCH] Move Arguments to fitnesseMain --- src/fitnesse/FitNesseContext.java | 3 ++- src/fitnesse/Shutdown.java | 4 ++-- src/fitnesse/junit/TestHelper.java | 2 +- src/{fitnesse => fitnesseMain}/Arguments.java | 7 ++++--- src/{fitnesse => fitnesseMain}/ArgumentsTest.java | 3 +-- src/fitnesseMain/FitNesseMain.java | 3 +-- src/fitnesseMain/FitNesseMainTest.java | 1 - 7 files changed, 11 insertions(+), 12 deletions(-) rename src/{fitnesse => fitnesseMain}/Arguments.java (95%) rename src/{fitnesse => fitnesseMain}/ArgumentsTest.java (98%) diff --git a/src/fitnesse/FitNesseContext.java b/src/fitnesse/FitNesseContext.java index a78e79d650..64c3ad131b 100644 --- a/src/fitnesse/FitNesseContext.java +++ b/src/fitnesse/FitNesseContext.java @@ -17,6 +17,7 @@ public class FitNesseContext { public final static String recentChangesDateFormat = "kk:mm:ss EEE, MMM dd, yyyy"; public final static String rfcCompliantDateFormat = "EEE, d MMM yyyy HH:mm:ss Z"; public static final String testResultsDirectoryName = "testResults"; + public static final int DEFAULT_PORT = 80; /** @@ -95,7 +96,7 @@ private FitNesseContext(WikiPage root, String rootPath, this.pageTheme = pageTheme != null ? pageTheme : "fitnesse_straight"; this.defaultNewPageContent = defaultNewPageContent != null ? defaultNewPageContent : "!contents -R2 -g -p -f -h"; this.recentChanges = recentChanges; - this.port = port >= 0 ? port : 80; + this.port = port >= 0 ? port : DEFAULT_PORT; this.authenticator = authenticator != null ? authenticator : new PromiscuousAuthenticator(); this.logger = logger; responderFactory = new ResponderFactory(getRootPagePath()); diff --git a/src/fitnesse/Shutdown.java b/src/fitnesse/Shutdown.java index 7a4bc112e5..08a18e16b8 100644 --- a/src/fitnesse/Shutdown.java +++ b/src/fitnesse/Shutdown.java @@ -13,7 +13,7 @@ public class Shutdown { public String hostname = "localhost"; - public int port = Arguments.DEFAULT_PORT; + public int port = FitNesseContext.DEFAULT_PORT; public String username; public String password; private CommandLine commandLine = new CommandLine("[-h hostname] [-p port] [-c username password]"); @@ -79,7 +79,7 @@ public boolean parseArgs(String[] args) { public void usage() { System.err.println("Usage: java fitnesse.Shutdown [-hpc]"); System.err.println("\t-h {localhost}"); - System.err.println("\t-p {" + Arguments.DEFAULT_PORT + "}"); + System.err.println("\t-p {" + FitNesseContext.DEFAULT_PORT + "}"); System.err.println("\t-c Supply user credentials. Use when FitNesse has authentication activated."); System.exit(-1); } diff --git a/src/fitnesse/junit/TestHelper.java b/src/fitnesse/junit/TestHelper.java index 35dc6e0b4b..64d0b488c0 100644 --- a/src/fitnesse/junit/TestHelper.java +++ b/src/fitnesse/junit/TestHelper.java @@ -1,6 +1,6 @@ package fitnesse.junit; -import fitnesse.Arguments; +import fitnesseMain.Arguments; import fitnesse.reporting.JavaFormatter; import fitnesse.testsystems.TestSummary; import fitnesse.testsystems.TestSystemListener; diff --git a/src/fitnesse/Arguments.java b/src/fitnesseMain/Arguments.java similarity index 95% rename from src/fitnesse/Arguments.java rename to src/fitnesseMain/Arguments.java index 7ab16a3fea..882f53de3b 100644 --- a/src/fitnesse/Arguments.java +++ b/src/fitnesseMain/Arguments.java @@ -1,11 +1,12 @@ // Copyright (C) 2003-2009 by Object Mentor, Inc. All rights reserved. // Released under the terms of the CPL Common Public License version 1.0. -package fitnesse; +package fitnesseMain; + +import fitnesse.FitNesseContext; public class Arguments { public static final String DEFAULT_PATH = "."; public static final String DEFAULT_ROOT = "FitNesseRoot"; - public static final int DEFAULT_PORT = 80; public static final int DEFAULT_COMMAND_PORT = 9123; public static final String DEFAULT_CONFIG_FILE = "plugins.properties"; @@ -35,7 +36,7 @@ public int getPort() { } private int getDefaultPort() { - return command == null ? DEFAULT_PORT : DEFAULT_COMMAND_PORT; + return command == null ? FitNesseContext.DEFAULT_PORT : DEFAULT_COMMAND_PORT; } public void setPort(String port) { diff --git a/src/fitnesse/ArgumentsTest.java b/src/fitnesseMain/ArgumentsTest.java similarity index 98% rename from src/fitnesse/ArgumentsTest.java rename to src/fitnesseMain/ArgumentsTest.java index 197276ebec..4a45dae02e 100644 --- a/src/fitnesse/ArgumentsTest.java +++ b/src/fitnesseMain/ArgumentsTest.java @@ -1,10 +1,9 @@ // Copyright (C) 2003-2009 by Object Mentor, Inc. All rights reserved. // Released under the terms of the CPL Common Public License version 1.0. -package fitnesse; +package fitnesseMain; import static org.junit.Assert.*; -import fitnesseMain.FitNesseMain; import org.junit.Test; public class ArgumentsTest { diff --git a/src/fitnesseMain/FitNesseMain.java b/src/fitnesseMain/FitNesseMain.java index 48fd48ca9e..9f3ed68530 100644 --- a/src/fitnesseMain/FitNesseMain.java +++ b/src/fitnesseMain/FitNesseMain.java @@ -1,6 +1,5 @@ package fitnesseMain; -import fitnesse.Arguments; import fitnesse.components.ComponentFactory; import fitnesse.FitNesse; import fitnesse.FitNesseContext; @@ -202,7 +201,7 @@ public static void configureLogging() { } public static Arguments parseCommandLine(String[] args) { CommandLine commandLine = new CommandLine( - "[-p port][-d dir][-r root][-l logDir][-f config][-e days][-o][-i][-a userpass][-c command][-b output]"); + "[-v][-p port][-d dir][-r root][-l logDir][-f config][-e days][-o][-i][-a userpass][-c command][-b output]"); Arguments arguments = null; if (commandLine.parse(args)) { arguments = new Arguments(); diff --git a/src/fitnesseMain/FitNesseMainTest.java b/src/fitnesseMain/FitNesseMainTest.java index ffd2578eb7..f2128fb451 100644 --- a/src/fitnesseMain/FitNesseMainTest.java +++ b/src/fitnesseMain/FitNesseMainTest.java @@ -10,7 +10,6 @@ import java.io.File; import java.io.PrintStream; -import fitnesse.Arguments; import fitnesse.FitNesse; import fitnesse.FitNesseContext; import fitnesse.testutil.FitNesseUtil;