From 668b2145e2613fd819a47553c35ded19ddd6885c Mon Sep 17 00:00:00 2001
From: Marc Englund <marc.englund@itmill.com>
Date: Wed, 13 May 2009 08:28:52 +0000
Subject: [PATCH] Most "itmill-toolkit" changed to "vaadin" for #2904

svn changeset:7774/svn branch:6.0
---
 WebContent/index.html             |  2 +-
 WebContent/multiapp.html          |  4 ++--
 WebContent/release-notes.html     |  2 +-
 build/build.xml                   | 10 +++++-----
 build/package/build-widgetset.xml |  6 +++---
 build/package/build.xml           |  2 +-
 build/package/linux-readme.txt    |  2 +-
 build/package/mac-readme.txt      |  2 +-
 build/package/oophm-readme.txt    |  2 +-
 build/package/windows-readme.txt  |  2 +-
 build/readme.txt                  |  2 +-
 11 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/WebContent/index.html b/WebContent/index.html
index cd5b6dd5df..edd8400e8f 100644
--- a/WebContent/index.html
+++ b/WebContent/index.html
@@ -171,7 +171,7 @@
 				<div class="library">
 					<h5>Library</h5>
 					<p>Contains all you need to start a new Toolkit project (binaries, sources, default 
-					themes and widgetsets). <a href="itmill-toolkit-@version@.jar">Toolkit JAR</a></p>
+					themes and widgetsets). <a href="vaadin-@version@.jar">Toolkit JAR</a></p>
 				</div>
 				
 				<div class="documentation">
diff --git a/WebContent/multiapp.html b/WebContent/multiapp.html
index 3a3a205aa5..8e37550e41 100644
--- a/WebContent/multiapp.html
+++ b/WebContent/multiapp.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="width:100%;height:100%;border:0;margin:0;">
 <head>
-<title>IT Mill Toolkit 5</title>
+<title>Multiple embedded applications</title>
 <script type="text/javascript">
