#2645 Rename launcher classes and Eclipse launches

svn changeset:7874/svn branch:6.0

2 files changed, 10 insertions, 10 deletions

diff --git a/src/com/vaadin/launcher/ITMillToolkitDesktopMode.java b/src/com/vaadin/launcher/DemoLauncher.java
index 4feabeae71..d52df1f8ae 100644
--- a/src/com/vaadin/launcher/ITMillToolkitDesktopMode.java
+++ b/src/com/vaadin/launcher/DemoLauncher.java
@@ -32,11 +32,11 @@ import com.vaadin.launcher.util.BrowserLauncher;
  * This class starts servlet container and opens a simple control dialog.
  * 
  */
-public class ITMillToolkitDesktopMode {
+public class DemoLauncher {
 
     public static void main(String[] args) {
 
-        final Map serverArgs = ITMillToolkitWebMode.parseArguments(args);
+        final Map serverArgs = DevelopmentServerLauncher.parseArguments(args);
         boolean deployed = false;
         try {
             // Default deployment: embedded.war
@@ -53,18 +53,18 @@ public class ITMillToolkitDesktopMode {
                 // Using WebContent directory as webroot
                 serverArgs.put("webroot", "WebContent");
             } else {
-                System.err.print("Failed to deploy Toolkit application. "
+                System.err.print("Failed to deploy Vaadin application. "
                         + "Please add --webroot parameter. Exiting.");
                 return;
             }
         }
 
         // Start the Winstone servlet container
-        final String url = ITMillToolkitWebMode.runServer(serverArgs,
-                "Desktop Mode");
+        final String url = DevelopmentServerLauncher.runServer(serverArgs,
+                "Demo Server");
 
         if (!serverArgs.containsKey("nogui") && url != null) {
-			
+
             // Open browser into application URL
             BrowserLauncher.openBrowser(url);
 
@@ -178,7 +178,7 @@ public class ITMillToolkitDesktopMode {
      */
     protected static boolean deployEmbeddedWarfile(Map args) throws IOException {
         final String embeddedWarfileName = "/embedded.war";
-        final InputStream embeddedWarfile = ITMillToolkitDesktopMode.class
+        final InputStream embeddedWarfile = DemoLauncher.class
                 .getResourceAsStream(embeddedWarfileName);
         if (embeddedWarfile != null) {
             final File tempWarfile = File.createTempFile("embedded", ".war")
diff --git a/src/com/vaadin/launcher/ITMillToolkitWebMode.java b/src/com/vaadin/launcher/DevelopmentServerLauncher.java
index d7931deb96..1ba7e69da0 100644
--- a/src/com/vaadin/launcher/ITMillToolkitWebMode.java
+++ b/src/com/vaadin/launcher/DevelopmentServerLauncher.java
@@ -18,7 +18,7 @@ import com.vaadin.launcher.util.BrowserLauncher;
  * Class for running Jetty servlet container within Eclipse project.

  * 

  */

-public class ITMillToolkitWebMode {

+public class DevelopmentServerLauncher {

 

     private final static String serverPort = "8888";

 

@@ -37,7 +37,7 @@ public class ITMillToolkitWebMode {
 

         // Start Jetty

         System.out.println("Starting Jetty servlet container.");

-        final String url = runServer(serverArgs, "Web Mode");

+        final String url = runServer(serverArgs, "Development Server Mode");

 

         // Start Browser

         System.out.println("Starting Web Browser.");

@@ -58,7 +58,7 @@ public class ITMillToolkitWebMode {
         // Add help for System.out

         System.out

                 .println("-------------------------------------------------\n"

-                        + "Starting IT Mill Toolkit in "

+                        + "Starting Vaadin in "

                         + mode

                         + ".\n"

                         + "Running in http://localhost:"