#2645 Rename launcher classes and Eclipse launches

svn changeset:7874/svn branch:6.0

11 files changed, 26 insertions, 26 deletions

diff --git a/build/build.xml b/build/build.xml
index 0876a3801f..c9911da6bd 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -510,8 +510,8 @@
 		<move file="${output-dir}/build-widgetset.xml" tofile="${output-dir}/WebContent/docs/example-source/build-widgetset.xml" />
 		<move file="${output-dir}/eclipse-classpath" tofile="${output-dir}/.classpath" />
 		<move file="${output-dir}/eclipse-project" tofile="${output-dir}/.project" />
-		<move file="${output-dir}/eclipse-Vaadin Hosted Mode-launch" tofile="${output-dir}/Vaadin Hosted Mode.launch" />
-		<move file="${output-dir}/eclipse-Vaadin Web Mode-launch" tofile="${output-dir}/Vaadin Web Mode.launch" />
+		<move file="${output-dir}/eclipse-Vaadin Hosted Mode Browser-launch" tofile="${output-dir}/Vaadin Hosted Mode Browser.launch" />
+		<move file="${output-dir}/eclipse-Vaadin Development Server-launch" tofile="${output-dir}/Vaadin Development Server.launch" />
 		<mkdir dir="${output-dir}/.settings" />
 		<move file="${output-dir}/eclipse-org.eclipse.core.resources.prefs" tofile="${output-dir}/.settings/org.eclipse.core.resources.prefs" />
 		<move file="${output-dir}/eclipse-org.eclipse.jdt.core.prefs" tofile="${output-dir}/.settings/org.eclipse.jdt.core.prefs" />
diff --git a/build/package/eclipse-Vaadin Web Mode-launch b/build/package/eclipse-Vaadin Development Server-launch
index 30439e501f..655cb13c1e 100644
--- a/build/package/eclipse-Vaadin Web Mode-launch
+++ b/build/package/eclipse-Vaadin Development Server-launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/<eclipse-workspace-name></eclipse-workspace-name>/src/com/itmill/toolkit/launcher/ITMillWebModeLaunch.java"/>
+<listEntry value="/<eclipse-workspace-name></eclipse-workspace-name>/src/com/vaadin/launcher/DevelopmentServerLauncher.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -18,6 +18,6 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/itmill-toolkit-examples/WebContent/WEB-INF/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.vaadin.launcher.ITMillToolkitWebMode"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.vaadin.launcher.DevelopmentServerLauncher"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="<eclipse-workspace-name></eclipse-workspace-name>"/>
 </launchConfiguration>
diff --git a/build/package/eclipse-Vaadin Hosted Mode-launch b/build/package/eclipse-Vaadin Hosted Mode Browser-launch
index 7479aeb801..0578393797 100644
--- a/build/package/eclipse-Vaadin Hosted Mode-launch
+++ b/build/package/eclipse-Vaadin Hosted Mode Browser-launch
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<stringAttribute key="bad_container_name" value="/<eclipse-workspace-name></eclipse-workspace-name>/IT Mill Toolkit Hosted Mode.launch"/>
+<stringAttribute key="bad_container_name" value="/<eclipse-workspace-name></eclipse-workspace-name>/Vaadin Hosted Mode.launch"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/<eclipse-workspace-name></eclipse-workspace-name>/gwt/gwt-dev-@platform@.jar"/>
 </listAttribute>
@@ -21,7 +21,7 @@
 </listAttribute>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -out WebContent/ITMILL/widgetsets http://localhost:8888/"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -out WebContent/VAADIN/widgetsets http://localhost:8888/"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="<eclipse-workspace-name></eclipse-workspace-name>"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="<eclipse-launch-vmargs></eclipse-launch-vmargs>"/>
 </launchConfiguration>
diff --git a/build/package/linux-readme.txt b/build/package/linux-readme.txt
index 76cbccd0d5..cb886ff0a6 100644
--- a/build/package/linux-readme.txt
+++ b/build/package/linux-readme.txt
@@ -54,8 +54,8 @@ WebContent/doc/example-source
 WebContent/demo

 - files required by the demos

 

-IT Mill Toolkit Hosted Mode.launch

-IT Mill Toolkit Web Mode.launch

