packaging

svn changeset:2899/svn branch:trunk

diff --git a/src/com/itmill/toolkit/launcher/ITMillToolkitDesktopMode.java b/src/com/itmill/toolkit/launcher/ITMillToolkitDesktopMode.java
index ae14121ebe9772ba1a4ef9d1b8a4b293cd3025f1..6bc8b50b18f66121a0ab2a195b26ac82fce499b3 100644 (file)
--- a/src/com/itmill/toolkit/launcher/ITMillToolkitDesktopMode.java
+++ b/src/com/itmill/toolkit/launcher/ITMillToolkitDesktopMode.java
@@ -55,7 +55,7 @@ public class ITMillToolkitDesktopMode {
         }
 
         // Start the Winstone servlet container
-        String url = ITMillToolkitWebMode.runServer(serverArgs);
+        String url = ITMillToolkitWebMode.runServer(serverArgs, "Desktop Mode");
 
         // Open browser into application URL
         if (url != null) {

diff --git a/src/com/itmill/toolkit/launcher/ITMillToolkitHostedMode.java b/src/com/itmill/toolkit/launcher/ITMillToolkitHostedMode.java
deleted file mode 100644 (file)
index 3972616..0000000
--- a/src/com/itmill/toolkit/launcher/ITMillToolkitHostedMode.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.itmill.toolkit.launcher;\r
-\r
-import java.util.HashMap;\r
-import java.util.Map;\r
-\r
-import org.mortbay.jetty.Connector;\r
-import org.mortbay.jetty.Server;\r
-import org.mortbay.jetty.nio.SelectChannelConnector;\r
-import org.mortbay.jetty.webapp.WebAppContext;\r
-\r
-import com.google.gwt.dev.GWTShell;\r
-\r
-/**\r
- * Class for running Jetty servlet container within Eclipse project.\r
- * \r
- */\r
-public class ITMillToolkitHostedMode {\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
-        // Start Jetty\r
-        System.out.println("Starting Jetty servlet container.");\r
-        String url = runServer(new HashMap());\r
-\r
-        // Start GWT\r
-        System.out.println("Starting GWT Hosted Mode browser.");\r
-        GWTShell.main(args);\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) {\r
-\r
-        // Add help for System.out\r
-        System.out\r
-                .println("-------------------------------------------------\n"\r
-                        + "Starting IT Mill Toolkit in GWT Hosted Mode.\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
-            long started = System.currentTimeMillis();\r
-\r
-            Server server = new Server();\r
-\r
-            // String threadPoolName =\r
-            // System.getProperty("jetty.threadpool.name",\r
-            // "Jetty thread");\r
-            // int maxIdleTimeMs = Integer.getInteger(\r
-            // "jetty.threadpool.maxIdleTimeMs", 60000);\r
-            // int maxThreads =\r
-            // Integer.getInteger("jetty.threadpool.maxThreads",\r
-            // 100);\r
-            // int minThreads =\r
-            // Integer.getInteger("jetty.threadpool.minThreads",\r
-            // 1);\r
-            // int lowThreads = Integer.getInteger(\r
-            // "jetty.threadpool.maxIdleTimeMs", 25);\r
-            // BoundedThreadPool threadPool = new BoundedThreadPool();\r
-            // threadPool.setName(threadPoolName);\r
-            // threadPool.setMaxIdleTimeMs(maxIdleTimeMs);\r
-            // threadPool.setMaxThreads(maxThreads);\r
-            // threadPool.setMinThreads(minThreads);\r
-            // threadPool.setLowThreads(lowThreads);\r
-            // server.setThreadPool(threadPool);\r
-\r
-            Connector connector = new SelectChannelConnector();\r
-            // FIXME httpPort hardcoded to 8888\r
-            // connector.setPort(Integer.valueOf(serverArgs.get("httpPort")\r
-            // .toString()));\r
-            connector.setPort(8888);\r
-            server.setConnectors(new Connector[] { connector });\r
-\r
-            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 (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
-        Map map = new HashMap();\r
-        for (int i = 0; i < args.length; i++) {\r
-            int d = args[i].indexOf("=");\r
-            if (d > 0 && d < args[i].length() && args[i].startsWith("--")) {\r
-                String name = args[i].substring(2, d);\r
-                String value = args[i].substring(d + 1);\r
-                map.put(name, value);\r
-            }\r
-        }\r
-        return map;\r
-    }\r
-\r
-}\r

diff --git a/src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java b/src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java
index b177a341033ab7c95937c9e6279e0a7d2cfae1c1..206174b3d5c273b15105670df154d86b40c44b76 100644 (file)
--- a/src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java
+++ b/src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java
@@ -33,7 +33,7 @@ public class ITMillToolkitWebMode {
 \r
         // Start Jetty\r
         System.out.println("Starting Jetty servlet container.");\r
-        String url = runServer(serverArgs);\r
+        String url = runServer(serverArgs, "Web Mode");\r
 \r
         // Start Browser\r
         System.out.println("Starting Web Browser.");\r
@@ -49,12 +49,14 @@ public class ITMillToolkitWebMode {
      * @param serverArgs\r
      * @return\r
      */\r
-    protected static String runServer(Map serverArgs) {\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 Web Mode.\n"\r
+                        + "Starting IT Mill Toolkit in "\r
+                        + mode\r
+                        + ".\n"\r
                         + "Running in http://localhost:"\r
                         + serverPort\r
                         + "\n-------------------------------------------------\n");\r