#2904: initial bulk rename "com.itmill.toolkit" -> "com.vaadin"

- com.itmill.toolkit.external not yet fully renamed


svn changeset:7715/svn branch:6.0

WebContent/ITMILL/readme.txt

@@ -20,7 +20,7 @@ command below in the top project directory:
 
   ant -f build-widgetsets.xml
 
-See build-widgetsets.xml, com.itmill.toolkit.demo.colorpicker package, and the
+See build-widgetsets.xml, com.vaadin.demo.colorpicker package, and the
 Reference Manual for more information regarding widget sets.
 
 ---------------------------

WebContent/WEB-INF/portlet.xml

@@ -6,13 +6,13 @@
         <portlet>
                 <portlet-name>PortletDemoPortlet</portlet-name>
                 <display-name>IT Mill Toolkit PortletDemo</display-name>
-                <portlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationPortlet</portlet-class>
+                <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
                 <init-param>
                         <name>application</name>
                         <value>PortletDemo</value>
                 </init-param>
                 
-                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
+                <init-param><name>widgetset</name><value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>
@@ -40,13 +40,13 @@
         <portlet>
                 <portlet-name>SimpleReserverPortlet</portlet-name>
                 <display-name>IT Mill Toolkit SimpleReserver</display-name>
-                <portlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationPortlet</portlet-class>
+                <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
                 <init-param>
                         <name>application</name>
                         <value>SimpleReserver</value>
                 </init-param>
                 <init-param><name>style</name><value>style=height:400px</value></init-param>
-                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
+                <init-param><name>widgetset</name><value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>
@@ -74,13 +74,13 @@
         <portlet>
                 <portlet-name>FeatureBrowserPortlet</portlet-name>
                 <display-name>IT Mill Toolkit FeatureBrowser</display-name>
-                <portlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationPortlet</portlet-class>
+                <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
                 <init-param>
                         <name>application</name>
                         <value>FeatureBrowser</value>
                 </init-param>
                 <init-param><name>style</name><value>style=height:650px</value></init-param>
-                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
+                <init-param><name>widgetset</name><value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>
@@ -108,13 +108,13 @@
         <portlet>
                 <portlet-name>ChatServletPortlet</portlet-name>
                 <display-name>IT Mill Toolkit ChatServlet</display-name>
-                <portlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationPortlet</portlet-class>
+                <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
                 <init-param>
                         <name>application</name>
                         <value>chat</value>
                 </init-param>
                 
-                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
+                <init-param><name>widgetset</name><value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>
@@ -142,13 +142,13 @@
         <portlet>
                 <portlet-name>BrowserDemoPortlet</portlet-name>
                 <display-name>IT Mill Toolkit BrowserDemo</display-name>
-                <portlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationPortlet</portlet-class>
+                <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
                 <init-param>
                         <name>application</name>
                         <value>BrowserDemo</value>
                 </init-param>
                 <init-param><name>style</name><value>style=height:650px</value></init-param>
-                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
+                <init-param><name>widgetset</name><value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>

WebContent/WEB-INF/web.xml

@@ -34,218 +34,218 @@
 
 	<servlet>
 		<servlet-name>ITMillToolkitApplicationRunner</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationRunnerServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationRunnerServlet</servlet-class>
 	</servlet>
 
 
 	<servlet>
 		<servlet-name>RobustnessSimple</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.robustness.RobustnessSimple</param-value>
+			<param-value>com.vaadin.tests.robustness.RobustnessSimple</param-value>
 		</init-param>
 	</servlet>
 
 
 	<servlet>
 		<servlet-name>DemoTestBench</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.testbench.TestBench</param-value>
+			<param-value>com.vaadin.demo.testbench.TestBench</param-value>
 		</init-param>
 	</servlet>
 	<servlet>
 		<servlet-name>TestForNativeWindowing</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.TestForNativeWindowing</param-value>
+			<param-value>com.vaadin.tests.TestForNativeWindowing</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>TestSplitPanel</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.TestSplitPanel</param-value>
+			<param-value>com.vaadin.tests.TestSplitPanel</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>FeatureBrowser</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.featurebrowser.FeatureBrowser</param-value>
+			<param-value>com.vaadin.demo.featurebrowser.FeatureBrowser</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>Sampler</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.sampler.SamplerApplication</param-value>
+			<param-value>com.vaadin.demo.sampler.SamplerApplication</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.sampler.gwt.SamplerWidgetSet</param-value>
+			<param-value>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</param-value>
 		</init-param>
 
 	</servlet>
 
 	<servlet>
 		<servlet-name>AddressBook</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.tutorial.addressbook.AddressBookApplication</param-value>
+			<param-value>com.vaadin.demo.tutorial.addressbook.AddressBookApplication</param-value>
 		</init-param>
 
 	</servlet>
 
 	<servlet>
 		<servlet-name>TestBench</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.TestBench</param-value>
+			<param-value>com.vaadin.tests.TestBench</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>RandomLayoutStress</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.RandomLayoutStress</param-value>
+			<param-value>com.vaadin.tests.RandomLayoutStress</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>Reservr</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.ReservationApplication</param-value>
+			<param-value>com.vaadin.demo.reservation.ReservationApplication</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
+			<param-value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>SimpleReserver</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.simple.SimpleReserver</param-value>
+			<param-value>com.vaadin.demo.reservation.simple.SimpleReserver</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
+			<param-value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>CalendarDemo</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.CalendarDemo</param-value>
+			<param-value>com.vaadin.demo.reservation.CalendarDemo</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
+			<param-value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>CustomLayoutDemo</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.CustomLayoutDemo</param-value>
+			<param-value>com.vaadin.tests.CustomLayoutDemo</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>LayoutDemo</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.LayoutDemo</param-value>
+			<param-value>com.vaadin.tests.LayoutDemo</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>ToolkitTunesLayout</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.ToolkitTunesLayout</param-value>
+			<param-value>com.vaadin.demo.ToolkitTunesLayout</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>Coverflow</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.coverflow.CoverflowApplication</param-value>
+			<param-value>com.vaadin.demo.coverflow.CoverflowApplication</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.coverflow.gwt.CoverflowWidgetSet</param-value>
+			<param-value>com.vaadin.demo.coverflow.gwt.CoverflowWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>FeaturesApplication</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.featurebrowser.FeaturesApplication</param-value>
+			<param-value>com.vaadin.tests.featurebrowser.FeaturesApplication</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>Parameters</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.Parameters</param-value>
+			<param-value>com.vaadin.tests.Parameters</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>UpgradingSample</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.UpgradingSample</param-value>
+			<param-value>com.vaadin.tests.UpgradingSample</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>QueryContainerDemo</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.QueryContainerDemo</param-value>
+			<param-value>com.vaadin.tests.QueryContainerDemo</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>TreeFilesystemContainer</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.TreeFilesystemContainer</param-value>
+			<param-value>com.vaadin.tests.TreeFilesystemContainer</param-value>
 		</init-param>
 		<!--
 			Set this property if demo cannot access context base directory
@@ -260,10 +260,10 @@
 
 	<servlet>
 		<servlet-name>TreeFilesystem</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.TreeFilesystem</param-value>
+			<param-value>com.vaadin.tests.TreeFilesystem</param-value>
 		</init-param>
 		<!--
 			Set this property if demo cannot access context base directory
@@ -278,68 +278,68 @@
 
 	<servlet>
 		<servlet-name>ModalWindow</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.ModalWindow</param-value>
+			<param-value>com.vaadin.tests.ModalWindow</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>HelloWorld</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.HelloWorld</param-value>
+			<param-value>com.vaadin.demo.HelloWorld</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>Calc</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.Calc</param-value>
+			<param-value>com.vaadin.demo.Calc</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>ColorPickerApplication</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.colorpicker.ColorPickerApplication</param-value>
+			<param-value>com.vaadin.demo.colorpicker.ColorPickerApplication</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet</param-value>
+			<param-value>com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>BookTestServlet</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.book.BookTestApplication</param-value>
+			<param-value>com.vaadin.tests.book.BookTestApplication</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>WindowTestServlet</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.book.WindowTestApplication</param-value>
+			<param-value>com.vaadin.tests.book.WindowTestApplication</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>ChatServlet</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.book.ChatApplication</param-value>
+			<param-value>com.vaadin.tests.book.ChatApplication</param-value>
 		</init-param>
 	</servlet>
 

WebContent/multiapp.html

@@ -27,7 +27,7 @@
 			
 		}};
 </script>
-<script language='javascript' src='/ITMILL/widgetsets/com.itmill.toolkit.terminal.gwt.DefaultWidgetSet/com.itmill.toolkit.terminal.gwt.DefaultWidgetSet.nocache.js'></script>
+<script language='javascript' src='/ITMILL/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/com.vaadin.terminal.gwt.DefaultWidgetSet.nocache.js'></script>
 <link REL="stylesheet" TYPE="text/css" HREF="/ITMILL/themes/example/styles.css">
 </head>
 <body>

build/build.xml

@@ -683,9 +683,9 @@
 				<include name="**/*" />
 			</fileset>
 		</copy>
-		<java classname="com.itmill.toolkit.buildhelpers.PortletConfigurationGenerator" failonerror="yes" fork="yes" maxmemory="512m">
+		<java classname="com.vaadin.buildhelpers.PortletConfigurationGenerator" failonerror="yes" fork="yes" maxmemory="512m">
 			<arg value="${output-dir}/WebContent/WEB-INF" />
-			<arg value="com.itmill.toolkit.demo.sampler.gwt.SamplerWidgetSet" />
+			<arg value="com.vaadin.demo.sampler.gwt.SamplerWidgetSet" />
 			<classpath>
 				<pathelement location="build/buildhelpers/" />
 			</classpath>
@@ -721,7 +721,7 @@
 		<echo>Combining default themes css files</echo>
 		<!-- ensure buildhelpers are compiled -->
 		<javac source="1.5" target="1.5" srcdir="build/buildhelpers" />
-		<java classname="com.itmill.toolkit.buildhelpers.CompileDefaultTheme" failonerror="yes" fork="yes">
+		<java classname="com.vaadin.buildhelpers.CompileDefaultTheme" failonerror="yes" fork="yes">
 			<classpath>
 				<pathelement location="build/buildhelpers" />
 			</classpath>
@@ -739,11 +739,11 @@
 
 	<target name="compile-widgetset-default">
 		<echo>Compiling src (client-side)</echo>
-		<echo>com.itmill.toolkit.terminal.gwt.DefaultWidgetSet</echo>
+		<echo>com.vaadin.terminal.gwt.DefaultWidgetSet</echo>
 		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
 			<arg value="-out" />
 			<arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
-			<arg value="com.itmill.toolkit.terminal.gwt.DefaultWidgetSet" />
+			<arg value="com.vaadin.terminal.gwt.DefaultWidgetSet" />
 			<arg value="-style" />
 			<arg value="OBF" />
             <jvmarg value="-Xss8M"/>
@@ -765,11 +765,11 @@
 		<condition property="googlemaps-jar" value="lib/reservr/gwt-maps.jar">
 			<available file="lib/reservr/gwt-maps.jar" />
 		</condition>
-		<echo>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</echo>
+		<echo>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</echo>
 		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
 			<arg value="-out" />
 			<arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
-			<arg value="com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet" />
+			<arg value="com.vaadin.demo.reservation.gwt.ReservationWidgetSet" />
 			<arg value="-style" />
 			<arg value="OBF" />
             <jvmarg value="-Xss8M"/>
@@ -790,11 +790,11 @@
 
     <!-- Building Sampler for installation package is disabled. -->
 	<target name="compile-widgetset-sampler" unless="build.sampler.disabled">
-		<echo>com.itmill.toolkit.demo.sampler.gwt.SamplerWidgetSet</echo>
+		<echo>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</echo>
 		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
 			<arg value="-out" />
 			<arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