+Vaadin Hosted Mode Browser.launch

+Vaadin Development Server.launch

 - launch configurations for Eclipse workspace

 

 WebContent/doc/example-source/build-widgetset.xml

diff --git a/build/package/mac-readme.txt b/build/package/mac-readme.txt
index 062c1dc975..06d1ab76ab 100644
--- a/build/package/mac-readme.txt
+++ b/build/package/mac-readme.txt
@@ -55,8 +55,8 @@ WebContent/doc/example-source
 WebContent/demo

 - files required by the demos

 

-IT Mill Toolkit Hosted Mode.launch

-IT Mill Toolkit Web Mode.launch

+Vaadin Hosted Mode Browser.launch

+Vaadin Development Server.launch

 - launch configurations for Eclipse workspace

 

 WebContent/doc/example-source/build-widgetset.xml

diff --git a/build/package/oophm-readme.txt b/build/package/oophm-readme.txt
index 97ff2651e0..6a2e2c3843 100644
--- a/build/package/oophm-readme.txt
+++ b/build/package/oophm-readme.txt
@@ -63,8 +63,8 @@ WebContent/doc/example-source
 WebContent/demo
 - files required by the demos
 
-IT Mill Toolkit Hosted Mode.launch
-IT Mill Toolkit Web Mode.launch
+Vaadin Hosted Mode Browser.launch
+Vaadin Development Server.launch
 - launch configurations for Eclipse workspace
 
 WebContent/doc/example-source/build-widgetset.xml
diff --git a/build/package/start.bat b/build/package/start.bat
index 6399843e1d..c967380a87 100644
--- a/build/package/start.bat
+++ b/build/package/start.bat
@@ -1 +1 @@
-@java -cp "WebContent\demo\lib\jetty\jetty-6.1.7.jar;WebContent\demo\lib\jetty\jetty-util-6.1.7.jar;WebContent\demo\lib\jetty\servlet-api-2.5-6.1.7.jar;WebContent\WEB-INF\classes;WebContent\WEB-INF\src" com.vaadin.launcher.ITMillToolkitDesktopMode

+@java -cp "WebContent\demo\lib\jetty\jetty-6.1.7.jar;WebContent\demo\lib\jetty\jetty-util-6.1.7.jar;WebContent\demo\lib\jetty\servlet-api-2.5-6.1.7.jar;WebContent\WEB-INF\classes;WebContent\WEB-INF\src" com.vaadin.launcher.DemoLauncher

diff --git a/build/package/start.sh b/build/package/start.sh
index b7faad9be3..d484b131bd 100644
--- a/build/package/start.sh
+++ b/build/package/start.sh
@@ -4,4 +4,4 @@ if [ "$1" != "" ] ; then
   cd $1
 fi
 
-java -cp WebContent/demo/lib/jetty/jetty-6.1.7.jar:WebContent/demo/lib/jetty/jetty-util-6.1.7.jar:WebContent/demo/lib/jetty/servlet-api-2.5-6.1.7.jar:WebContent/WEB-INF/classes:WebContent/WEB-INF/src com.vaadin.launcher.ITMillToolkitDesktopMode $VAADIN_PARAMETERS
+java -cp WebContent/demo/lib/jetty/jetty-6.1.7.jar:WebContent/demo/lib/jetty/jetty-util-6.1.7.jar:WebContent/demo/lib/jetty/servlet-api-2.5-6.1.7.jar:WebContent/WEB-INF/classes:WebContent/WEB-INF/src com.vaadin.launcher.DemoLauncher $VAADIN_PARAMETERS
diff --git a/build/package/windows-readme.txt b/build/package/windows-readme.txt
index c81df58f85..f6dded8b5a 100644
--- a/build/package/windows-readme.txt
+++ b/build/package/windows-readme.txt
@@ -54,8 +54,8 @@ WebContent/doc/example-source
 WebContent/demo

 - files required by the demos

 

-IT Mill Toolkit Hosted Mode.launch

-IT Mill Toolkit Web Mode.launch

+Vaadin Hosted Mode Browser.launch

+Vaadin Development Server.launch

 - launch configurations for Eclipse workspace

 

 WebContent/doc/example-source/build-widgetset.xml

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:"