From: Jani Laakso <jani.laakso@itmill.com>
Date: Fri, 23 Nov 2007 08:12:51 +0000 (+0000)
Subject: packaging
X-Git-Tag: 6.7.0.beta1~5511
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2be50e10e0578b0eb1df436528e5a02cbc0ef2f2;p=vaadin-framework.git

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 ae14121ebe..6bc8b50b18 100644
--- 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
index 3972616afa..0000000000
--- a/src/com/itmill/toolkit/launcher/ITMillToolkitHostedMode.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.itmill.toolkit.launcher;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
-
-import com.google.gwt.dev.GWTShell;
-
-/**
- * Class for running Jetty servlet container within Eclipse project.
- * 
- */
-public class ITMillToolkitHostedMode {
-
-    private final static String serverPort = "8888";
-
-    /**
-     * Main function for running Jetty.
-     * 
-     * Command line Arguments are passed through to Jetty, see runServer method
-     * for options.
-     * 
-     * @param args
-     */
-    public static void main(String[] args) {
-
-        // Start Jetty
-        System.out.println("Starting Jetty servlet container.");
-        String url = runServer(new HashMap());
-
-        // Start GWT
-        System.out.println("Starting GWT Hosted Mode browser.");
-        GWTShell.main(args);
-
-    }
-
-    /**
-     * Run the server with specified arguments.
-     * 
-     * @param serverArgs
-     * @return
-     */
-    protected static String runServer(Map serverArgs) {
-
-        // Add help for System.out
-        System.out
-                .println("-------------------------------------------------\n"
-                        + "Starting IT Mill Toolkit in GWT Hosted Mode.\n"
-                        + "Running in  http://localhost:"
-                        + serverPort
-                        + "\n-------------------------------------------------\n");
-
-        // Assign default values for some arguments
-        assignDefault(serverArgs, "webroot", "WebContent");
-        assignDefault(serverArgs, "httpPort", serverPort);
-
-        try {
-            long started = System.currentTimeMillis();
-
-            Server server = new Server();
-
-            // String threadPoolName =
-            // System.getProperty("jetty.threadpool.name",
-            // "Jetty thread");
-            // int maxIdleTimeMs = Integer.getInteger(
-            // "jetty.threadpool.maxIdleTimeMs", 60000);
-            // int maxThreads =
-            // Integer.getInteger("jetty.threadpool.maxThreads",
-            // 100);
-            // int minThreads =
-            // Integer.getInteger("jetty.threadpool.minThreads",
-            // 1);
-            // int lowThreads = Integer.getInteger(
-            // "jetty.threadpool.maxIdleTimeMs", 25);
-            // BoundedThreadPool threadPool = new BoundedThreadPool();
-            // threadPool.setName(threadPoolName);
-            // threadPool.setMaxIdleTimeMs(maxIdleTimeMs);
-            // threadPool.setMaxThreads(maxThreads);
-            // threadPool.setMinThreads(minThreads);
-            // threadPool.setLowThreads(lowThreads);
-            // server.setThreadPool(threadPool);
-
-            Connector connector = new SelectChannelConnector();
-            // FIXME httpPort hardcoded to 8888
-            // connector.setPort(Integer.valueOf(serverArgs.get("httpPort")
-            // .toString()));
-            connector.setPort(8888);
-            server.setConnectors(new Connector[] { connector });
-
-            WebAppContext webappcontext = new WebAppContext();
-            webappcontext.setContextPath("");
-            webappcontext.setWar(serverArgs.get("webroot").toString());
-
-            server.setHandler(webappcontext);
-
-            server.start();
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-
-        return "http://localhost:" + serverArgs.get("httpPort");
-    }
-
-    /**
-     * Assign default value for given key.
-     * 
-     * @param map
-     * @param key
-     * @param value
-     */
-    private static void assignDefault(Map map, String key, String value) {
-        if (!map.containsKey(key)) {
-            map.put(key, value);
-        }
-    }
-
-    /**
-     * Parse all command line arguments into a map.
-     * 
-     * Arguments format "key=value" are put into map.
-     * 
-     * @param args
-     * @return map of arguments key value pairs.
-     */
-    protected static Map parseArguments(String[] args) {
-        Map map = new HashMap();
-        for (int i = 0; i < args.length; i++) {
-            int d = args[i].indexOf("=");
-            if (d > 0 && d < args[i].length() && args[i].startsWith("--")) {
-                String name = args[i].substring(2, d);
-                String value = args[i].substring(d + 1);
-                map.put(name, value);
-            }
-        }
-        return map;
-    }
-
-}
diff --git a/src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java b/src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java
index b177a34103..206174b3d5 100644
--- a/src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java
+++ b/src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java
@@ -33,7 +33,7 @@ public class ITMillToolkitWebMode {
 
         // Start Jetty
         System.out.println("Starting Jetty servlet container.");
-        String url = runServer(serverArgs);
+        String url = runServer(serverArgs, "Web Mode");
 
         // Start Browser
         System.out.println("Starting Web Browser.");
@@ -49,12 +49,14 @@ public class ITMillToolkitWebMode {
      * @param serverArgs
      * @return
      */
-    protected static String runServer(Map serverArgs) {
+    protected static String runServer(Map serverArgs, String mode) {
 
         // Add help for System.out
         System.out
                 .println("-------------------------------------------------\n"
-                        + "Starting IT Mill Toolkit in Web Mode.\n"
+                        + "Starting IT Mill Toolkit in "
+                        + mode
+                        + ".\n"
                         + "Running in http://localhost:"
                         + serverPort
                         + "\n-------------------------------------------------\n");