-			<arg value="com.itmill.toolkit.demo.sampler.gwt.SamplerWidgetSet" />
+			<arg value="com.vaadin.demo.sampler.gwt.SamplerWidgetSet" />
 			<arg value="-style" />
 			<arg value="OBF" />
             <jvmarg value="-Xss8M"/>
@@ -812,11 +812,11 @@
 	</target>
 	
 	<target name="compile-widgetset-coverflow">
-		<echo>com.itmill.toolkit.demo.coverflow.gwt.CoverflowWidgetSet</echo>
+		<echo>com.vaadin.demo.coverflow.gwt.CoverflowWidgetSet</echo>
 		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
 			<arg value="-out" />
 			<arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
-			<arg value="com.itmill.toolkit.demo.coverflow.gwt.CoverflowWidgetSet" />
+			<arg value="com.vaadin.demo.coverflow.gwt.CoverflowWidgetSet" />
 			<arg value="-style" />
 			<arg value="OBF" />
             <jvmarg value="-Xss8M"/>
@@ -834,11 +834,11 @@
 	</target>
 	
 	<target name="compile-widgetset-colorpicker">
-		<echo>com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet</echo>
+		<echo>com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet</echo>
 		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
 			<arg value="-out" />
 			<arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
-			<arg value="com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet" />
+			<arg value="com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet" />
 			<arg value="-style" />
 			<arg value="OBF" />
             <jvmarg value="-Xss8M"/>
@@ -940,7 +940,7 @@
 			</fileset>
 			<fileset dir="${output-dir}/WebContent">
 				<patternset>
-					<include name="ITMILL/widgetsets/com.itmill.toolkit.terminal.gwt.DefaultWidgetSet/**/*" />
+					<include name="ITMILL/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/**/*" />
 					<include name="ITMILL/themes/default/**/*" />
 				</patternset>
 			</fileset>
@@ -1188,13 +1188,13 @@
     </target>
 
     <target name="ant-tests">
-        <echo>##teamcity[testSuiteStarted name='com.itmill.toolkit.tests.test-framework']</echo>
+        <echo>##teamcity[testSuiteStarted name='com.vaadin.tests.test-framework']</echo>
 
         <!-- A smoke test for testing the testing framework. -->
         <echo>##teamcity[testStarted name='testingSmoketest']</echo>
         <echo>##teamcity[testStdOut name='testingSmoketest' out='Here be some text related to the test.]</echo>
         <echo>##teamcity[testFinished name='testingSmoketest']</echo>
 
-        <echo>##teamcity[testSuiteFinished name='com.itmill.toolkit.tests.test-framework']</echo>
+        <echo>##teamcity[testSuiteFinished name='com.vaadin.tests.test-framework']</echo>
     </target>
 </project>

build/buildhelpers/com/itmill/toolkit/buildhelpers/CompileDefaultTheme.java

@@ -1,4 +1,4 @@
-package com.itmill.toolkit.buildhelpers;
+package com.vaadin.buildhelpers;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

