From: Henri Sara Date: Tue, 19 May 2009 09:44:29 +0000 (+0000) Subject: #2904 A few more Toolkit -> Vaadin renames (also in the build branch) and a related... X-Git-Tag: 6.7.0.beta1~2836 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=055d2732b6a91041a40656409fca460e8f7a21e7;p=vaadin-framework.git #2904 A few more Toolkit -> Vaadin renames (also in the build branch) and a related fix to Eclipse classpath svn changeset:7878/svn branch:6.0 --- diff --git a/build/package/build-widgetset.xml b/build/package/build-widgetset.xml index 18e5c0ff48..55962ae263 100644 --- a/build/package/build-widgetset.xml +++ b/build/package/build-widgetset.xml @@ -6,10 +6,10 @@ Client-side code is compiled by using GWTCompiler which compiles client-side Jav JavaScript. Generated files are located under WebContent/VAADIN/widgetsets/*. Client-side compilation is required if you create new or modify existing widgets. -You may use either this script or IT Mill Toolkit Hosted Mode.launch (in Eclipse) +You may use either this script or Vaadin Hosted Mode Browser.launch (in Eclipse) to compile your client-side java code. -By default IT Mill Toolkit first tries to serve widgetset resources from the file system, if that +By default Vaadin first tries to serve widgetset resources from the file system, if that fails then files are streamed from vaadin-.jar. See configure target to adjust this buildfile. @@ -27,7 +27,7 @@ See configure target to adjust this buildfile. --> - + @@ -36,7 +36,7 @@ See configure target to adjust this buildfile. - + diff --git a/build/package/build.xml b/build/package/build.xml index 9eae7bc533..b7ece66174 100644 --- a/build/package/build.xml +++ b/build/package/build.xml @@ -23,9 +23,9 @@ Creates two packages: - + - + @@ -41,7 +41,7 @@ Creates two packages: - + @@ -52,7 +52,7 @@ Creates two packages: - + @@ -67,7 +67,7 @@ Creates two packages: - + diff --git a/build/package/eclipse-classpath b/build/package/eclipse-classpath index d5a181374d..c61a6ea718 100644 --- a/build/package/eclipse-classpath +++ b/build/package/eclipse-classpath @@ -2,7 +2,7 @@ - + diff --git a/build/package/linux-readme.txt b/build/package/linux-readme.txt index cb886ff0a6..7ac0f10f15 100644 --- a/build/package/linux-readme.txt +++ b/build/package/linux-readme.txt @@ -1,5 +1,5 @@ ============================================================================== -IT Mill Toolkit Readme +Vaadin Readme ============================================================================== ------------- @@ -8,42 +8,42 @@ How to Start? Open a shell window, change to the installation directory, and execute "sh start.sh". It will start a web application at port 8888 on the local host and opens a web browser window -to display the start page of IT Mill Toolkit Content Browser. +to display the start page of Vaadin Content Browser. The installation directory is a web application as itself and is directly importable to Eclipse IDE by selecting "File / Import / Existing Projects into Workspace" from Eclipse main menu. See the manual for detailed instructions. ------------------------------------------- -What's Inside the IT Mill Toolkit Package? ------------------------------------------- +--------------------------------- +What's Inside the Vaadin Package? +--------------------------------- -You should start exploring IT Mill Toolkit through the provided Content Browser web +You should start exploring Vaadin through the provided Content Browser web application within this package; see 'How to Start?' above. The WebContent directory contains the content available through the Content Browser: the -IT Mill Toolkit Library, demos, documentation, and other useful information to get started -with IT Mill Toolkit. +Vaadin Library, demos, documentation, and other useful information to get started +with Vaadin. Below is a list of most important locations and files: -Start IT Mill Toolkit -- start exploring IT Mill Toolkit by double-clicking this icon +Start Vaadin +- start exploring Vaadin by double-clicking this icon COPYING - license file WebContent/vaadin-.jar -- IT Mill Toolkit Library containing Java source and compiled files +- Vaadin Library containing Java source and compiled files WebContent/doc/manual.pdf -- IT Mill Toolkit Reference Manual in PDF format +- Vaadin Reference Manual in PDF format WebContent/doc/manual/index.html -- IT Mill Toolkit Reference Manual in HTML format +- Vaadin Reference Manual in HTML format WebContent/doc/api/index.html -- IT Mill Toolkit API Documentation as JavaDoc reference +- Vaadin API Documentation as JavaDoc reference WebContent/WEB-INF/src - Content Browser source code, compiled into WebContent/WEB-INF/classes @@ -59,7 +59,7 @@ Vaadin Development Server.launch - launch configurations for Eclipse workspace WebContent/doc/example-source/build-widgetset.xml -- example on how to build GWT widget sets for IT Mill Toolkit application +- example on how to build GWT widget sets for Vaadin application WebContent/VAADIN - widget sets and themes diff --git a/build/package/mac-readme.txt b/build/package/mac-readme.txt index 06d1ab76ab..674eaa42f1 100644 --- a/build/package/mac-readme.txt +++ b/build/package/mac-readme.txt @@ -1,5 +1,5 @@ ============================================================================== -IT Mill Toolkit Readme +Vaadin Readme ============================================================================== ------------- @@ -8,43 +8,42 @@ How to Start? Start Terminal.app and run the start.sh script in the installation directory. It will start a web application at port 8888 on the local host and opens a web -browser window to display the start page of IT Mill Toolkit Content -Browser. +browser window to display the start page of Vaadin Content Browser. The installation directory is a web application as itself and is directly importable to Eclipse IDE by selecting "File / Import / Existing Projects into Workspace" from Eclipse main menu. See the manual for detailed instructions. ------------------------------------------- -What's Inside the IT Mill Toolkit Package? ------------------------------------------- +--------------------------------- +What's Inside the Vaadin Package? +--------------------------------- -You should start exploring IT Mill Toolkit through the provided Content Browser web +You should start exploring Vaadin through the provided Content Browser web application within this package; see 'How to Start?' above. The WebContent directory contains the content available through the Content Browser: the -IT Mill Toolkit Library, demos, documentation, and other useful information to get started -with IT Mill Toolkit. +Vaadin Library, demos, documentation, and other useful information to get started +with Vaadin. Below is a list of most important locations and files: -Start IT Mill Toolkit -- start exploring IT Mill Toolkit by double-clicking this icon +Start Vaadin +- start exploring Vaadin by double-clicking this icon COPYING - license file WebContent/vaadin-.jar -- IT Mill Toolkit Library containing Java source and compiled files +- Vaadin Library containing Java source and compiled files WebContent/doc/manual.pdf -- IT Mill Toolkit Reference Manual in PDF format +- Vaadin Reference Manual in PDF format WebContent/doc/manual/index.html -- IT Mill Toolkit Reference Manual in HTML format +- Vaadin Reference Manual in HTML format WebContent/doc/api/index.html -- IT Mill Toolkit API Documentation as JavaDoc reference +- Vaadin API Documentation as JavaDoc reference WebContent/WEB-INF/src - Content Browser source code, compiled into WebContent/WEB-INF/classes @@ -60,7 +59,7 @@ Vaadin Development Server.launch - launch configurations for Eclipse workspace WebContent/doc/example-source/build-widgetset.xml -- example on how to build GWT widget sets for IT Mill Toolkit application +- example on how to build GWT widget sets for Vaadin application WebContent/VAADIN - widget sets and themes diff --git a/build/package/oophm-readme.txt b/build/package/oophm-readme.txt index 6a2e2c3843..c19bd8f51d 100644 --- a/build/package/oophm-readme.txt +++ b/build/package/oophm-readme.txt @@ -1,15 +1,15 @@ ============================================================================== -IT Mill Toolkit Readme +Vaadin Readme ============================================================================== -This is an experimental version of IT Mill Toolkit built using +This is an experimental version of Vaadin built using out of process hosted mode (OOPHM) branch of Google Web Toolkit. It uses different version of GWT libraries and compiler than the official , so please use with caution. The benefits are that after you install browser plugins from gwt/plugins, you should be able to enable hosted mode within real browsers by adding ?gwt.hosted=127.0.0.1:9997 parameter to the application url you are using. -Please post any comments and questions about OOPHM version to IT Mill Toolkit forums. +Please post any comments and questions about OOPHM version to Vaadin forums. ------------- How to Start? @@ -17,42 +17,42 @@ How to Start? Open a shell window, change to the installation directory, and execute "sh start.sh". It will start a web application at port 8888 on the local host and opens a web browser window -to display the start page of IT Mill Toolkit Content Browser. +to display the start page of Vaadin Content Browser. The installation directory is a web application as itself and is directly importable to Eclipse IDE by selecting "File / Import / Existing Projects into Workspace" from Eclipse main menu. See the manual for detailed instructions. ------------------------------------------- -What's Inside the IT Mill Toolkit Package? ------------------------------------------- +--------------------------------- +What's Inside the Vaadin Package? +--------------------------------- -You should start exploring IT Mill Toolkit through the provided Content Browser web +You should start exploring Vaadin through the provided Content Browser web application within this package; see 'How to Start?' above. The WebContent directory contains the content available through the Content Browser: the -IT Mill Toolkit Library, demos, documentation, and other useful information to get started -with IT Mill Toolkit. +Vaadin Library, demos, documentation, and other useful information to get started +with Vaadin. Below is a list of most important locations and files: -Start IT Mill Toolkit -- start exploring IT Mill Toolkit by double-clicking this icon +Start Vaadin +- start exploring Vaadin by double-clicking this icon COPYING - license file WebContent/vaadin-.jar -- IT Mill Toolkit Library containing Java source and compiled files +- Vaadin Library containing Java source and compiled files WebContent/doc/manual.pdf -- IT Mill Toolkit Reference Manual in PDF format +- Vaadin Reference Manual in PDF format WebContent/doc/manual/index.html -- IT Mill Toolkit Reference Manual in HTML format +- Vaadin Reference Manual in HTML format WebContent/doc/api/index.html -- IT Mill Toolkit API Documentation as JavaDoc reference +- Vaadin API Documentation as JavaDoc reference WebContent/WEB-INF/src - Content Browser source code, compiled into WebContent/WEB-INF/classes @@ -68,7 +68,7 @@ Vaadin Development Server.launch - launch configurations for Eclipse workspace WebContent/doc/example-source/build-widgetset.xml -- example on how to build GWT widget sets for IT Mill Toolkit application +- example on how to build GWT widget sets for Vaadin application WebContent/VAADIN - widget sets and themes diff --git a/build/package/windows-readme.txt b/build/package/windows-readme.txt index f6dded8b5a..299b766240 100644 --- a/build/package/windows-readme.txt +++ b/build/package/windows-readme.txt @@ -1,5 +1,5 @@ ============================================================================== -IT Mill Toolkit Readme +Vaadin Readme ============================================================================== ------------- @@ -7,43 +7,43 @@ How to Start? ------------- Just double-click start.bat icon. It will start a web application at port 8888 on the -local host and opens a web browser window to display the start page of IT Mill Toolkit -Content Browser. +local host and opens a web browser window to display the start page of Vaadin Content +Browser. The installation directory is a web application as itself and is directly importable to Eclipse IDE by selecting "File / Import / Existing Projects into Workspace" from Eclipse main menu. See the manual for detailed instructions. ------------------------------------------- -What's Inside the IT Mill Toolkit Package? ------------------------------------------- +--------------------------------- +What's Inside the Vaadin Package? +--------------------------------- -You should start exploring IT Mill Toolkit through the provided Content Browser web +You should start exploring Vaadin through the provided Content Browser web application within this package; see 'How to Start?' above. The WebContent directory contains the content available through the Content Browser: the -IT Mill Toolkit Library, demos, documentation, and other useful information to get started -with IT Mill Toolkit. +Vaadin Library, demos, documentation, and other useful information to get started +with Vaadin. Below is a list of most important locations and files: -Start IT Mill Toolkit -- start exploring IT Mill Toolkit by double-clicking this icon +Start Vaadin +- start exploring Vaadin by double-clicking this icon COPYING - license file WebContent/vaadin-.jar -- IT Mill Toolkit Library containing Java source and compiled files +- Vaadin Library containing Java source and compiled files WebContent/doc/manual.pdf -- IT Mill Toolkit Reference Manual in PDF format +- Vaadin Reference Manual in PDF format WebContent/doc/manual/index.html -- IT Mill Toolkit Reference Manual in HTML format +- Vaadin Reference Manual in HTML format WebContent/doc/api/index.html -- IT Mill Toolkit API Documentation as JavaDoc reference +- Vaadin API Documentation as JavaDoc reference WebContent/WEB-INF/src - Content Browser source code, compiled into WebContent/WEB-INF/classes @@ -59,7 +59,7 @@ Vaadin Development Server.launch - launch configurations for Eclipse workspace WebContent/doc/example-source/build-widgetset.xml -- example on how to build GWT widget sets for IT Mill Toolkit application +- example on how to build GWT widget sets for Vaadin application WebContent/VAADIN - widget sets and themes diff --git a/src/com/vaadin/launcher/util/BrowserLauncher.java b/src/com/vaadin/launcher/util/BrowserLauncher.java index 7d8d23f028..f55c1bef3e 100644 --- a/src/com/vaadin/launcher/util/BrowserLauncher.java +++ b/src/com/vaadin/launcher/util/BrowserLauncher.java @@ -7,8 +7,8 @@ package com.vaadin.launcher.util; import java.io.IOException; /** - * This class opens default browser for ITMillDesktopLaunch class. Default - * browser is detected by the operating system. + * This class opens default browser for DemoLauncher class. Default browser is + * detected by the operating system. * */ public class BrowserLauncher {