27 files changed, 20 insertions, 20 deletions

diff --git a/WebContent/VAADIN/themes/toolkittunes/images/album-cover.jpg b/WebContent/VAADIN/themes/vaadintunes/images/album-cover.jpg
index 677e4f2cb1..677e4f2cb1 100644
--- a/WebContent/VAADIN/themes/toolkittunes/images/album-cover.jpg
+++ b/WebContent/VAADIN/themes/vaadintunes/images/album-cover.jpg
diff --git a/WebContent/VAADIN/themes/toolkittunes/images/coverflow-view.png b/WebContent/VAADIN/themes/vaadintunes/images/coverflow-view.png
index 5e15b84cd3..5e15b84cd3 100644
--- a/WebContent/VAADIN/themes/toolkittunes/images/coverflow-view.png
+++ b/WebContent/VAADIN/themes/vaadintunes/images/coverflow-view.png
diff --git a/WebContent/VAADIN/themes/toolkittunes/images/grid-view.png b/WebContent/VAADIN/themes/vaadintunes/images/grid-view.png
index 21f4205fdc..21f4205fdc 100644
--- a/WebContent/VAADIN/themes/toolkittunes/images/grid-view.png
+++ b/WebContent/VAADIN/themes/vaadintunes/images/grid-view.png
diff --git a/WebContent/VAADIN/themes/toolkittunes/images/icon-music.png b/WebContent/VAADIN/themes/vaadintunes/images/icon-music.png
index 1e97148ecf..1e97148ecf 100644
--- a/WebContent/VAADIN/themes/toolkittunes/images/icon-music.png
+++ b/WebContent/VAADIN/themes/vaadintunes/images/icon-music.png
diff --git a/WebContent/VAADIN/themes/toolkittunes/images/jump-to.png b/WebContent/VAADIN/themes/vaadintunes/images/jump-to.png
index 55d4632245..55d4632245 100644
--- a/WebContent/VAADIN/themes/toolkittunes/images/jump-to.png
+++ b/WebContent/VAADIN/themes/vaadintunes/images/jump-to.png
diff --git a/WebContent/VAADIN/themes/toolkittunes/images/max.png b/WebContent/VAADIN/themes/vaadintunes/images/max.png
index 28e93b8116..28e93b8116 100644
--- a/WebContent/VAADIN/themes/toolkittunes/images/max.png
+++ b/WebContent/VAADIN/themes/vaadintunes/images/max.png
diff --git a/WebContent/VAADIN/themes/toolkittunes/images/mute.png b/WebContent/VAADIN/themes/vaadintunes/images/mute.png
index 9788008cb8..9788008cb8 100644
--- a/WebContent/VAADIN/themes/toolkittunes/images/mute.png
+++ b/WebContent/VAADIN/themes/vaadintunes/images/mute.png
diff --git a/WebContent/VAADIN/themes/toolkittunes/images/next.png b/WebContent/VAADIN/themes/vaadintunes/images/next.png
index 98a5e6cbbe..98a5e6cbbe 100644
--- a/WebContent/VAADIN/themes/toolkittunes/images/next.png
+++ b/WebContent/VAADIN/themes/vaadintunes/images/next.png
diff --git a/WebContent/VAADIN/themes/toolkittunes/images/play.png b/WebContent/VAADIN/themes/vaadintunes/images/play.png
index 66b2160a25..66b2160a25 100644
--- a/WebContent/VAADIN/themes/toolkittunes/images/play.png
+++ b/WebContent/VAADIN/themes/vaadintunes/images/play.png
diff --git a/WebContent/VAADIN/themes/toolkittunes/images/prev.png b/WebContent/VAADIN/themes/vaadintunes/images/prev.png
index 425f4c4e7f..425f4c4e7f 100644
--- a/WebContent/VAADIN/themes/toolkittunes/images/prev.png
+++ b/WebContent/VAADIN/themes/vaadintunes/images/prev.png
diff --git a/WebContent/VAADIN/themes/toolkittunes/images/progress-knob.png b/WebContent/VAADIN/themes/vaadintunes/images/progress-knob.png
index 23934226ea..23934226ea 100644
--- a/WebContent/VAADIN/themes/toolkittunes/images/progress-knob.png
+++ b/WebContent/VAADIN/themes/vaadintunes/images/progress-knob.png
diff --git a/WebContent/VAADIN/themes/toolkittunes/images/selected-bg.png b/WebContent/VAADIN/themes/vaadintunes/images/selected-bg.png
index 8785f279f9..8785f279f9 100644
--- a/WebContent/VAADIN/themes/toolkittunes/images/selected-bg.png
+++ b/WebContent/VAADIN/themes/vaadintunes/images/selected-bg.png
diff --git a/WebContent/VAADIN/themes/toolkittunes/images/status-bg.png b/WebContent/VAADIN/themes/vaadintunes/images/status-bg.png
index 7af0c88380..7af0c88380 100644
--- a/WebContent/VAADIN/themes/toolkittunes/images/status-bg.png
+++ b/WebContent/VAADIN/themes/vaadintunes/images/status-bg.png
diff --git a/WebContent/VAADIN/themes/toolkittunes/images/table-header-bg.png b/WebContent/VAADIN/themes/vaadintunes/images/table-header-bg.png
index 2d43b2fe10..2d43b2fe10 100644
--- a/WebContent/VAADIN/themes/toolkittunes/images/table-header-bg.png
+++ b/WebContent/VAADIN/themes/vaadintunes/images/table-header-bg.png
diff --git a/WebContent/VAADIN/themes/toolkittunes/images/table-view.png b/WebContent/VAADIN/themes/vaadintunes/images/table-view.png
index 083fb581bb..083fb581bb 100644
--- a/WebContent/VAADIN/themes/toolkittunes/images/table-view.png
+++ b/WebContent/VAADIN/themes/vaadintunes/images/table-view.png
diff --git a/WebContent/VAADIN/themes/toolkittunes/images/toggle-visualization.png b/WebContent/VAADIN/themes/vaadintunes/images/toggle-visualization.png
index 41effd5bd2..41effd5bd2 100644
--- a/WebContent/VAADIN/themes/toolkittunes/images/toggle-visualization.png
+++ b/WebContent/VAADIN/themes/vaadintunes/images/toggle-visualization.png
diff --git a/WebContent/VAADIN/themes/toolkittunes/images/top-bg.png b/WebContent/VAADIN/themes/vaadintunes/images/top-bg.png
index 4b01255bd5..4b01255bd5 100644
--- a/WebContent/VAADIN/themes/toolkittunes/images/top-bg.png
+++ b/WebContent/VAADIN/themes/vaadintunes/images/top-bg.png
diff --git a/WebContent/VAADIN/themes/toolkittunes/images/volume-bar.png b/WebContent/VAADIN/themes/vaadintunes/images/volume-bar.png
index eb4365fe9a..eb4365fe9a 100644
--- a/WebContent/VAADIN/themes/toolkittunes/images/volume-bar.png
+++ b/WebContent/VAADIN/themes/vaadintunes/images/volume-bar.png
diff --git a/WebContent/VAADIN/themes/toolkittunes/images/volume-knob.png b/WebContent/VAADIN/themes/vaadintunes/images/volume-knob.png
index 6341060e04..6341060e04 100644
--- a/WebContent/VAADIN/themes/toolkittunes/images/volume-knob.png
+++ b/WebContent/VAADIN/themes/vaadintunes/images/volume-knob.png
diff --git a/WebContent/VAADIN/themes/toolkittunes/styles.css b/WebContent/VAADIN/themes/vaadintunes/styles.css
index b762db49be..1a1a9a378b 100644
--- a/WebContent/VAADIN/themes/toolkittunes/styles.css
+++ b/WebContent/VAADIN/themes/vaadintunes/styles.css
@@ -2,7 +2,7 @@
 
 
 /******************************************************************************
- * For ToolkitTunesLayout.java
+ * For VaadinTunesLayout.java
  ******************************************************************************/
  
 .tTunes, .tTunes select, .tTunes button {
diff --git a/WebContent/WEB-INF/itmill-object.xml b/WebContent/WEB-INF/vaadin-object.xml
index 2c70ae2582..2c70ae2582 100644
--- a/WebContent/WEB-INF/itmill-object.xml
+++ b/WebContent/WEB-INF/vaadin-object.xml
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 087705c646..1737dd9e58 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -183,11 +183,11 @@
 	</servlet>

 

 	<servlet>

-		<servlet-name>ToolkitTunesLayout</servlet-name>

+		<servlet-name>VaadinTunesLayout</servlet-name>

 		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>

 		<init-param>

 			<param-name>application</param-name>

-			<param-value>com.vaadin.demo.ToolkitTunesLayout</param-value>

+			<param-value>com.vaadin.demo.VaadinTunesLayout</param-value>

 		</init-param>

 	</servlet>

 

@@ -409,8 +409,8 @@
 	</servlet-mapping>

 

 	<servlet-mapping>

-		<servlet-name>ToolkitTunesLayout</servlet-name>

-		<url-pattern>/ToolkitTunesLayout/*</url-pattern>

+		<servlet-name>VaadinTunesLayout</servlet-name>

+		<url-pattern>/VaadinTunesLayout/*</url-pattern>

 	</servlet-mapping>

 

 	<servlet-mapping>

diff --git a/WebContent/index.html b/WebContent/index.html
index 22d9f0c123..88c2bee11a 100644
--- a/WebContent/index.html
+++ b/WebContent/index.html
@@ -99,7 +99,7 @@
 				
 				<h4>Additional demos</h4>
 				<ul><li><a class="demoapp" href="Reservr">Reservr &ndash; reservation application</a> &nbsp; (<a href="docs/example-source/com/vaadin/demo/reservation">sources</a>)</li>
-					<li><a class="demoapp" href="ToolkitTunesLayout/">ToolkitTunes &ndash; advanced layout &amp; theme</a> &nbsp; (<a href="docs/example-source/com/vaadin/demo/ToolkitTunesLayout.java.html">sources</a>)</li>
+					<li><a class="demoapp" href="VaadinTunesLayout/">VaadinTunes &ndash; advanced layout &amp; theme</a> &nbsp; (<a href="docs/example-source/com/vaadin/demo/VaadinTunesLayout.java.html">sources</a>)</li>
 					<li><a class="demoapp" href="Coverflow/">Coverflow &ndash; Flex integration</a> &nbsp; (<a href="docs/example-source/com/vaadin/demo/coverflow">sources</a>)</li>
 				</ul>
 				
diff --git a/build/buildhelpers/com/vaadin/buildhelpers/PortletConfigurationGenerator.java b/build/buildhelpers/com/vaadin/buildhelpers/PortletConfigurationGenerator.java
index 5c3f96b473..24cb6e5a76 100644
--- a/build/buildhelpers/com/vaadin/buildhelpers/PortletConfigurationGenerator.java
+++ b/build/buildhelpers/com/vaadin/buildhelpers/PortletConfigurationGenerator.java
@@ -31,7 +31,7 @@ public class PortletConfigurationGenerator {
     private static final String PORTLET_XML_FILE = "portlet.xml";

     private static final String LIFERAY_PORTLET_XML_FILE = "liferay-portlet.xml";

     private static final String LIFERAY_DISPLAY_XML_FILE = "liferay-display.xml";

-    private static final String JBOSS_OBJECT_FILE = "itmill-object.xml";

+    private static final String JBOSS_OBJECT_FILE = "vaadin-object.xml";

     private static final String JBOSS_INSTANCE_FILE = "portlet-instances.xml";

 

     // "templates" follow;

diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml
index 0189a83071..cce9340dbc 100644
--- a/build/package/WebContent/WEB-INF/web.xml
+++ b/build/package/WebContent/WEB-INF/web.xml
@@ -177,13 +177,13 @@
 		</init-param>
 	</servlet>
 
-	<!--  Layout demo (ToolkitTunes) -->
+	<!--  Layout demo (VaadinTunes) -->
 	<servlet>
-		<servlet-name>ToolkitTunesLayout</servlet-name>
+		<servlet-name>VaadinTunesLayout</servlet-name>
 		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.vaadin.demo.ToolkitTunesLayout</param-value>
+			<param-value>com.vaadin.demo.VaadinTunesLayout</param-value>
 		</init-param>
 	</servlet>
 
@@ -255,8 +255,8 @@
 		<url-pattern>/colorpicker/*</url-pattern>
 	</servlet-mapping>
 	<servlet-mapping>
-		<servlet-name>ToolkitTunesLayout</servlet-name>
-		<url-pattern>/ToolkitTunesLayout/*</url-pattern>
+		<servlet-name>VaadinTunesLayout</servlet-name>
+		<url-pattern>/VaadinTunesLayout/*</url-pattern>
 	</servlet-mapping>
 	<servlet-mapping>
 		<servlet-name>Coverflow</servlet-name>
diff --git a/src/com/vaadin/demo/ToolkitTunesLayout.java b/src/com/vaadin/demo/VaadinTunesLayout.java
index c3615e934c..695c4dc2cf 100644
--- a/src/com/vaadin/demo/ToolkitTunesLayout.java
+++ b/src/com/vaadin/demo/VaadinTunesLayout.java
@@ -24,7 +24,7 @@ import com.vaadin.ui.Window.Notification;
  * 
  */
 @SuppressWarnings("serial")
-public class ToolkitTunesLayout extends Application {
+public class VaadinTunesLayout extends Application {
 
     @Override
     public void init() {
@@ -35,8 +35,8 @@ public class ToolkitTunesLayout extends Application {
          * the UI into different classes and methods.
          */
 
-        // Main (browser) window, needed in all Toolkit applications
-        final Window root = new Window("ToolkitTunes");
+        // Main (browser) window, needed in all Vaadin applications
+        final Window root = new Window("VaadinTunes");
 
         /*
          * We'll attach the window to the browser view already here, so we won't
@@ -195,8 +195,8 @@ public class ToolkitTunesLayout extends Application {
         music.setWidth("100%");
 
         Label store = new Label("Store");
-        Button toolkitTunesStore = new Button("ToolkitTunes Store");
-        toolkitTunesStore.setWidth("100%");
+        Button vaadinTunesStore = new Button("VaadinTunes Store");
+        vaadinTunesStore.setWidth("100%");
         Button purchased = new Button("Purchased");
         purchased.setWidth("100%");
 
@@ -210,7 +210,7 @@ public class ToolkitTunesLayout extends Application {
         selections.addComponent(library);
         selections.addComponent(music);
         selections.addComponent(store);
-        selections.addComponent(toolkitTunesStore);
+        selections.addComponent(vaadinTunesStore);
         selections.addComponent(purchased);
         selections.addComponent(playlists);
         selections.addComponent(genius);
@@ -287,7 +287,7 @@ public class ToolkitTunesLayout extends Application {
         // TODO the footer
 
         // Now what's left to do? Themeing of course.
-        setTheme("toolkittunes");
+        setTheme("vaadintunes");
 
         /*
          * Let's give a namespace to our application window. This way, if
diff --git a/src/com/vaadin/tests/tickets/Ticket2405.java b/src/com/vaadin/tests/tickets/Ticket2405.java
index 0138223db8..174d6e5d6c 100644
--- a/src/com/vaadin/tests/tickets/Ticket2405.java
+++ b/src/com/vaadin/tests/tickets/Ticket2405.java
@@ -19,7 +19,7 @@ public class Ticket2405 extends Application {
     @Override
     public void init() {
 
-        final Window root = new Window("ToolkitTunes");
+        final Window root = new Window("VaadinTunes");
         root.setWidth("90%");
         root.setHeight("90%");
         root.center();