-	var itmill = {
+	var vaadin = {
 		toolkitConfigurations: {
 			'fb' :{
 				appUri:'/FeatureBrowser', 
diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html
index fb6c347314..d7238c07e5 100644
--- a/WebContent/release-notes.html
+++ b/WebContent/release-notes.html
@@ -34,7 +34,7 @@ backward compatible.</p>
 <h2>Package for the experimental GWT Out-of-Process Hosted Mode</h2>
 
 <p>We provide a separate (platform independent) installation package
-(<tt>itmill-toolkit-oophm-<version></version>.tar.gz</tt>) for the
+(<tt>vaadin-oophm-<version></version>.tar.gz</tt>) for the
 experimental Out of Process Hosted Mode (OOPHM) of GWT, which allows
 debugging client-side code in GWT Hosted Mode with a regular web
 browser. Using the OOPHM requires installing a browser plugin (available
diff --git a/build/build.xml b/build/build.xml
index 67fe787574..2a276dc83b 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -12,14 +12,14 @@
 	 * creates four release packages for three three platforms (below)
 	 
 	package-windows
-     * itmill-toolkit-windows-<version>.zip
+     * vaadin-windows-<version>.zip
 	
 	package-linux
-	 * itmill-toolkit-linux-<version>.tar.bz2
+	 * vaadin-linux-<version>.tar.bz2
 	 
 	package-mac
-	 * itmill-toolkit-mac-<version>.tar.gz
-	 * itmill-toolkit-mac-<version>.dmg
+	 * vaadin-mac-<version>.tar.gz
+	 * vaadin-mac-<version>.dmg
 
 	NOTE: This build script requires directories named ${gwt-dir}/(linux|windows|mac) .
 	See build.properties to define path where your gwt installation is located.
@@ -53,7 +53,7 @@
 	<target name="package-oophm" depends="clean-result, package-init, init-oophm, build, docs, internal-package-oophm" description="Create public tar.gz package for OOPHM.">
 	</target>
 
-	<target name="package-jar" depends="clean-result, package-init, init, libs" description="Create itmill-toolkit-x.y.z.jar file.">
+	<target name="package-jar" depends="clean-result, package-init, init, libs" description="Create vaadin-x.y.z.jar file.">
 	</target>
 
 	<target name="package-war" depends="clean-result, package-init, init, build, docs, internal-package-mac, internal-package-war">
diff --git a/build/package/build-widgetset.xml b/build/package/build-widgetset.xml
index 8f64ce735f..18e5c0ff48 100644
--- a/build/package/build-widgetset.xml
+++ b/build/package/build-widgetset.xml
@@ -10,7 +10,7 @@ You may use either this script or IT Mill Toolkit Hosted Mode.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
-fails then files are streamed from itmill-toolkit-<version>.jar. 
+fails then files are streamed from vaadin-<version>.jar. 
 
 See configure target to adjust this buildfile.
 
@@ -21,7 +21,7 @@ See configure target to adjust this buildfile.
 	<!-- 
 		Update based on your project structure, by default this buildfile assumes that you 
 		1. use WebContent under your project's root directory
-		2. WebContent/WEB-INF/lib/itmill-toolkit-<version>.jar exists
+		2. WebContent/WEB-INF/lib/vaadin-<version>.jar exists
 		3. WebContent/WEB-INF/src contains your project source files
 		4. gwt directory contains extracted GWT distribution for your platform (windows, linux or mac)
 	-->
@@ -37,7 +37,7 @@ See configure target to adjust this buildfile.
 		<property name="gwt-location" value="${base}gwt" />
 		
 		<!-- where Toolkit jar is located -->
-		<property name="toolkit-jar-location" value="${base}WebContent/WEB-INF/lib/itmill-toolkit-@version@.jar" />
+		<property name="toolkit-jar-location" value="${base}WebContent/WEB-INF/lib/vaadin-@version@.jar" />
 		
 		<!-- where project client-side widgetset source files are located -->
 		<property name="client-side-src-location" value="${base}WebContent/WEB-INF/src" />
diff --git a/build/package/build.xml b/build/package/build.xml
index 8d72525a9d..9eae7bc533 100644
--- a/build/package/build.xml
+++ b/build/package/build.xml
@@ -7,7 +7,7 @@ Creates two packages:
 2. JAR package which requires JRE only, includes embedded web server.
 
 -->
-<project name="itmill-toolkit-examples" basedir="." default="package">
+<project name="vaadin-examples" basedir="." default="package">
 
 	<target name="init">
 		<echo message="Creating two packages:" />
diff --git a/build/package/linux-readme.txt b/build/package/linux-readme.txt
index ef39576ae1..76cbccd0d5 100644
--- a/build/package/linux-readme.txt
+++ b/build/package/linux-readme.txt
@@ -33,7 +33,7 @@ Start IT Mill Toolkit
 COPYING
 - license file
 
-WebContent/itmill-toolkit-<version></version>.jar
+WebContent/vaadin-<version></version>.jar
 - IT Mill Toolkit Library containing Java source and compiled files
 
 WebContent/doc/manual.pdf
diff --git a/build/package/mac-readme.txt b/build/package/mac-readme.txt
index 32981865ee..062c1dc975 100644
--- a/build/package/mac-readme.txt
+++ b/build/package/mac-readme.txt
@@ -34,7 +34,7 @@ Start IT Mill Toolkit
 COPYING
 - license file
 
-WebContent/itmill-toolkit-<version></version>.jar
+WebContent/vaadin-<version></version>.jar
 - IT Mill Toolkit Library containing Java source and compiled files
 
 WebContent/doc/manual.pdf
diff --git a/build/package/oophm-readme.txt b/build/package/oophm-readme.txt
index a8cdef9a08..97ff2651e0 100644
--- a/build/package/oophm-readme.txt
+++ b/build/package/oophm-readme.txt
@@ -42,7 +42,7 @@ Start IT Mill Toolkit
 COPYING
 - license file
 
-WebContent/itmill-toolkit-<version></version>.jar
+WebContent/vaadin-<version></version>.jar
 - IT Mill Toolkit Library containing Java source and compiled files
 
 WebContent/doc/manual.pdf
diff --git a/build/package/windows-readme.txt b/build/package/windows-readme.txt
index 33f51a3500..c81df58f85 100644
--- a/build/package/windows-readme.txt
+++ b/build/package/windows-readme.txt
@@ -33,7 +33,7 @@ Start IT Mill Toolkit
 COPYING
 - license file
 
-WebContent/itmill-toolkit-<version></version>.jar
+WebContent/vaadin-<version></version>.jar
 - IT Mill Toolkit Library containing Java source and compiled files
 
 WebContent/doc/manual.pdf
diff --git a/build/readme.txt b/build/readme.txt
index 552619ffda..51e01e9bad 100644
--- a/build/readme.txt
+++ b/build/readme.txt
@@ -14,7 +14,7 @@ How to build packages
 
 4. Run ant package-<platform> in build directory
 
-5. Enjoy build/result/itmill-toolkit-<platform>-<version>.tar.gz
+5. Enjoy build/result/vaadin-<platform>-<version>.tar.gz
 
 
 
-- 
2.39.5

