Fix: Web Browser is not opened automatically when launching ITMillToolkitWebMode

svn changeset:4271/svn branch:trunk

diff --git a/src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java b/src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java
index cc74ce87b53736d82b05619c9f89568da19700f8..96727c41f37e790209188eaf2133967e41e904ab 100644 (file)
--- a/src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java
+++ b/src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java
@@ -12,116 +12,118 @@ import org.mortbay.jetty.Server;
 import org.mortbay.jetty.nio.SelectChannelConnector;\r
 import org.mortbay.jetty.webapp.WebAppContext;\r
 \r
+import com.itmill.toolkit.launcher.util.BrowserLauncher;\r
+\r
 /**\r
  * Class for running Jetty servlet container within Eclipse project.\r
  * \r
  */\r
 public class ITMillToolkitWebMode {\r
 \r
-    private final static String serverPort = "8888";\r
-\r
-    /**\r
-     * Main function for running Jetty.\r
-     * \r
-     * Command line Arguments are passed through to Jetty, see runServer method\r
-     * for options.\r
-     * \r
-     * @param args\r
-     */\r
-    public static void main(String[] args) {\r
-\r
-        // Pass-through of arguments for Jetty\r
-        final Map serverArgs = parseArguments(args);\r
-\r
-        // Start Jetty\r
-        System.out.println("Starting Jetty servlet container.");\r
-        final String url = runServer(serverArgs, "Web Mode");\r
-\r
-        // Start Browser\r
-        System.out.println("Starting Web Browser.");\r
-        if (url != null) {\r
-            // BrowserLauncher.openBrowser(url);\r
-        }\r
-\r
-    }\r
-\r
-    /**\r
-     * Run the server with specified arguments.\r
-     * \r
-     * @param serverArgs\r
-     * @return\r
-     */\r
-    protected static String runServer(Map serverArgs, String mode) {\r
-\r
-        // Add help for System.out\r
-        System.out\r
-                .println("-------------------------------------------------\n"\r
-                        + "Starting IT Mill Toolkit in "\r
-                        + mode\r
-                        + ".\n"\r
-                        + "Running in http://localhost:"\r
-                        + serverPort\r
-                        + "\n-------------------------------------------------\n");\r
-\r
-        // Assign default values for some arguments\r
-        assignDefault(serverArgs, "webroot", "WebContent");\r
-        assignDefault(serverArgs, "httpPort", serverPort);\r
-\r
-        try {\r
-            final Server server = new Server();\r
-\r
-            final Connector connector = new SelectChannelConnector();\r
-\r
-            connector.setPort(8888);\r
-            server.setConnectors(new Connector[] { connector });\r
-\r
-            final WebAppContext webappcontext = new WebAppContext();\r
-            webappcontext.setContextPath("");\r
-            webappcontext.setWar(serverArgs.get("webroot").toString());\r
-\r
-            server.setHandler(webappcontext);\r
-\r
-            server.start();\r
-        } catch (final Exception e) {\r
-            e.printStackTrace();\r
-            return null;\r
-        }\r
-\r
-        return "http://localhost:" + serverArgs.get("httpPort");\r
-    }\r
-\r
-    /**\r
-     * Assign default value for given key.\r
-     * \r
-     * @param map\r
-     * @param key\r
-     * @param value\r
-     */\r
-    private static void assignDefault(Map map, String key, String value) {\r
-        if (!map.containsKey(key)) {\r
-            map.put(key, value);\r
-        }\r
-    }\r
-\r
-    /**\r
-     * Parse all command line arguments into a map.\r
-     * \r
-     * Arguments format "key=value" are put into map.\r
-     * \r
-     * @param args\r
-     * @return map of arguments key value pairs.\r
-     */\r
-    protected static Map parseArguments(String[] args) {\r
-        final Map map = new HashMap();\r
-        for (int i = 0; i < args.length; i++) {\r
-            final int d = args[i].indexOf("=");\r
-            if (d > 0 && d < args[i].length() && args[i].startsWith("--")) {\r
-                final String name = args[i].substring(2, d);\r
-                final String value = args[i].substring(d + 1);\r
-                map.put(name, value);\r
-            }\r
-        }\r
-        return map;\r
-    }\r
+       private final static String serverPort = "8888";\r
+\r
+       /**\r
+        * Main function for running Jetty.\r
+        * \r
+        * Command line Arguments are passed through to Jetty, see runServer method\r
+        * for options.\r
+        * \r
+        * @param args\r
+        */\r
+       public static void main(String[] args) {\r
+\r
+               // Pass-through of arguments for Jetty\r
+               final Map serverArgs = parseArguments(args);\r
+\r
+               // Start Jetty\r
+               System.out.println("Starting Jetty servlet container.");\r
+               final String url = runServer(serverArgs, "Web Mode");\r
+\r
+               // Start Browser\r
+               System.out.println("Starting Web Browser.");\r
+               if (url != null) {\r
+                       BrowserLauncher.openBrowser(url);\r
+               }\r
+\r
+       }\r
+\r
+       /**\r
+        * Run the server with specified arguments.\r
+        * \r
+        * @param serverArgs\r
+        * @return\r
+        */\r
+       protected static String runServer(Map serverArgs, String mode) {\r
+\r
+               // Add help for System.out\r
+               System.out\r
+                               .println("-------------------------------------------------\n"\r
+                                               + "Starting IT Mill Toolkit in "\r
+                                               + mode\r
+                                               + ".\n"\r
+                                               + "Running in http://localhost:"\r
+                                               + serverPort\r
+                                               + "\n-------------------------------------------------\n");\r
+\r
+               // Assign default values for some arguments\r
+               assignDefault(serverArgs, "webroot", "WebContent");\r
+               assignDefault(serverArgs, "httpPort", serverPort);\r
+\r
+               try {\r
+                       final Server server = new Server();\r
+\r
+                       final Connector connector = new SelectChannelConnector();\r
+\r
+                       connector.setPort(8888);\r
+                       server.setConnectors(new Connector[] { connector });\r
+\r
+                       final WebAppContext webappcontext = new WebAppContext();\r
+                       webappcontext.setContextPath("");\r
+                       webappcontext.setWar(serverArgs.get("webroot").toString());\r
+\r
+                       server.setHandler(webappcontext);\r
+\r
+                       server.start();\r
+               } catch (final Exception e) {\r
+                       e.printStackTrace();\r
+                       return null;\r
+               }\r
+\r
+               return "http://localhost:" + serverArgs.get("httpPort");\r
+       }\r
+\r
+       /**\r
+        * Assign default value for given key.\r
+        * \r
+        * @param map\r
+        * @param key\r
+        * @param value\r
+        */\r
+       private static void assignDefault(Map map, String key, String value) {\r
+               if (!map.containsKey(key)) {\r
+                       map.put(key, value);\r
+               }\r
+       }\r
+\r
+       /**\r
+        * Parse all command line arguments into a map.\r
+        * \r
+        * Arguments format "key=value" are put into map.\r
+        * \r
+        * @param args\r
+        * @return map of arguments key value pairs.\r
+        */\r
+       protected static Map parseArguments(String[] args) {\r
+               final Map map = new HashMap();\r
+               for (int i = 0; i < args.length; i++) {\r
+                       final int d = args[i].indexOf("=");\r
+                       if (d > 0 && d < args[i].length() && args[i].startsWith("--")) {\r
+                               final String name = args[i].substring(2, d);\r
+                               final String value = args[i].substring(d + 1);\r
+                               map.put(name, value);\r
+                       }\r
+               }\r
+               return map;\r
+       }\r
 \r
 }\r