From bfe4cd3600b26875e6c95abd6e2ab8df5c84b0a2 Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Mon, 10 Nov 2008 12:43:05 +0000 Subject: [PATCH] Launcher contenxt can be changed with --context=/somecontext (for testing in non-root context) svn changeset:5845/svn branch:trunk --- src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java b/src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java index 0d8297504c..bf4eb24f68 100644 --- a/src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java +++ b/src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java @@ -68,6 +68,7 @@ public class ITMillToolkitWebMode { // Assign default values for some arguments assignDefault(serverArgs, "webroot", "WebContent"); assignDefault(serverArgs, "httpPort", serverPort); + assignDefault(serverArgs, "context", ""); try { final Server server = new Server(); @@ -78,7 +79,7 @@ public class ITMillToolkitWebMode { server.setConnectors(new Connector[] { connector }); final WebAppContext webappcontext = new WebAppContext(); - webappcontext.setContextPath(""); + webappcontext.setContextPath(serverArgs.get("context").toString()); webappcontext.setWar(serverArgs.get("webroot").toString()); server.setHandler(webappcontext); @@ -89,7 +90,8 @@ public class ITMillToolkitWebMode { return null; } - return "http://localhost:" + serverArgs.get("httpPort"); + return "http://localhost:" + serverArgs.get("httpPort") + + serverArgs.get("context"); } /** -- 2.39.5