Launcher contenxt can be changed with --context=/somecontext (for testing in non...

svn changeset:5845/svn branch:trunk

diff --git a/src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java b/src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java
index 0d8297504cbb2a4d02e6870e1d3f6160e278202b..bf4eb24f685c0ed1e991de546e73d7b6ee48f477 100644 (file)
--- 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\r
         assignDefault(serverArgs, "webroot", "WebContent");\r
         assignDefault(serverArgs, "httpPort", serverPort);\r
+        assignDefault(serverArgs, "context", "");\r
 \r
         try {\r
             final Server server = new Server();\r
@@ -78,7 +79,7 @@ public class ITMillToolkitWebMode {
             server.setConnectors(new Connector[] { connector });\r
 \r
             final WebAppContext webappcontext = new WebAppContext();\r
-            webappcontext.setContextPath("");\r
+            webappcontext.setContextPath(serverArgs.get("context").toString());\r
             webappcontext.setWar(serverArgs.get("webroot").toString());\r
 \r
             server.setHandler(webappcontext);\r
@@ -89,7 +90,8 @@ public class ITMillToolkitWebMode {
             return null;\r
         }\r
 \r
-        return "http://localhost:" + serverArgs.get("httpPort");\r
+        return "http://localhost:" + serverArgs.get("httpPort")\r
+                + serverArgs.get("context");\r
     }\r
 \r
     /**\r