build/buildhelpers/com/itmill/toolkit/buildhelpers/PortletConfigurationGenerator.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.itmill.toolkit.buildhelpers;
+package com.vaadin.buildhelpers;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -43,7 +43,7 @@ public class PortletConfigurationGenerator {
     private static final String PORTLET_XML_SECTION = "        <portlet>\n"
             + "                <portlet-name>%PORTLETNAME%</portlet-name>\n"
             + "                <display-name>IT Mill Toolkit %NAME%</display-name>\n"
-            + "                <portlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationPortlet</portlet-class>\n"
+            + "                <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>\n"
             + "                <init-param>\n"
             + "                        <name>application</name>\n"
             + "                        <value>%URL%</value>\n"

build/package/WebContent/WEB-INF/web.xml

@@ -47,7 +47,7 @@
 	-->
 	<servlet>
 		<servlet-name>ITMillToolkitApplicationRunner</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>applicationRunner</param-name>
 			<param-value>true</param-value>
@@ -57,96 +57,96 @@
 	<!--  Feature Browser demo application -->
 	<servlet>
 		<servlet-name>FeatureBrowser</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.featurebrowser.FeatureBrowser</param-value>
+			<param-value>com.vaadin.demo.featurebrowser.FeatureBrowser</param-value>
 		</init-param>
 	</servlet>
 
 	<!--  Sampler demo application -->
 	<servlet>
 		<servlet-name>Sampler</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.sampler.SamplerApplication</param-value>
+			<param-value>com.vaadin.demo.sampler.SamplerApplication</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.sampler.gwt.SamplerWidgetSet</param-value>
+			<param-value>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<!--  AddressBook demo application -->
 	<servlet>
 		<servlet-name>AddressBook</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.tutorial.addressbook.AddressBookApplication</param-value>
+			<param-value>com.vaadin.demo.tutorial.addressbook.AddressBookApplication</param-value>
 		</init-param>
 	</servlet>
 
 	<!--  Reservr demo application -->
 	<servlet>
 		<servlet-name>Reservr</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.ReservationApplication</param-value>
+			<param-value>com.vaadin.demo.reservation.ReservationApplication</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
+			<param-value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<!-- Version of the Reservr to be run  as a portlet -->
 	<servlet>
 		<servlet-name>SimpleReserver</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.simple.SimpleReserver</param-value>
+			<param-value>com.vaadin.demo.reservation.simple.SimpleReserver</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
+			<param-value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<!-- Calendar demo application (shown in Windowed demos) -->
 	<servlet>
 		<servlet-name>CalendarDemo</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.CalendarDemo</param-value>
+			<param-value>com.vaadin.demo.reservation.CalendarDemo</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
+			<param-value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<!-- Hello world demo application -->
 	<servlet>
 		<servlet-name>HelloWorld</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.HelloWorld</param-value>
+			<param-value>com.vaadin.demo.HelloWorld</param-value>
 		</init-param>
 	</servlet>
 
 	<!-- Calculator demo application -->
 	<servlet>
 		<servlet-name>Calc</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.Calc</param-value>
+			<param-value>com.vaadin.demo.Calc</param-value>
 		</init-param>
 	</servlet>
 
@@ -156,48 +156,48 @@
 	-->
 	<servlet>
 		<servlet-name>ColorPickerApplication</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.colorpicker.ColorPickerApplication</param-value>
+			<param-value>com.vaadin.demo.colorpicker.ColorPickerApplication</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet</param-value>
+			<param-value>com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<!-- Portlet demo application -->
 	<servlet>
 		<servlet-name>PortletDemo</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.PortletDemo</param-value>
+			<param-value>com.vaadin.demo.PortletDemo</param-value>
 		</init-param>
 	</servlet>
 
 	<!--  Layout demo (ToolkitTunes) -->
 	<servlet>
 		<servlet-name>ToolkitTunesLayout</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.ToolkitTunesLayout</param-value>
+			<param-value>com.vaadin.demo.ToolkitTunesLayout</param-value>
 		</init-param>
 	</servlet>
 
 	<!--  Coverflow demo -->
 	<servlet>
 		<servlet-name>Coverflow</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.coverflow.CoverflowApplication</param-value>
+			<param-value>com.vaadin.demo.coverflow.CoverflowApplication</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.coverflow.gwt.CoverflowWidgetSet</param-value>
+			<param-value>com.vaadin.demo.coverflow.gwt.CoverflowWidgetSet</param-value>
 		</init-param>
 	</servlet>
 

build/package/build-widgetset.xml

@@ -74,12 +74,12 @@ See configure target to adjust this buildfile.
 	
 	<!-- NOTE: Modify this example to compile your own widgetset  -->
 	<target name="compile-widgetset" depends="init">
-		<echo>Compiling com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet.</echo>
+		<echo>Compiling com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet.</echo>
 		<echo>Modify this example ant-script to compile your own widgetsets.</echo>
 		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="256m">
 			<arg value="-out" />
 			<arg value="${client-side-destination}" />
-			<arg value="com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet" />
+			<arg value="com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet" />
             <jvmarg value="-Xss1024k"/>
             <jvmarg value="-Djava.awt.headless=true"/>
 			<classpath>

build/package/build.xml

@@ -13,7 +13,7 @@ Creates two packages:
 		<echo message="Creating two packages:" />
 		<echo message="1. WAR package that can be deployed to application server or servlet container." />
 		<echo message="2. JAR package which requires JRE only, includes embedded web server." />
-		<property name="server.main.class" value="com.itmill.toolkit.demo.DesktopServer" />
+		<property name="server.main.class" value="com.vaadin.demo.DesktopServer" />
 		<property name="webserver.jar" value="WebServer/winstone-0.9.9.jar" />
 		<property file="build.properties" />
 		<mkdir dir="build" />

build/package/eclipse-IT Mill Toolkit Web Mode-launch

@@ -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.itmill.toolkit.launcher.ITMillToolkitWebMode"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.vaadin.launcher.ITMillToolkitWebMode"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="<eclipse-workspace-name></eclipse-workspace-name>"/>
 </launchConfiguration>

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.itmill.toolkit.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.ITMillToolkitDesktopMode

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.itmill.toolkit.launcher.ITMillToolkitDesktopMode $ITMILLTOOLKIT_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.ITMillToolkitDesktopMode $ITMILLTOOLKIT_PARAMETERS

src/com/itmill/toolkit/demo/colorpicker/gwt/ColorPickerWidgetSet.gwt.xml

@@ -1,11 +0,0 @@
-<module>
-	<!-- Inherit DefaultWidgetSet -->
-	<inherits name="com.itmill.toolkit.terminal.gwt.DefaultWidgetSet" /> 
-	
-	<!-- WidgetSet default theme -->	
-	<stylesheet src="colorpicker/styles.css"/>
-
-	<!-- Entry point -->
-	<entry-point class="com.itmill.toolkit.demo.colorpicker.gwt.client.ColorPickerWidgetSet"/>
-  
-</module>

src/com/itmill/toolkit/demo/coverflow/gwt/CoverflowWidgetSet.gwt.xml

@@ -1,8 +0,0 @@
-<module>
-	<!-- Inherit the NoEntry version to avoid multiple entrypoints -->
-	<inherits name="com.itmill.toolkit.terminal.gwt.DefaultWidgetSetNoEntry" /> 
-
-	<!-- Entry point -->
-	<entry-point class="com.itmill.toolkit.demo.coverflow.gwt.client.CoverflowWidgetSet"/>
-  
-</module>

src/com/itmill/toolkit/Application.java → src/com/vaadin/Application.java

@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit;
+package com.vaadin;
 
 import java.io.Serializable;
 import java.net.SocketException;
@@ -19,24 +19,24 @@ import java.util.Locale;
 import java.util.Properties;
 import java.util.Random;
 
-import com.itmill.toolkit.service.ApplicationContext;
-import com.itmill.toolkit.terminal.ApplicationResource;
-import com.itmill.toolkit.terminal.DownloadStream;
-import com.itmill.toolkit.terminal.ErrorMessage;
-import com.itmill.toolkit.terminal.ParameterHandler;
-import com.itmill.toolkit.terminal.SystemError;
-import com.itmill.toolkit.terminal.Terminal;
-import com.itmill.toolkit.terminal.URIHandler;
-import com.itmill.toolkit.terminal.VariableOwner;
-import com.itmill.toolkit.terminal.gwt.server.ChangeVariablesErrorEvent;
-import com.itmill.toolkit.ui.AbstractComponent;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.service.ApplicationContext;
+import com.vaadin.terminal.ApplicationResource;
+import com.vaadin.terminal.DownloadStream;
+import com.vaadin.terminal.ErrorMessage;
+import com.vaadin.terminal.ParameterHandler;
+import com.vaadin.terminal.SystemError;
+import com.vaadin.terminal.Terminal;
+import com.vaadin.terminal.URIHandler;
+import com.vaadin.terminal.VariableOwner;
+import com.vaadin.terminal.gwt.server.ChangeVariablesErrorEvent;
+import com.vaadin.ui.AbstractComponent;
+import com.vaadin.ui.Window;
 
 /**
  * <p>
  * Base class required for all IT Mill Toolkit applications. This class provides
  * all the basic services required by the toolkit. These services allow external
- * discovery and manipulation of the user, {@link com.itmill.toolkit.ui.Window
+ * discovery and manipulation of the user, {@link com.vaadin.ui.Window
  * windows} and themes, and starting and stopping the application.
  * </p>
  * 
@@ -55,7 +55,7 @@ import com.itmill.toolkit.ui.Window;
  * </p>
  * 
  * <p>
- * See the class <code>com.itmill.toolkit.demo.HelloWorld</code> for a simple
+ * See the class <code>com.vaadin.demo.HelloWorld</code> for a simple
  * example of a fully working application.
  * </p>
  * 
@@ -76,7 +76,7 @@ import com.itmill.toolkit.ui.Window;
  * found out, the window itself is queried for a preferred theme. If the window
  * does not prefer a specific theme, the application containing the window is
  * queried. If neither the application prefers a theme, the default theme for
- * the {@link com.itmill.toolkit.terminal.Terminal terminal} is used. The
+ * the {@link com.vaadin.terminal.Terminal terminal} is used. The
  * terminal always defines a default theme.
  * </p>
  * 
@@ -261,7 +261,7 @@ public abstract class Application implements URIHandler,
      * 
      * <p>
      * This implicitly invokes the
-     * {@link com.itmill.toolkit.ui.Window#setApplication(Application)} method.
+     * {@link com.vaadin.ui.Window#setApplication(Application)} method.
      * </p>
      * 
      * <p>
@@ -680,7 +680,7 @@ public abstract class Application implements URIHandler,
      * In most situations developers should NOT OVERRIDE this method. Instead
      * developers should implement and register uri handlers to windows.
      * 
-     * @see com.itmill.toolkit.terminal.URIHandler#handleURI(URL, String)
+     * @see com.vaadin.terminal.URIHandler#handleURI(URL, String)
      */
     public DownloadStream handleURI(URL context, String relativeUri) {
 
@@ -1081,7 +1081,7 @@ public abstract class Application implements URIHandler,
      * 
      * @param event
      *            the change event.
-     * @see com.itmill.toolkit.terminal.Terminal.ErrorListener#terminalError(com.itmill.toolkit.terminal.Terminal.ErrorEvent)
+     * @see com.vaadin.terminal.Terminal.ErrorListener#terminalError(com.vaadin.terminal.Terminal.ErrorEvent)
      */
     public void terminalError(Terminal.ErrorEvent event) {
         final Throwable t = event.getThrowable();

src/com/itmill/toolkit/annotations/AutoGenerated.java → src/com/vaadin/annotations/AutoGenerated.java

@@ -1,4 +1,4 @@
-package com.itmill.toolkit.annotations;
+package com.vaadin.annotations;
 
 /**
  * Marker annotation for automatically generated code elements.

src/com/itmill/toolkit/automatedtests/ComponentsInTable.java → src/com/vaadin/automatedtests/ComponentsInTable.java

@@ -2,17 +2,17 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests;
+package com.vaadin.automatedtests;
 
 import java.util.Date;
 import java.util.Random;
 import java.util.Vector;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Button.ClickEvent;
 
 @SuppressWarnings("serial")
 public class ComponentsInTable extends CustomComponent {

src/com/itmill/toolkit/automatedtests/SimplestApplication.java → src/com/vaadin/automatedtests/SimplestApplication.java

@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests;
+package com.vaadin.automatedtests;
 
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
 
 @SuppressWarnings("serial")
-public class SimplestApplication extends com.itmill.toolkit.Application {
+public class SimplestApplication extends com.vaadin.Application {
 
     @Override
     public void init() {

src/com/itmill/toolkit/demo/featurebrowser/AccordionExample.java → src/com/vaadin/automatedtests/featurebrowser/AccordionExample.java

@@ -1,16 +1,18 @@
-package com.itmill.toolkit.demo.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
-import com.itmill.toolkit.ui.Accordion;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.ui.Accordion;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
 
 /**
  * Accordion is a derivative of TabSheet, a vertical tabbed layout that places
  * the tab contents between the vertical tabs.
  */
+@SuppressWarnings("serial")
 public class AccordionExample extends CustomComponent {
+
     public AccordionExample() {
         // Create a new accordion
         final Accordion accordion = new Accordion();

src/com/itmill/toolkit/automatedtests/featurebrowser/ButtonExample.java → src/com/vaadin/automatedtests/featurebrowser/ButtonExample.java

@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
-
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.automatedtests.featurebrowser;
+
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * Shows a few variations of Buttons and Links.

src/com/itmill/toolkit/demo/featurebrowser/ClientCachingExample.java → src/com/vaadin/automatedtests/featurebrowser/ClientCachingExample.java

@@ -2,15 +2,15 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.VerticalLayout;
 
 /**
  * This example is a (simple) demonstration of client-side caching. The content
@@ -21,6 +21,7 @@ import com.itmill.toolkit.ui.VerticalLayout;
  * 
  * @author IT Mill Ltd.
  */
+@SuppressWarnings("serial")
 public class ClientCachingExample extends CustomComponent {
 
     private static final String msg = "This example is a (simple) demonstration of client-side caching."
@@ -52,6 +53,7 @@ public class ClientCachingExample extends CustomComponent {
         layout = new VerticalLayout();
         layout.setMargin(true);
         l = new Label("Slow label - until cached client side.") {
+
             @Override
             public void paintContent(PaintTarget target) throws PaintException {
                 try {

src/com/itmill/toolkit/automatedtests/featurebrowser/ComboBoxExample.java → src/com/vaadin/automatedtests/featurebrowser/ComboBoxExample.java

@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
 import java.util.Random;
 
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.AbstractSelect.Filtering;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.AbstractSelect.Filtering;
 
 /**
  * 

src/com/itmill/toolkit/demo/featurebrowser/EmbeddedBrowserExample.java → src/com/vaadin/automatedtests/featurebrowser/EmbeddedBrowserExample.java

@@ -2,25 +2,26 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window.Notification;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window.Notification;
 
 /**
  * Demonstrates the use of Embedded and "suggesting" Select by creating a simple
  * web-browser. Note: does not check for recursion.
  * 
  * @author IT Mill Ltd.
- * @see com.itmill.toolkit.ui.Window
+ * @see com.vaadin.ui.Window
  */
+@SuppressWarnings("serial")
 public class EmbeddedBrowserExample extends VerticalLayout implements
         Select.ValueChangeListener {
 

src/com/itmill/toolkit/automatedtests/featurebrowser/FeatureBrowser.java → src/com/vaadin/automatedtests/featurebrowser/FeatureBrowser.java

@@ -2,42 +2,42 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
 import java.util.HashMap;
 import java.util.Iterator;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.util.HierarchicalContainer;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.util.HierarchicalContainer;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * 
  * @author IT Mill Ltd.
- * @see com.itmill.toolkit.ui.Window
+ * @see com.vaadin.ui.Window
  */
 @SuppressWarnings("serial")
-public class FeatureBrowser extends com.itmill.toolkit.Application implements
+public class FeatureBrowser extends com.vaadin.Application implements
         Select.ValueChangeListener {
 
     // Property IDs

src/com/itmill/toolkit/automatedtests/featurebrowser/FormExample.java → src/com/vaadin/automatedtests/featurebrowser/FormExample.java

@@ -1,20 +1,20 @@
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
 import java.io.Serializable;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.data.util.BeanItem;
-import com.itmill.toolkit.ui.BaseFieldFactory;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.data.Item;
+import com.vaadin.data.Validator;
+import com.vaadin.data.util.BeanItem;
+import com.vaadin.ui.BaseFieldFactory;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * This example demonstrates the most important features of the Form component:

src/com/itmill/toolkit/automatedtests/featurebrowser/GeneratedColumnExample.java → src/com/vaadin/automatedtests/featurebrowser/GeneratedColumnExample.java

@@ -2,29 +2,29 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
 import java.util.Collection;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Vector;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Container.Indexed;
-import com.itmill.toolkit.data.util.BeanItem;
-import com.itmill.toolkit.ui.AbstractField;
-import com.itmill.toolkit.ui.BaseFieldFactory;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.Container.Indexed;
+import com.vaadin.data.util.BeanItem;
+import com.vaadin.ui.AbstractField;
+import com.vaadin.ui.BaseFieldFactory;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 /**
  * This example demonstrates the use of generated columns in a table. Generated

src/com/itmill/toolkit/demo/featurebrowser/JavaScriptAPIExample.java → src/com/vaadin/automatedtests/featurebrowser/JavaScriptAPIExample.java

@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
 import java.util.Date;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * An example using a RichTextArea to edit a Label in XHTML-mode.

src/com/itmill/toolkit/automatedtests/featurebrowser/LabelExample.java → src/com/vaadin/automatedtests/featurebrowser/LabelExample.java

@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
 
 /**
  * Shows a few variations of Labels, including the effects of XHTML- and

src/com/itmill/toolkit/automatedtests/featurebrowser/LayoutExample.java → src/com/vaadin/automatedtests/featurebrowser/LayoutExample.java

@@ -2,15 +2,15 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.VerticalLayout;
 
 /**
  * A few examples of layout possibilities.

src/com/itmill/toolkit/demo/featurebrowser/NotificationExample.java → src/com/vaadin/automatedtests/featurebrowser/NotificationExample.java

@@ -2,26 +2,26 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.RichTextArea;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.data.Item;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.RichTextArea;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 /**
  * Demonstrates the use of Notifications.
  * 
  * @author IT Mill Ltd.
- * @see com.itmill.toolkit.ui.Window
+ * @see com.vaadin.ui.Window
  */
 public class NotificationExample extends CustomComponent {
 

src/com/itmill/toolkit/demo/featurebrowser/RichTextExample.java → src/com/vaadin/automatedtests/featurebrowser/RichTextExample.java

@@ -2,15 +2,15 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
-
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.RichTextArea;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.automatedtests.featurebrowser;
+
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.RichTextArea;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * An example using a RichTextArea to edit a Label in XHTML-mode.

src/com/itmill/toolkit/automatedtests/featurebrowser/SelectExample.java → src/com/vaadin/automatedtests/featurebrowser/SelectExample.java

@@ -2,20 +2,20 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.ListSelect;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.OptionGroup;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TwinColSelect;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.ListSelect;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.OptionGroup;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TwinColSelect;
+import com.vaadin.ui.VerticalLayout;
 
 /**
  * Shows some basic fields for value input; TextField, DateField, Slider...

src/com/itmill/toolkit/automatedtests/featurebrowser/TableExample.java → src/com/vaadin/automatedtests/featurebrowser/TableExample.java

@@ -2,23 +2,23 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
 import java.util.Iterator;
 import java.util.Random;
 import java.util.Set;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.event.Action;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * Table example.

src/com/itmill/toolkit/demo/featurebrowser/TreeExample.java → src/com/vaadin/automatedtests/featurebrowser/TreeExample.java

@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
-
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Tree;
+package com.vaadin.automatedtests.featurebrowser;
+
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.event.Action;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Tree;
 
 /**
  * Demonstrates basic Tree -functionality. Actions are used for add/remove item
@@ -39,6 +39,7 @@ public class TreeExample extends CustomComponent implements Action.Handler,
     public TreeExample() {
         final HorizontalLayout main = new HorizontalLayout();
         main.setWidth("100%");
+        main.setDebugId("mainLayout");
         main.setMargin(true);
         setCompositionRoot(main);
 
@@ -50,6 +51,7 @@ public class TreeExample extends CustomComponent implements Action.Handler,
         p.addComponent(new Label(desc));
         // Tree with a few items
         tree = new Tree();
+        tree.setDebugId("tree");
         tree.setImmediate(true);
         // we'll use a property for caption instead of the item id ("value"),
         // so that multiple items can have the same caption

src/com/itmill/toolkit/automatedtests/featurebrowser/ValueInputExample.java → src/com/vaadin/automatedtests/featurebrowser/ValueInputExample.java

@@ -2,21 +2,21 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
 import java.util.Date;
 
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.InlineDateField;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Slider;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window.Notification;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.InlineDateField;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Slider;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window.Notification;
 
 /**
  * Shows some basic fields for value input; TextField, DateField, Slider...

src/com/itmill/toolkit/demo/featurebrowser/WindowingExample.java → src/com/vaadin/automatedtests/featurebrowser/WindowingExample.java

@@ -2,17 +2,17 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
 import java.net.URL;
 
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * @author marc

src/com/itmill/toolkit/automatedtests/robustness/Robustness.java → src/com/vaadin/automatedtests/robustness/Robustness.java

@@ -2,17 +2,17 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.robustness;
+package com.vaadin.automatedtests.robustness;
 
-import com.itmill.toolkit.automatedtests.util.Log;
-import com.itmill.toolkit.automatedtests.util.RandomComponents;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComponentContainer;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.automatedtests.util.Log;
+import com.vaadin.automatedtests.util.RandomComponents;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
-public abstract class Robustness extends com.itmill.toolkit.Application
+public abstract class Robustness extends com.vaadin.Application
         implements Button.ClickListener {
 
     static int totalCount = 0;

src/com/itmill/toolkit/automatedtests/robustness/RobustnessComplex.java → src/com/vaadin/automatedtests/robustness/RobustnessComplex.java

@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.robustness;
+package com.vaadin.automatedtests.robustness;
 
-import com.itmill.toolkit.automatedtests.util.Log;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
+import com.vaadin.automatedtests.util.Log;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
 
 public class RobustnessComplex extends Robustness implements
         Button.ClickListener {

src/com/itmill/toolkit/automatedtests/util/DebugId.java → src/com/vaadin/automatedtests/util/DebugId.java

@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.util;
+package com.vaadin.automatedtests.util;
 
 import java.io.Serializable;
 import java.util.HashMap;
 
-import com.itmill.toolkit.ui.Component;
+import com.vaadin.ui.Component;
 
 public class DebugId implements Serializable {
 

src/com/itmill/toolkit/automatedtests/util/Log.java → src/com/vaadin/automatedtests/util/Log.java

@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.util;
+package com.vaadin.automatedtests.util;
 
 import java.io.Serializable;
 import java.text.DateFormat;

src/com/itmill/toolkit/automatedtests/util/MultiListener.java → src/com/vaadin/automatedtests/util/MultiListener.java

@@ -2,16 +2,16 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.util;
-
-import com.itmill.toolkit.data.Container.ItemSetChangeEvent;
-import com.itmill.toolkit.data.Container.ItemSetChangeListener;
-import com.itmill.toolkit.data.Container.PropertySetChangeEvent;
-import com.itmill.toolkit.data.Container.PropertySetChangeListener;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.automatedtests.util;
+
+import com.vaadin.data.Container.ItemSetChangeEvent;
+import com.vaadin.data.Container.ItemSetChangeListener;
+import com.vaadin.data.Container.PropertySetChangeEvent;
+import com.vaadin.data.Container.PropertySetChangeListener;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class MultiListener implements Button.ClickListener,
         PropertySetChangeListener, ItemSetChangeListener, ValueChangeListener {

src/com/itmill/toolkit/automatedtests/util/RandomComponents.java → src/com/vaadin/automatedtests/util/RandomComponents.java

@@ -2,45 +2,45 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.util;
+package com.vaadin.automatedtests.util;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Random;
 
-import com.itmill.toolkit.automatedtests.ComponentsInTable;
-import com.itmill.toolkit.data.Container.ItemSetChangeListener;
-import com.itmill.toolkit.data.Container.PropertySetChangeListener;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.demo.featurebrowser.ButtonExample;
-import com.itmill.toolkit.demo.featurebrowser.ClientCachingExample;
-import com.itmill.toolkit.demo.featurebrowser.ComboBoxExample;
-import com.itmill.toolkit.demo.featurebrowser.EmbeddedBrowserExample;
-import com.itmill.toolkit.demo.featurebrowser.LabelExample;
-import com.itmill.toolkit.demo.featurebrowser.LayoutExample;
-import com.itmill.toolkit.demo.featurebrowser.NotificationExample;
-import com.itmill.toolkit.demo.featurebrowser.RichTextExample;
-import com.itmill.toolkit.demo.featurebrowser.SelectExample;
-import com.itmill.toolkit.demo.featurebrowser.TableExample;
-import com.itmill.toolkit.demo.featurebrowser.TreeExample;
-import com.itmill.toolkit.demo.featurebrowser.ValueInputExample;
-import com.itmill.toolkit.demo.featurebrowser.WindowingExample;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.AbstractComponent;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComponentContainer;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.automatedtests.ComponentsInTable;
+import com.vaadin.data.Container.ItemSetChangeListener;
+import com.vaadin.data.Container.PropertySetChangeListener;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.demo.featurebrowser.ButtonExample;
+import com.vaadin.demo.featurebrowser.ClientCachingExample;
+import com.vaadin.demo.featurebrowser.ComboBoxExample;
+import com.vaadin.demo.featurebrowser.EmbeddedBrowserExample;
+import com.vaadin.demo.featurebrowser.LabelExample;
+import com.vaadin.demo.featurebrowser.LayoutExample;
+import com.vaadin.demo.featurebrowser.NotificationExample;
+import com.vaadin.demo.featurebrowser.RichTextExample;
+import com.vaadin.demo.featurebrowser.SelectExample;
+import com.vaadin.demo.featurebrowser.TableExample;
+import com.vaadin.demo.featurebrowser.TreeExample;
+import com.vaadin.demo.featurebrowser.ValueInputExample;
+import com.vaadin.demo.featurebrowser.WindowingExample;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.AbstractComponent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.TextField;
 
 public class RandomComponents implements Serializable {
 

src/com/itmill/toolkit/automatedtests/util/StatusServlet.java → src/com/vaadin/automatedtests/util/StatusServlet.java

@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.util;
+package com.vaadin.automatedtests.util;
 
 import java.io.IOException;
 import java.io.Writer;

src/com/itmill/toolkit/data/Buffered.java → src/com/vaadin/data/Buffered.java

@@ -2,15 +2,15 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data;
+package com.vaadin.data;
 
 import java.io.Serializable;
 
-import com.itmill.toolkit.data.Validator.InvalidValueException;
-import com.itmill.toolkit.terminal.ErrorMessage;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.SystemError;
+import com.vaadin.data.Validator.InvalidValueException;
+import com.vaadin.terminal.ErrorMessage;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.SystemError;
 
 /**
  * <p>
@@ -239,7 +239,7 @@ public interface Buffered extends Serializable {
          * are of level <code>ERROR</code>.
          * </p>
          * 
-         * @see com.itmill.toolkit.terminal.ErrorMessage#getErrorLevel()
+         * @see com.vaadin.terminal.ErrorMessage#getErrorLevel()
          */
         public int getErrorLevel() {
 

src/com/itmill/toolkit/data/BufferedValidatable.java → src/com/vaadin/data/BufferedValidatable.java

@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data;
+package com.vaadin.data;
 
 import java.io.Serializable;
 

src/com/itmill/toolkit/data/Container.java → src/com/vaadin/data/Container.java

@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data;
+package com.vaadin.data;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -488,7 +488,7 @@ public interface Container extends Serializable {
          * <p>
          * The children must be first explicitly removed with
          * {@link #setParent(Object itemId, Object newParentId)}or
-         * {@link com.itmill.toolkit.data.Container#removeItem(Object itemId)}.
+         * {@link com.vaadin.data.Container#removeItem(Object itemId)}.
          * </p>
          * 
          * <p>
@@ -554,17 +554,17 @@ public interface Container extends Serializable {
      * multiple filters are added, all filters must match for an item to be
      * visible in the container.
      * 
-     * When an {@link com.itmill.toolkit.data.Ordered} or
-     * {@link com.itmill.toolkit.data.Indexed} container is filtered, all
+     * When an {@link com.vaadin.data.Ordered} or
+     * {@link com.vaadin.data.Indexed} container is filtered, all
      * operations of these interfaces should only use the filtered contents and
      * the filtered indices to the container.
      * 
      * Adding items (if supported) to a filtered
-     * {@link com.itmill.toolkit.data.Ordered} or
-     * {@link com.itmill.toolkit.data.Indexed} container should insert them
+     * {@link com.vaadin.data.Ordered} or
+     * {@link com.vaadin.data.Indexed} container should insert them
      * immediately after the indicated visible item. The unfiltered position of
      * items added at index 0, at index
-     * {@link com.itmill.toolkit.data.Container#size()} or at an undefined
+     * {@link com.vaadin.data.Container#size()} or at an undefined
      * position is up to the implementation.
      * 
      * @since 5.0

src/com/itmill/toolkit/data/Item.java → src/com/vaadin/data/Item.java

@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data;
+package com.vaadin.data;
 
 import java.io.Serializable;
 import java.util.Collection;

src/com/itmill/toolkit/data/Property.java → src/com/vaadin/data/Property.java

@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data;
+package com.vaadin.data;
 
 import java.io.Serializable;
 

src/com/itmill/toolkit/data/Validatable.java → src/com/vaadin/data/Validatable.java

@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data;
+package com.vaadin.data;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -18,7 +18,7 @@ import java.util.Collection;
  * @version
  * @VERSION@
  * @since 3.0
- * @see com.itmill.toolkit.data.Validator
+ * @see com.vaadin.data.Validator
  */
 public interface Validatable extends Serializable {
 

src/com/itmill/toolkit/data/Validator.java → src/com/vaadin/data/Validator.java

@@ -2,17 +2,17 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data;
+package com.vaadin.data;
 
 import java.io.Serializable;
 
-import com.itmill.toolkit.terminal.ErrorMessage;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.terminal.ErrorMessage;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * Object validator interface. Implementors of this class can be added to any
- * {@link com.itmill.toolkit.data.Validatable} object to verify its value. The
+ * {@link com.vaadin.data.Validatable} object to verify its value. The
  * <code>Validatable#isValid(Object)</code> iterates all registered
  * <code>Validator</code>s, calling their {@link #validate(Object)} methods.
  * <code>validate(Object)</code> should throw the

src/com/itmill/toolkit/data/package.html → src/com/vaadin/data/package.html

@@ -7,12 +7,12 @@
 
 <p>Provides interfaces for the data layer which contains classes
 for typed data values, data collections, and handlers. A 
-{@link com.itmill.toolkit.data.Property Property} is a simple typed data
-value; an {@link com.itmill.toolkit.data.Item Item} is a collection of
+{@link com.vaadin.data.Property Property} is a simple typed data
+value; an {@link com.vaadin.data.Item Item} is a collection of
 Properties, each corresponding to a unique identifier; a
-{@link com.itmill.toolkit.data.Container Container} is a collection of
+{@link com.vaadin.data.Container Container} is a collection of
 identified Items with special constraints; a
-{@link com.itmill.toolkit.data.Buffered Buffered} class is able to track
+{@link com.vaadin.data.Buffered Buffered} class is able to track
 its changes and to commit or discard them later.</p>
 
 <h2>Package Specification</h2>
@@ -28,17 +28,17 @@ collections of them:</p>
 
 <ul>
 	<li>The simplest of these is the
-	{@link com.itmill.toolkit.data.Property Property} which represents a
+	{@link com.vaadin.data.Property Property} which represents a
 	single typed data value. A Property may be read-only in which
 	case attempts to modify its contents will throw an exception.	 
 
 	<li>The second level of the data layer is represented by the
-	{@link com.itmill.toolkit.data.Item Item} which embodies a set of
+	{@link com.vaadin.data.Item Item} which embodies a set of
 	<i>Properties</i>. Each Property in an Item corresponds to a locally
 	unique(that is, inside the Item) identifier.
 	
 	<li>The third level is called the
-	{@link com.itmill.toolkit.data.Container Container} which can be
+	{@link com.vaadin.data.Container Container} which can be
 	visualized as a set of Items, each corresponding to a locally unique
 	identifier. Note that the Container imposes a few restrictions on the
 	data stored in it, see further documentation in the
@@ -46,7 +46,7 @@ collections of them:</p>
 </ul>
 
 <p>In addition to these interfaces the package contains the 
-{@link com.itmill.toolkit.data.Buffered Buffered} interface, which defines
+{@link com.vaadin.data.Buffered Buffered} interface, which defines
 the methods to make an object buffered, that is, track the changes to an
 object and allow committing or discarding them at a later time.</p>
 
@@ -57,8 +57,8 @@ validation, and another one for the validators themselves.</p>
 <h2>Validation</h2>
 
 <p>The most important method defined by the
-{@link com.itmill.toolkit.data.Validatable Validatable} interface is
-{@link com.itmill.toolkit.data.Validatable#isValid() isValid()}. It
+{@link com.vaadin.data.Validatable Validatable} interface is
+{@link com.vaadin.data.Validatable#isValid() isValid()}. It
 asks all registered validators to verify if the object's value is valid
 or not. Note that it depends on the validators registered for a object which
 values are valid and which are not. For example, a <code>null</code> value
@@ -67,18 +67,18 @@ can be valid value for one validator but invalid for another.<p>
 <p>In addition to <code>isValid()</code>, <code>Validatable</code> defines
 methods to add, remove and list validators of a validatable object.</p>
 
-<p>{@link com.itmill.toolkit.data.Validator Validator} defines the
+<p>{@link com.vaadin.data.Validator Validator} defines the
 interface for an external validator.  These validators may be added to
 any <code>Validatable</code> object, and their task is to check, when
 requested, that the object which they are attached to contains a valid
 value. The actual validation logic is hidden in the 
-{@link com.itmill.toolkit.data.Validator#validate(Object) validate(Object)}
+{@link com.vaadin.data.Validator#validate(Object) validate(Object)}
 method.</p>
 
 <p>In addition to <code>check(Object)</code>, <code>Validator</code> defines
 the <code>InvalidValueException</code> which is used to signal that a
 checked value is invalid, and the
-{@link com.itmill.toolkit.data.Validator.Suggestive Suggestive}
+{@link com.vaadin.data.Validator.Suggestive Suggestive}
 subinterface which includes functionality to suggest a valid value for
 the validated object.</p><!-- Put @see and @since tags down here. -->
 

src/com/itmill/toolkit/data/util/BeanItem.java → src/com/vaadin/data/util/BeanItem.java

@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.beans.BeanInfo;
 import java.beans.Introspector;
@@ -12,7 +12,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Property;
 
 /**
  * A wrapper class for adding the Item interface to any Java Bean.

src/com/itmill/toolkit/data/util/BeanItemContainer.java → src/com/vaadin/data/util/BeanItemContainer.java

@@ -1,4 +1,4 @@
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.beans.PropertyDescriptor;
 import java.io.IOException;
@@ -15,15 +15,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Container.Filterable;
-import com.itmill.toolkit.data.Container.Indexed;
-import com.itmill.toolkit.data.Container.ItemSetChangeNotifier;
-import com.itmill.toolkit.data.Container.Sortable;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.data.Property.ValueChangeNotifier;
+import com.vaadin.data.Container;
+import com.vaadin.data.Property;
+import com.vaadin.data.Container.Filterable;
+import com.vaadin.data.Container.Indexed;
+import com.vaadin.data.Container.ItemSetChangeNotifier;
+import com.vaadin.data.Container.Sortable;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.data.Property.ValueChangeNotifier;
 
 /**
  * An {@link ArrayList} backed container for {@link BeanItem}s.
@@ -103,7 +103,7 @@ public class BeanItemContainer<BT> implements Indexed, Sortable, Filterable,
     /**
      * Unsupported operation.
      * 
-     * @see com.itmill.toolkit.data.Container.Indexed#addItemAt(int)
+     * @see com.vaadin.data.Container.Indexed#addItemAt(int)
      */
     public Object addItemAt(int index) throws UnsupportedOperationException {
         throw new UnsupportedOperationException();
@@ -114,7 +114,7 @@ public class BeanItemContainer<BT> implements Indexed, Sortable, Filterable,
      * 
      * The bean is used both as the item contents and as the item identifier.
      * 
-     * @see com.itmill.toolkit.data.Container.Indexed#addItemAt(int, Object)
+     * @see com.vaadin.data.Container.Indexed#addItemAt(int, Object)
      */
     public BeanItem addItemAt(int index, Object newItemId)
             throws UnsupportedOperationException {
@@ -178,7 +178,7 @@ public class BeanItemContainer<BT> implements Indexed, Sortable, Filterable,
     /**
      * Unsupported operation.
      * 
-     * @see com.itmill.toolkit.data.Container.Ordered#addItemAfter(Object)
+     * @see com.vaadin.data.Container.Ordered#addItemAfter(Object)
      */
     public Object addItemAfter(Object previousItemId)
             throws UnsupportedOperationException {
@@ -190,7 +190,7 @@ public class BeanItemContainer<BT> implements Indexed, Sortable, Filterable,
      * 
      * The bean is used both as the item contents and as the item identifier.
      * 
-     * @see com.itmill.toolkit.data.Container.Ordered#addItemAfter(Object,
+     * @see com.vaadin.data.Container.Ordered#addItemAfter(Object,
      *      Object)
      */
     public BeanItem addItemAfter(Object previousItemId, Object newItemId)
@@ -257,7 +257,7 @@ public class BeanItemContainer<BT> implements Indexed, Sortable, Filterable,
     /**
      * Unsupported operation.
      * 
-     * @see com.itmill.toolkit.data.Container#addItem()
+     * @see com.vaadin.data.Container#addItem()
      */
     public Object addItem() throws UnsupportedOperationException {
         throw new UnsupportedOperationException();
@@ -268,7 +268,7 @@ public class BeanItemContainer<BT> implements Indexed, Sortable, Filterable,
      * 
      * The bean is used both as the item contents and as the item identifier.
      * 
-     * @see com.itmill.toolkit.data.Container#addItem(Object)
+     * @see com.vaadin.data.Container#addItem(Object)
      */
     public BeanItem addBean(BT bean) {
         return addItem(bean);
@@ -279,7 +279,7 @@ public class BeanItemContainer<BT> implements Indexed, Sortable, Filterable,
      * 
      * The bean is used both as the item contents and as the item identifier.
      * 
-     * @see com.itmill.toolkit.data.Container#addItem(Object)
+     * @see com.vaadin.data.Container#addItem(Object)
      */
     public BeanItem addItem(Object itemId) throws UnsupportedOperationException {
         if (list.size() > 0) {

src/com/itmill/toolkit/data/util/ContainerHierarchicalWrapper.java → src/com/vaadin/data/util/ContainerHierarchicalWrapper.java

@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -12,14 +12,14 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
 
 /**
  * <p>
  * A wrapper class for adding external hierarchy to containers not implementing
- * the {@link com.itmill.toolkit.data.Container.Hierarchical} interface.
+ * the {@link com.vaadin.data.Container.Hierarchical} interface.
  * </p>
  * 
  * <p>
@@ -275,7 +275,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
      * this method fails and <code>false</code> is returned; the children must
      * be first explicitly removed with
      * {@link #setParent(Object itemId, Object newParentId)} or
-     * {@link com.itmill.toolkit.data.Container#removeItem(Object itemId)}.
+     * {@link com.vaadin.data.Container#removeItem(Object itemId)}.
      * </p>
      * 
      * @param itemId

src/com/itmill/toolkit/data/util/ContainerOrderedWrapper.java → src/com/vaadin/data/util/ContainerOrderedWrapper.java

@@ -2,21 +2,21 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.util.Collection;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
 
 /**
  * <p>
  * A wrapper class for adding external ordering to containers not implementing
- * the {@link com.itmill.toolkit.data.Container.Ordered} interface.
+ * the {@link com.vaadin.data.Container.Ordered} interface.
  * </p>
  * 
  * <p>
@@ -512,7 +512,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.Ordered#addItemAfter(java.lang.Object,
+     * com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object,
      * java.lang.Object)
      */
     public Item addItemAfter(Object previousItemId, Object newItemId)
@@ -538,7 +538,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.Ordered#addItemAfter(java.lang.Object)
+     * com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object)
      */
     public Object addItemAfter(Object previousItemId)
             throws UnsupportedOperationException {

src/com/itmill/toolkit/data/util/FilesystemContainer.java → src/com/vaadin/data/util/FilesystemContainer.java

@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -18,11 +18,11 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.service.FileTypeResolver;
-import com.itmill.toolkit.terminal.Resource;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.service.FileTypeResolver;
+import com.vaadin.terminal.Resource;
 
 /**
  * A hierarchical container wrapper for a filesystem.
@@ -713,7 +713,7 @@ public class FilesystemContainer implements Container.Hierarchical {
         /**
          * Filesystem container does not support adding new properties.
          * 
-         * @see com.itmill.toolkit.data.Item#addItemProperty(Object, Property)
+         * @see com.vaadin.data.Item#addItemProperty(Object, Property)
          */
         public boolean addItemProperty(Object id, Property property)
                 throws UnsupportedOperationException {
@@ -724,7 +724,7 @@ public class FilesystemContainer implements Container.Hierarchical {
         /**
          * Filesystem container does not support removing properties.
          * 
-         * @see com.itmill.toolkit.data.Item#removeItemProperty(Object)
+         * @see com.vaadin.data.Item#removeItemProperty(Object)
          */
         public boolean removeItemProperty(Object id)
                 throws UnsupportedOperationException {
@@ -829,7 +829,7 @@ public class FilesystemContainer implements Container.Hierarchical {
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container#addContainerProperty(java.lang.Object,
+     * com.vaadin.data.Container#addContainerProperty(java.lang.Object,
      * java.lang.Class, java.lang.Object)
      */
     public boolean addContainerProperty(Object propertyId, Class type,
@@ -841,7 +841,7 @@ public class FilesystemContainer implements Container.Hierarchical {
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#addItem()
+     * @see com.vaadin.data.Container#addItem()
      */
     public Object addItem() throws UnsupportedOperationException {
         throw new UnsupportedOperationException(
@@ -851,7 +851,7 @@ public class FilesystemContainer implements Container.Hierarchical {
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#addItem(java.lang.Object)
+     * @see com.vaadin.data.Container#addItem(java.lang.Object)
      */
     public Item addItem(Object itemId) throws UnsupportedOperationException {
         throw new UnsupportedOperationException(
@@ -861,7 +861,7 @@ public class FilesystemContainer implements Container.Hierarchical {
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#removeAllItems()
+     * @see com.vaadin.data.Container#removeAllItems()
      */
     public boolean removeAllItems() throws UnsupportedOperationException {
         throw new UnsupportedOperationException(
@@ -871,7 +871,7 @@ public class FilesystemContainer implements Container.Hierarchical {
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#removeItem(java.lang.Object)
+     * @see com.vaadin.data.Container#removeItem(java.lang.Object)
      */
     public boolean removeItem(Object itemId)
             throws UnsupportedOperationException {
@@ -883,7 +883,7 @@ public class FilesystemContainer implements Container.Hierarchical {
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container#removeContainerProperty(java.lang.Object
+     * com.vaadin.data.Container#removeContainerProperty(java.lang.Object
      * )
      */
     public boolean removeContainerProperty(Object propertyId)

src/com/itmill/toolkit/data/util/Filter.java → src/com/vaadin/data/util/Filter.java

@@ -1,13 +1,13 @@
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.io.Serializable;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
 
 /**
  * A default filter that can be used to implement
- * {@link com.itmill.toolkit.data.Container.Filterable}.
+ * {@link com.vaadin.data.Container.Filterable}.
  * 
  * @since 5.4
  */

src/com/itmill/toolkit/data/util/HierarchicalContainer.java → src/com/vaadin/data/util/HierarchicalContainer.java

@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -10,8 +10,8 @@ import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
 
 /**
  * A specialized Container whose contents can be accessed like it was a
@@ -110,7 +110,7 @@ public class HierarchicalContainer extends IndexedContainer implements
      * this method fails and <code>false</code> is returned; the children must
      * be first explicitly removed with
      * {@link #setParent(Object itemId, Object newParentId)} or
-     * {@link com.itmill.toolkit.data.Container#removeItem(Object itemId)}.
+     * {@link com.vaadin.data.Container#removeItem(Object itemId)}.
      * </p>
      * 
      * @param itemId
@@ -236,7 +236,7 @@ public class HierarchicalContainer extends IndexedContainer implements
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.util.IndexedContainer#addItem()
+     * @see com.vaadin.data.util.IndexedContainer#addItem()
      */
     @Override
     public Object addItem() {
@@ -252,7 +252,7 @@ public class HierarchicalContainer extends IndexedContainer implements
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.util.IndexedContainer#addItem(java.lang.Object)
+     * com.vaadin.data.util.IndexedContainer#addItem(java.lang.Object)
      */
     @Override
     public Item addItem(Object itemId) {
@@ -266,7 +266,7 @@ public class HierarchicalContainer extends IndexedContainer implements
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.util.IndexedContainer#removeAllItems()
+     * @see com.vaadin.data.util.IndexedContainer#removeAllItems()
      */
     @Override
     public boolean removeAllItems() {
@@ -285,7 +285,7 @@ public class HierarchicalContainer extends IndexedContainer implements
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.util.IndexedContainer#removeItem(java.lang.Object
+     * com.vaadin.data.util.IndexedContainer#removeItem(java.lang.Object
      * )
      */
     @Override

src/com/itmill/toolkit/data/util/IndexedContainer.java → src/com/vaadin/data/util/IndexedContainer.java

@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
@@ -20,9 +20,9 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
 
 /**
  * An implementation of the <code>{@link Container.Indexed}</code> interface
@@ -38,7 +38,7 @@ import com.itmill.toolkit.data.Property;
  * <li>Sends all needed events on content changes.
  * </ul>
  * 
- * @see com.itmill.toolkit.data.Container
+ * @see com.vaadin.data.Container
  * 
  * @author IT Mill Ltd.
  * @version
@@ -143,7 +143,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#getItem(java.lang.Object)
+     * @see com.vaadin.data.Container#getItem(java.lang.Object)
      */
     public Item getItem(Object itemId) {
 
@@ -158,7 +158,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#getItemIds()
+     * @see com.vaadin.data.Container#getItemIds()
      */
     public Collection getItemIds() {
         if (filteredItemIds != null) {
@@ -170,7 +170,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#getContainerPropertyIds()
+     * @see com.vaadin.data.Container#getContainerPropertyIds()
      */
     public Collection getContainerPropertyIds() {
         return Collections.unmodifiableCollection(propertyIds);
@@ -191,7 +191,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container#getContainerProperty(java.lang.Object,
+     * com.vaadin.data.Container#getContainerProperty(java.lang.Object,
      * java.lang.Object)
      */
     public Property getContainerProperty(Object itemId, Object propertyId) {
@@ -211,7 +211,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#size()
+     * @see com.vaadin.data.Container#size()
      */
     public int size() {
         if (filteredItemIds == null) {
@@ -223,7 +223,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#containsId(java.lang.Object)
+     * @see com.vaadin.data.Container#containsId(java.lang.Object)
      */
     public boolean containsId(Object itemId) {
         if (itemId == null) {
@@ -239,7 +239,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container#addContainerProperty(java.lang.Object,
+     * com.vaadin.data.Container#addContainerProperty(java.lang.Object,
      * java.lang.Class, java.lang.Object)
      */
     public boolean addContainerProperty(Object propertyId, Class type,
@@ -282,7 +282,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#removeAllItems()
+     * @see com.vaadin.data.Container#removeAllItems()
      */
     public boolean removeAllItems() {
 
@@ -302,7 +302,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#addItem()
+     * @see com.vaadin.data.Container#addItem()
      */
     public Object addItem() {
 
@@ -318,7 +318,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#addItem(java.lang.Object)
+     * @see com.vaadin.data.Container#addItem(java.lang.Object)
      */
     public Item addItem(Object itemId) {
 
@@ -366,7 +366,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#removeItem(java.lang.Object)
+     * @see com.vaadin.data.Container#removeItem(java.lang.Object)
      */
     public boolean removeItem(Object itemId) {
 
@@ -387,7 +387,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container#removeContainerProperty(java.lang.Object
+     * com.vaadin.data.Container#removeContainerProperty(java.lang.Object
      * )
      */
     public boolean removeContainerProperty(Object propertyId) {
@@ -418,7 +418,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container.Ordered#firstItemId()
+     * @see com.vaadin.data.Container.Ordered#firstItemId()
      */
     public Object firstItemId() {
         try {
@@ -435,7 +435,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container.Ordered#lastItemId()
+     * @see com.vaadin.data.Container.Ordered#lastItemId()
      */
     public Object lastItemId() {
         try {
@@ -457,7 +457,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.Ordered#nextItemId(java.lang.Object)
+     * com.vaadin.data.Container.Ordered#nextItemId(java.lang.Object)
      */
     public Object nextItemId(Object itemId) {
         if (filteredItemIds != null) {
@@ -484,7 +484,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.Ordered#prevItemId(java.lang.Object)
+     * com.vaadin.data.Container.Ordered#prevItemId(java.lang.Object)
      */
     public Object prevItemId(Object itemId) {
         if (filteredItemIds != null) {
@@ -513,7 +513,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.Ordered#isFirstId(java.lang.Object)
+     * com.vaadin.data.Container.Ordered#isFirstId(java.lang.Object)
      */
     public boolean isFirstId(Object itemId) {
         if (filteredItemIds != null) {
@@ -530,7 +530,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container.Ordered#isLastId(java.lang.Object)
+     * @see com.vaadin.data.Container.Ordered#isLastId(java.lang.Object)
      */
     public boolean isLastId(Object itemId) {
         if (filteredItemIds != null) {
@@ -552,7 +552,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.Ordered#addItemAfter(java.lang.Object,
+     * com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object,
      * java.lang.Object)
      */
     public Item addItemAfter(Object previousItemId, Object newItemId) {
@@ -573,7 +573,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.Ordered#addItemAfter(java.lang.Object)
+     * com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object)
      */
     public Object addItemAfter(Object previousItemId) {
 
@@ -586,7 +586,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container.Indexed#getIdByIndex(int)
+     * @see com.vaadin.data.Container.Indexed#getIdByIndex(int)
      */
     public Object getIdByIndex(int index) {
 
@@ -612,7 +612,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.Indexed#indexOfId(java.lang.Object)
+     * com.vaadin.data.Container.Indexed#indexOfId(java.lang.Object)
      */
     public int indexOfId(Object itemId) {
         if (filteredItemIds != null) {
@@ -636,7 +636,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container.Indexed#addItemAt(int,
+     * @see com.vaadin.data.Container.Indexed#addItemAt(int,
      * java.lang.Object)
      */
     public Item addItemAt(int index, Object newItemId) {
@@ -666,7 +666,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container.Indexed#addItemAt(int)
+     * @see com.vaadin.data.Container.Indexed#addItemAt(int)
      */
     public Object addItemAt(int index) {
 
@@ -738,7 +738,7 @@ public class IndexedContainer implements Container.Indexed,
          * (non-Javadoc)
          * 
          * @see
-         * com.itmill.toolkit.data.Container.PropertySetChangeEvent#getContainer
+         * com.vaadin.data.Container.PropertySetChangeEvent#getContainer
          * ()
          */
         public Container getContainer() {
@@ -769,7 +769,7 @@ public class IndexedContainer implements Container.Indexed,
          * (non-Javadoc)
          * 
          * @see
-         * com.itmill.toolkit.data.Container.ItemSetChangeEvent#getContainer()
+         * com.vaadin.data.Container.ItemSetChangeEvent#getContainer()
          */
         public Container getContainer() {
             return (Container) getSource();
@@ -806,7 +806,7 @@ public class IndexedContainer implements Container.Indexed,
         /*
          * (non-Javadoc)
          * 
-         * @see com.itmill.toolkit.data.Property.ValueChangeEvent#getProperty()
+         * @see com.vaadin.data.Property.ValueChangeEvent#getProperty()
          */
         public Property getProperty() {
             return (Property) getSource();
@@ -818,8 +818,8 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.PropertySetChangeNotifier#addListener
-     * (com.itmill.toolkit.data.Container.PropertySetChangeListener)
+     * com.vaadin.data.Container.PropertySetChangeNotifier#addListener
+     * (com.vaadin.data.Container.PropertySetChangeListener)
      */
     public void addListener(Container.PropertySetChangeListener listener) {
         if (propertySetChangeListeners == null) {
@@ -832,8 +832,8 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.PropertySetChangeNotifier#removeListener
-     * (com.itmill.toolkit.data.Container.PropertySetChangeListener)
+     * com.vaadin.data.Container.PropertySetChangeNotifier#removeListener
+     * (com.vaadin.data.Container.PropertySetChangeListener)
      */
     public void removeListener(Container.PropertySetChangeListener listener) {
         if (propertySetChangeListeners != null) {
@@ -845,7 +845,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.ItemSetChangeNotifier#addListener(com
+     * com.vaadin.data.Container.ItemSetChangeNotifier#addListener(com
      * .itmill.toolkit.data.Container.ItemSetChangeListener)
      */
     public void addListener(Container.ItemSetChangeListener listener) {
@@ -859,8 +859,8 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.ItemSetChangeNotifier#removeListener
-     * (com.itmill.toolkit.data.Container.ItemSetChangeListener)
+     * com.vaadin.data.Container.ItemSetChangeNotifier#removeListener
+     * (com.vaadin.data.Container.ItemSetChangeListener)
      */
     public void removeListener(Container.ItemSetChangeListener listener) {
         if (itemSetChangeListeners != null) {
@@ -872,7 +872,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Property.ValueChangeNotifier#addListener(com.
+     * com.vaadin.data.Property.ValueChangeNotifier#addListener(com.
      * itmill.toolkit.data.Property.ValueChangeListener)
      */
     public void addListener(Property.ValueChangeListener listener) {
@@ -886,7 +886,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Property.ValueChangeNotifier#removeListener(com
+     * com.vaadin.data.Property.ValueChangeNotifier#removeListener(com
      * .itmill.toolkit.data.Property.ValueChangeListener)
      */
     public void removeListener(Property.ValueChangeListener listener) {
@@ -1037,7 +1037,7 @@ public class IndexedContainer implements Container.Indexed,
     /* Internal Item and Property implementations */
 
     /*
-     * A class implementing the com.itmill.toolkit.data.Item interface to be
+     * A class implementing the com.vaadin.data.Item interface to be
      * contained in the list. @author IT Mill Ltd.
      * 
      * @version @VERSION@
@@ -1070,7 +1070,7 @@ public class IndexedContainer implements Container.Indexed,
         /*
          * (non-Javadoc)
          * 
-         * @see com.itmill.toolkit.data.Item#getItemProperty(java.lang.Object)
+         * @see com.vaadin.data.Item#getItemProperty(java.lang.Object)
          */
         public Property getItemProperty(Object id) {
             return new IndexedContainerProperty(itemId, id);
@@ -1144,7 +1144,7 @@ public class IndexedContainer implements Container.Indexed,
          * properties at container level. See
          * {@link IndexedContainer#addContainerProperty(Object, Class, Object)}
          * 
-         * @see com.itmill.toolkit.data.Item#addProperty(Object, Property)
+         * @see com.vaadin.data.Item#addProperty(Object, Property)
          */
         public boolean addItemProperty(Object id, Property property)
                 throws UnsupportedOperationException {
@@ -1157,7 +1157,7 @@ public class IndexedContainer implements Container.Indexed,
          * properties at container level. See
          * {@link IndexedContainer#removeContainerProperty(Object)}
          * 
-         * @see com.itmill.toolkit.data.Item#removeProperty(Object)
+         * @see com.vaadin.data.Item#removeProperty(Object)
          */
         public boolean removeItemProperty(Object id)
                 throws UnsupportedOperationException {
@@ -1215,7 +1215,7 @@ public class IndexedContainer implements Container.Indexed,
         /*
          * (non-Javadoc)
          * 
-         * @see com.itmill.toolkit.data.Property#getType()
+         * @see com.vaadin.data.Property#getType()
          */
         public Class getType() {
             return (Class) types.get(propertyId);
@@ -1224,7 +1224,7 @@ public class IndexedContainer implements Container.Indexed,
         /*
          * (non-Javadoc)
          * 
-         * @see com.itmill.toolkit.data.Property#getValue()
+         * @see com.vaadin.data.Property#getValue()
          */
         public Object getValue() {
             return ((Hashtable) items.get(itemId)).get(propertyId);
@@ -1233,7 +1233,7 @@ public class IndexedContainer implements Container.Indexed,
         /*
          * (non-Javadoc)
          * 
-         * @see com.itmill.toolkit.data.Property#isReadOnly()
+         * @see com.vaadin.data.Property#isReadOnly()
          */
         public boolean isReadOnly() {
             return readOnlyProperties.contains(this);
@@ -1242,7 +1242,7 @@ public class IndexedContainer implements Container.Indexed,
         /*
          * (non-Javadoc)
          * 
-         * @see com.itmill.toolkit.data.Property#setReadOnly(boolean)
+         * @see com.vaadin.data.Property#setReadOnly(boolean)
          */
         public void setReadOnly(boolean newStatus) {
             if (newStatus) {
@@ -1255,7 +1255,7 @@ public class IndexedContainer implements Container.Indexed,
         /*
          * (non-Javadoc)
          * 
-         * @see com.itmill.toolkit.data.Property#setValue(java.lang.Object)
+         * @see com.vaadin.data.Property#setValue(java.lang.Object)
          */
         public void setValue(Object newValue)
                 throws Property.ReadOnlyException, Property.ConversionException {
@@ -1349,8 +1349,8 @@ public class IndexedContainer implements Container.Indexed,
          * (non-Javadoc)
          * 
          * @see
-         * com.itmill.toolkit.data.Property.ValueChangeNotifier#addListener(
-         * com.itmill.toolkit.data.Property.ValueChangeListener)
+         * com.vaadin.data.Property.ValueChangeNotifier#addListener(
+         * com.vaadin.data.Property.ValueChangeListener)
          */
         public void addListener(Property.ValueChangeListener listener) {
             addSinglePropertyChangeListener(propertyId, itemId, listener);
@@ -1360,8 +1360,8 @@ public class IndexedContainer implements Container.Indexed,
          * (non-Javadoc)
          * 
          * @see
-         * com.itmill.toolkit.data.Property.ValueChangeNotifier#removeListener
-         * (com.itmill.toolkit.data.Property.ValueChangeListener)
+         * com.vaadin.data.Property.ValueChangeNotifier#removeListener
+         * (com.vaadin.data.Property.ValueChangeListener)
          */
         public void removeListener(Property.ValueChangeListener listener) {
             removeSinglePropertyChangeListener(propertyId, itemId, listener);
@@ -1376,7 +1376,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container.Sortable#sort(java.lang.Object[],
+     * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[],
      * boolean[])
      */
     public void sort(Object[] propertyId, boolean[] ascending) {
@@ -1420,7 +1420,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.Sortable#getSortableContainerPropertyIds
+     * com.vaadin.data.Container.Sortable#getSortableContainerPropertyIds
      * ()
      */
     public Collection getSortableContainerPropertyIds() {

src/com/itmill/toolkit/data/util/MethodProperty.java → src/com/vaadin/data/util/MethodProperty.java

@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
@@ -10,7 +10,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Property;
 
 /**
  * <p>

src/com/itmill/toolkit/data/util/ObjectProperty.java → src/com/vaadin/data/util/ObjectProperty.java

@@ -2,17 +2,17 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.lang.reflect.Constructor;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Property;
 
 /**
  * A simple data object containing one typed value. This class is a
  * straightforward implementation of the the
- * {@link com.itmill.toolkit.data.Property} interface.
+ * {@link com.vaadin.data.Property} interface.
  * 
  * @author IT Mill Ltd.
  * @version

src/com/itmill/toolkit/data/util/PropertyFormatter.java → src/com/vaadin/data/util/PropertyFormatter.java

@@ -1,8 +1,8 @@
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Property;
 
 /**
  * Formatting proxy for a property.
@@ -363,7 +363,7 @@ public abstract class PropertyFormatter implements Property,
      * This should not be called directly.
      */
     public void valueChange(
-            com.itmill.toolkit.data.Property.ValueChangeEvent event) {
+            com.vaadin.data.Property.ValueChangeEvent event) {
         fireValueChange();
     }
 
@@ -373,7 +373,7 @@ public abstract class PropertyFormatter implements Property,
      * This should not be called directly.
      */
     public void readOnlyStatusChange(
-            com.itmill.toolkit.data.Property.ReadOnlyStatusChangeEvent event) {
+            com.vaadin.data.Property.ReadOnlyStatusChangeEvent event) {
         fireReadOnlyStatusChange();
     }
 

src/com/itmill/toolkit/data/util/PropertysetItem.java → src/com/vaadin/data/util/PropertysetItem.java

@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -11,8 +11,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
 
 /**
  * Class for handling a set of identified Properties. The elements contained in

src/com/itmill/toolkit/data/util/QueryContainer.java → src/com/vaadin/data/util/QueryContainer.java

@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -14,9 +14,9 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
 
 /**
  * <p>
@@ -36,10 +36,10 @@ import com.itmill.toolkit.data.Property;
  * <p>
  * Note : If data in the tables gets modified, Container will not get reflected
  * with the updates, we have to explicity invoke QueryContainer.refresh method.
- * {@link com.itmill.toolkit.data.util.QueryContainer#refresh() refresh()}
+ * {@link com.vaadin.data.util.QueryContainer#refresh() refresh()}
  * </p>
  * 
- * @see com.itmill.toolkit.data.Container
+ * @see com.vaadin.data.Container
  * 
  * @author IT Mill Ltd.
  * @version

src/com/itmill/toolkit/data/util/package.html → src/com/vaadin/data/util/package.html

@@ -9,21 +9,21 @@
 <p>Provides various utility classes that implement the data layer
 functionality.</p>
 
-<p>The first {@link com.itmill.toolkit.data.Property Property} class,
-{@link com.itmill.toolkit.data.util.ObjectProperty ObjectProperty}, provides
+<p>The first {@link com.vaadin.data.Property Property} class,
+{@link com.vaadin.data.util.ObjectProperty ObjectProperty}, provides
 a simple class containing a typed data value. The second,
-{@link com.itmill.toolkit.data.util.MethodProperty MethodProperty}, provides
+{@link com.vaadin.data.util.MethodProperty MethodProperty}, provides
 a way to bind a field of an object to the Property interface using the
 accessor methods for the field.</p>
 
 <p>The next level of the data layer, the
-{@link com.itmill.toolkit.data.Item Item}, is implemented by 
-{@link com.itmill.toolkit.data.util.BeanItem BeanItem}, though it is only a
+{@link com.vaadin.data.Item Item}, is implemented by 
+{@link com.vaadin.data.util.BeanItem BeanItem}, though it is only a
 simple wrapper to the former to provide the Item interface for any regular
 Java Bean.</p>
 
-<p>The third level, the {@link com.itmill.toolkit.data.Container Container},
-has several implementations in the {@link com.itmill.toolkit.data.util}
+<p>The third level, the {@link com.vaadin.data.Container Container},
+has several implementations in the {@link com.vaadin.data.util}
 package.</p>
 
 <!-- <h2>Package Specification</h2> -->

src/com/itmill/toolkit/data/validator/AbstractStringValidator.java → src/com/vaadin/data/validator/AbstractStringValidator.java

@@ -1,8 +1,8 @@
-package com.itmill.toolkit.data.validator;
+package com.vaadin.data.validator;
 
 /**
  * Validator base class for validating strings. See
- * {@link com.itmill.toolkit.data.validator.AbstractValidator} for more
+ * {@link com.vaadin.data.validator.AbstractValidator} for more
  * information.
  * 
  * <p>

src/com/itmill/toolkit/data/validator/AbstractValidator.java → src/com/vaadin/data/validator/AbstractValidator.java

@@ -1,10 +1,10 @@
-package com.itmill.toolkit.data.validator;
+package com.vaadin.data.validator;
 
-import com.itmill.toolkit.data.Validator;
+import com.vaadin.data.Validator;
 
 /**
  * Default Validator base class. See
- * {@link com.itmill.toolkit.data.validator.Validator} for more information.
+ * {@link com.vaadin.data.validator.Validator} for more information.
  * <p>
  * If the validation fails, the exception thrown contains the error message with
  * its argument 0 replaced with the toString() of the object being validated.

src/com/itmill/toolkit/data/validator/CompositeValidator.java → src/com/vaadin/data/validator/CompositeValidator.java

@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.validator;
+package com.vaadin.data.validator;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.itmill.toolkit.data.Validator;
+import com.vaadin.data.Validator;
 
 /**
  * The <code>CompositeValidator</code> allows you to chain (compose) many

src/com/itmill/toolkit/data/validator/DoubleValidator.java → src/com/vaadin/data/validator/DoubleValidator.java

@@ -1,8 +1,8 @@
-package com.itmill.toolkit.data.validator;
+package com.vaadin.data.validator;
 
 /**
  * String validator for a double precision floating point number. See
- * {@link com.itmill.toolkit.data.validator.AbstractStringValidator} for more
+ * {@link com.vaadin.data.validator.AbstractStringValidator} for more
  * information.
  * 
  * @author IT Mill Ltd.

src/com/itmill/toolkit/data/validator/EmailValidator.java → src/com/vaadin/data/validator/EmailValidator.java

@@ -1,11 +1,11 @@
-package com.itmill.toolkit.data.validator;
+package com.vaadin.data.validator;
 
 /**
  * String validator for e-mail addresses. The e-mail address syntax is not
  * complete according to RFC 822 but handles the vast majority of valid e-mail
  * addresses correctly.
  * 
- * See {@link com.itmill.toolkit.data.validator.AbstractStringValidator} for
+ * See {@link com.vaadin.data.validator.AbstractStringValidator} for
  * more information.
  * 
  * @author IT Mill Ltd.

src/com/itmill/toolkit/data/validator/IntegerValidator.java → src/com/vaadin/data/validator/IntegerValidator.java

@@ -1,8 +1,8 @@
-package com.itmill.toolkit.data.validator;
+package com.vaadin.data.validator;
 
 /**
  * String validator for integers. See
- * {@link com.itmill.toolkit.data.validator.AbstractStringValidator} for more
+ * {@link com.vaadin.data.validator.AbstractStringValidator} for more
  * information.
  * 
  * @author IT Mill Ltd.

src/com/itmill/toolkit/data/validator/NullValidator.java → src/com/vaadin/data/validator/NullValidator.java

@@ -2,9 +2,9 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.validator;
+package com.vaadin.data.validator;
 
-import com.itmill.toolkit.data.Validator;
+import com.vaadin.data.Validator;
 
 /**
  * This validator is used for validating properties that do or do not allow null

src/com/itmill/toolkit/data/validator/RegexpValidator.java → src/com/vaadin/data/validator/RegexpValidator.java

@@ -1,4 +1,4 @@
-package com.itmill.toolkit.data.validator;
+package com.vaadin.data.validator;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -12,7 +12,7 @@ import java.util.regex.Pattern;
  * {@link java.util.regex.Pattern#sum}
  * </p>
  * <p>
- * See {@link com.itmill.toolkit.data.validator.AbstractStringValidator} for
+ * See {@link com.vaadin.data.validator.AbstractStringValidator} for
  * more information.
  * </p>
  * 

src/com/itmill/toolkit/data/validator/StringLengthValidator.java → src/com/vaadin/data/validator/StringLengthValidator.java

@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.validator;
+package com.vaadin.data.validator;
 
 /**
  * This <code>StringLengthValidator</code> is used to validate the length of

src/com/itmill/toolkit/demo/Calc.java → src/com/vaadin/demo/Calc.java

@@ -1,14 +1,14 @@
-package com.itmill.toolkit.demo;
+package com.vaadin.demo;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
 
 // Calculator is created by extending Application-class. Application is
 // deployed by adding ApplicationServlet to web.xml and this class as
 // "application" parameter to the servlet.
-public class Calc extends com.itmill.toolkit.Application {
+public class Calc extends com.vaadin.Application {
 
     // Calculation data model is automatically stored in the user session
     private double current = 0.0;

src/com/itmill/toolkit/demo/HelloWorld.java → src/com/vaadin/demo/HelloWorld.java

@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo;
+package com.vaadin.demo;
 
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
 
-public class HelloWorld extends com.itmill.toolkit.Application {
+public class HelloWorld extends com.vaadin.Application {
 
     /**
      * Init is invoked on application load (when a user accesses the application

src/com/itmill/toolkit/demo/PortletDemo.java → src/com/vaadin/demo/PortletDemo.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.itmill.toolkit.demo;
+package com.vaadin.demo;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -15,15 +15,15 @@ import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 import javax.portlet.WindowState;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.gwt.server.PortletApplicationContext;
-import com.itmill.toolkit.terminal.gwt.server.PortletApplicationContext.PortletListener;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Window.Notification;
+import com.vaadin.Application;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.gwt.server.PortletApplicationContext;
+import com.vaadin.terminal.gwt.server.PortletApplicationContext.PortletListener;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Window.Notification;
 
 /**
  * @author marc

src/com/itmill/toolkit/demo/SimpleAddressBook.java → src/com/vaadin/demo/SimpleAddressBook.java

@@ -1,18 +1,18 @@
-package com.itmill.toolkit.demo;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.demo;
+
+import com.vaadin.Application;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class SimpleAddressBook extends Application {
 

src/com/itmill/toolkit/demo/ToolkitTunesLayout.java → src/com/vaadin/demo/ToolkitTunesLayout.java

@@ -1,21 +1,21 @@
-package com.itmill.toolkit.demo;
+package com.vaadin.demo;
 
 import java.util.Random;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.Slider;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Window.Notification;
+import com.vaadin.Application;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.Slider;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Window.Notification;
 
 /**
  * Sample application layout, similar (almost identical) to Apple iTunes.

src/com/itmill/toolkit/demo/colorpicker/ColorPicker.java → src/com/vaadin/demo/colorpicker/ColorPicker.java

@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.colorpicker;
+package com.vaadin.demo.colorpicker;
 
 import java.util.Map;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.ui.AbstractField;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.ui.AbstractField;
 
 public class ColorPicker extends AbstractField {
 

src/com/itmill/toolkit/demo/colorpicker/ColorPickerApplication.java → src/com/vaadin/demo/colorpicker/ColorPickerApplication.java

@@ -2,20 +2,20 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.colorpicker;
+package com.vaadin.demo.colorpicker;
 
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * Demonstration application that shows how to use a simple custom client-side
  * GWT component, the ColorPicker.
  */
-public class ColorPickerApplication extends com.itmill.toolkit.Application {
+public class ColorPickerApplication extends com.vaadin.Application {
     Window main = new Window("Color Picker Demo");
 
     /* The custom component. */

src/com/vaadin/demo/colorpicker/gwt/ColorPickerWidgetSet.gwt.xml

@@ -0,0 +1,11 @@
+<module>
+	<!-- Inherit DefaultWidgetSet -->
+	<inherits name="com.vaadin.terminal.gwt.DefaultWidgetSet" /> 
+	
+	<!-- WidgetSet default theme -->	
+	<stylesheet src="colorpicker/styles.css"/>
+
+	<!-- Entry point -->
+	<entry-point class="com.vaadin.demo.colorpicker.gwt.client.ColorPickerWidgetSet"/>
+  
+</module>

src/com/itmill/toolkit/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java → src/com/vaadin/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java

@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.colorpicker.gwt.client;
+package com.vaadin.demo.colorpicker.gwt.client;
 
-import com.itmill.toolkit.demo.colorpicker.gwt.client.ui.IColorPicker;
-import com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.demo.colorpicker.gwt.client.ui.IColorPicker;
+import com.vaadin.terminal.gwt.client.DefaultWidgetSet;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class ColorPickerWidgetSet extends DefaultWidgetSet {
     /** Resolves UIDL tag name to widget class. */

src/com/itmill/toolkit/demo/colorpicker/gwt/client/ui/GwtColorPicker.java → src/com/vaadin/demo/colorpicker/gwt/client/ui/GwtColorPicker.java

@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.colorpicker.gwt.client.ui;
+package com.vaadin.demo.colorpicker.gwt.client.ui;
 
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;

src/com/itmill/toolkit/demo/colorpicker/gwt/client/ui/IColorPicker.java → src/com/vaadin/demo/colorpicker/gwt/client/ui/IColorPicker.java

@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.colorpicker.gwt.client.ui;
+package com.vaadin.demo.colorpicker.gwt.client.ui;
 
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class IColorPicker extends GwtColorPicker implements Paintable {
 

src/com/itmill/toolkit/demo/coverflow/Coverflow.java → src/com/vaadin/demo/coverflow/Coverflow.java

@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.coverflow;
+package com.vaadin.demo.coverflow;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.ui.AbstractSelect;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.ui.AbstractSelect;
 
 public class Coverflow extends AbstractSelect {
 

src/com/itmill/toolkit/demo/coverflow/CoverflowApplication.html → src/com/vaadin/demo/coverflow/CoverflowApplication.html

@@ -18,7 +18,7 @@
   <!-- start source code -->
    <td nowrap="nowrap" valign="top" align="left">
     <code>
-<font color="#7f0055"><b>package&nbsp;</b></font><font color="#000000">com.itmill.toolkit.demo.coverflow;</font><br />
+<font color="#7f0055"><b>package&nbsp;</b></font><font color="#000000">com.vaadin.demo.coverflow;</font><br />
 <font color="#ffffff"></font><br />
 <font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">java.io.BufferedReader;</font><br />
 <font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">java.io.FileInputStream;</font><br />
@@ -31,19 +31,19 @@
 <font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">java.net.URL;</font><br />
 <font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">java.nio.CharBuffer;</font><br />
 <font color="#ffffff"></font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.data.Property;</font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.terminal.Resource;</font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.terminal.Sizeable;</font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.terminal.ThemeResource;</font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.ui.Button;</font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.ui.Embedded;</font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.ui.ExpandLayout;</font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.ui.Label;</font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.ui.Window;</font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.ui.Button.ClickEvent;</font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.ui.Layout.AlignmentHandler;</font><br />
-<font color="#ffffff"></font><br />
-<font color="#7f0055"><b>public&nbsp;class&nbsp;</b></font><font color="#000000">CoverflowApplication&nbsp;</font><font color="#7f0055"><b>extends&nbsp;</b></font><font color="#000000">com.itmill.toolkit.Application&nbsp;</font><font color="#000000">{</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.data.Property;</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.terminal.Resource;</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.terminal.Sizeable;</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.terminal.ThemeResource;</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.ui.Button;</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.ui.Embedded;</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.ui.ExpandLayout;</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.ui.Label;</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.ui.Window;</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.ui.Button.ClickEvent;</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.ui.Layout.AlignmentHandler;</font><br />
+<font color="#ffffff"></font><br />
+<font color="#7f0055"><b>public&nbsp;class&nbsp;</b></font><font color="#000000">CoverflowApplication&nbsp;</font><font color="#7f0055"><b>extends&nbsp;</b></font><font color="#000000">com.vaadin.Application&nbsp;</font><font color="#000000">{</font><br />
 <font color="#ffffff"></font><br />
 <font color="#ffffff">&nbsp;&nbsp;</font><font color="#000000">Coverflow&nbsp;covers&nbsp;=&nbsp;</font><font color="#7f0055"><b>new&nbsp;</b></font><font color="#000000">Coverflow</font><font color="#000000">()</font><font color="#000000">;</font><br />
 <font color="#ffffff"></font><br />

src/com/itmill/toolkit/demo/coverflow/CoverflowApplication.java → src/com/vaadin/demo/coverflow/CoverflowApplication.java

@@ -2,26 +2,26 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.coverflow;
+package com.vaadin.demo.coverflow;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-
-public class CoverflowApplication extends com.itmill.toolkit.Application {
+import com.vaadin.data.Property;
+import com.vaadin.terminal.Resource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+
+public class CoverflowApplication extends com.vaadin.Application {
 
     Coverflow covers = new Coverflow();
 

src/com/vaadin/demo/coverflow/gwt/CoverflowWidgetSet.gwt.xml

@@ -0,0 +1,8 @@
+<module>
+	<!-- Inherit the NoEntry version to avoid multiple entrypoints -->
+	<inherits name="com.vaadin.terminal.gwt.DefaultWidgetSetNoEntry" /> 
+
+	<!-- Entry point -->
+	<entry-point class="com.vaadin.demo.coverflow.gwt.client.CoverflowWidgetSet"/>
+  
+</module>

src/com/itmill/toolkit/demo/coverflow/gwt/client/CoverflowWidgetSet.java → src/com/vaadin/demo/coverflow/gwt/client/CoverflowWidgetSet.java

@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.coverflow.gwt.client;
+package com.vaadin.demo.coverflow.gwt.client;
 
-import com.itmill.toolkit.demo.coverflow.gwt.client.ui.ICoverflow;
-import com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.demo.coverflow.gwt.client.ui.ICoverflow;
+import com.vaadin.terminal.gwt.client.DefaultWidgetSet;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class CoverflowWidgetSet extends DefaultWidgetSet {
     /** Creates a widget according to its class name. */

src/com/itmill/toolkit/demo/coverflow/gwt/client/ui/ICoverflow.java → src/com/vaadin/demo/coverflow/gwt/client/ui/ICoverflow.java

@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
  
-package com.itmill.toolkit.demo.coverflow.gwt.client.ui;
+package com.vaadin.demo.coverflow.gwt.client.ui;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -11,9 +11,9 @@ import java.util.Iterator;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HTML;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class ICoverflow extends Composite implements Paintable {
     private String uidlId;
@@ -209,11 +209,11 @@ public class ICoverflow extends Composite implements Paintable {
           	var coverflow = $wnd.itmill.coverflow;
           	
           coverflow['getCovers_' + id] = function() {                
-             	app.@com.itmill.toolkit.demo.coverflow.gwt.client.ui.ICoverflow::getCovers()();
+             	app.@com.vaadin.demo.coverflow.gwt.client.ui.ICoverflow::getCovers()();
           };   
           
          	coverflow['setCurrent_' + id] = function(selected) {
-             	app.@com.itmill.toolkit.demo.coverflow.gwt.client.ui.ICoverflow::setCover(Ljava/lang/String;)(selected);
+             	app.@com.vaadin.demo.coverflow.gwt.client.ui.ICoverflow::setCover(Ljava/lang/String;)(selected);
           };
           
           $wnd.itmill.coverflow = coverflow;