Merge remote-tracking branch 'origin/feature/mavenize' to master

Change-Id: I7dadf3a94372a560529ed5b31cd062977c5ed802

5755 files changed, 6485 insertions, 4538 deletions

diff --git a/.classpath b/.classpath
index 517b236661..027a399de8 100644
--- a/.classpath
+++ b/.classpath
@@ -1,31 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="server/tests/src"/>
-	<classpathentry kind="src" path="client/tests/src"/>
-	<classpathentry kind="src" path="shared/tests/src"/>
-	<classpathentry kind="src" path="client/src"/>
-	<classpathentry kind="src" path="server/src"/>
-	<classpathentry kind="src" path="client-compiler/src"/>
-	<classpathentry kind="src" path="client-compiler/tests/src"/>
-	<classpathentry kind="src" path="uitest/src"/>
-	<classpathentry kind="src" path="buildhelpers/src"/>
-	<classpathentry kind="src" path="shared/src"/>
-	<classpathentry kind="src" path="widgets/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=client%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles="/>
-	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=server%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=build.properties"/>
-	<classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=shared%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles="/>
-	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=client-compiler%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=build.properties"/>
-	<classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=uitest%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D"/>
-	<classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=push%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles="/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=buildhelpers%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=build.properties"/>
-	<classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=gwt%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D"/>
-	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;ivyXmlPath=widgets%2Fivy.xml&amp;confs=ide&amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=build.properties"/>
-	<classpathentry kind="output" path="build/classes"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
index bdc0e45be5..405841c547 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,11 @@
+# Eclipse
+.classpath
+.project
+.settings
 
 # /
-/.classpath
 /.cvsignore
-/.project
 /.tomcatplugin
-/.settings
 /work
 /.gwt-cache
 /.externalToolBuilders
@@ -83,6 +84,22 @@ scripts/*.pyc
 # build result folders
 */result
 result
+target/
+all/target/
+push/target/
+shared/target/
+server/target/
+client/target/
+client-compiler/target/
+buildhelpers/target/
+client-compiled/target/
+liferay/target/
+themes/target/
+uitest/target/
+widgets/target/
 
 .sass-cache
-phantomjsdriver.log
\ No newline at end of file
+phantomjsdriver.log
+
+*.iml
+.idea
diff --git a/.project b/.project
index a0a79fbcec..4539834a7d 100644
--- a/.project
+++ b/.project
@@ -20,12 +20,17 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.apache.ivyde.eclipse.ivynature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000000..f897a7f1cb
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/README.md b/README.md
index 0425199ae0..8644022e0b 100644
--- a/README.md
+++ b/README.md
@@ -5,73 +5,39 @@ Vaadin
 For instructions about _using_ Vaadin to develop applications, please refer to
 https://vaadin.com/learn
 
-To contribute, first refer to https://vaadin.com/wiki/-/wiki/Main/Contributing+Code
+To contribute, first refer to [Contributing Code](https://vaadin.com/wiki/-/wiki/Main/Contributing+Code)
 for general instructions and requirements for contributing code to the Vaadin framework.
 
-Instructions on how to set up a working environment for developing the Vaadin
+Instructions on how to set up a working environments for developing the Vaadin
 framework follow below.
 
-Quick Setup
+Eclipse Quick Setup
 ======
-1. <code>git clone https://github.com/vaadin/vaadin.git</code>
-1. Install IvyDE, including Ant Tasks, if needed (http://www.apache.org/dist/ant/ivyde/updatesite)
-1. Import the project into Eclipse
-1. Run build/ide.xml in Eclipse
-
-For more details, see below
-
-Cloning the project repositories
-======
-The Vaadin repository can be cloned using
-<pre><code>git clone https://github.com/vaadin/vaadin.git</code></pre>
-
-or using your favorite Git tool.
-
+1. Run
+<code>git clone https://github.com/vaadin/vaadin.git</code>
+command or clone the repository your favorite Git tool.
 If using Windows, you might want to add these Git settings: `core.autocrlf=false` and `core.fileMode=false`.
-
-Setting up Eclipse to Develop Vaadin 7
-=========
-
-Start Eclipse
--------------
-Start Eclipse with the workspace you would like to use. It is usually a good idea to use the parent folder of the Git repository as the workspace folder.
-
-Install IvyDE
----------
-You'll need the Apache Ivy plug-in for Eclipse to build the project:
-
-1. Go to *Help* -> *Install New Software...*
-1. Enter `http://www.apache.org/dist/ant/ivyde/updatesite` in the "Work with:" text field
-1. Select and install all items
-
-If you have installed IvyDE via the Eclipse Marketplace previously, **make sure** that you also have *Apache Ivy Ant Tasks* installed, which is not included in that IvyDE installation:
-
-1. Go to *Help* -> *Install New Software...*
-1. Click the hyperlink in the "What is already installed?" sentence near the bottom right-hand corner
-1. Verify that the list includes *Apache Ivy Ant Tasks*
-1. If it isn't included, follow the installation process above, but select only *Apache Ivy library* > *Apache Ivy Ant Tasks*
-
-
-Import the Project into the Workspace
-------------
-1. Do *File* -> *Import* -> *General* -> *Existing Projects into Workspace*
-![ImportProject](http://f.cl.ly/items/0G361519182v1z2T1o1O/Import.png "Import project")
+1. Run <code>mvn install</code> in the project root.
+Note that the first compilation takes a while to finish as maven downloads dependencies used in the projects.
+1. Start Eclipse with the workspace you would like to use. It is usually a good idea to use the parent folder of the Git repository as the workspace folder.
+1. Import the project into Eclipse as a maven project. Use *File* -> *Import* -> *Maven* -> *Existing Maven Projects*.
 1. Select the *vaadin* folder (where you cloned the project)
-1. Ensure the *vaadin* project is checked
-1. Click “finish” to complete the import of Vaadin Framework
+1. Click “Finish” to complete the import of Vaadin Framework
 
-The project should compile without further configuration. If the project does not compile without errors, choose *Ivy* -> *Resolve* from the vaadin project popup menu to ensure all dependencies have been resolved.
+Now the project should compile without further configuration.
 
-Note that the first compilation takes a while to finish as Ivy downloads dependencies used in the projects.
 
 Compiling the Default Widget Set and Themes
 --------
-Compile the default widget set by executing the default target in build/ide.xml in the vaadin project.
-In Eclipse this is done by opening build/ide.xml, right clicking on it and choosing *Run As* -> *Ant Build*.
-![CompileWidgetSet](http://cl.ly/image/1R43162b282e/build.png "Compiling the Widget Set")
+* Compile the default widgetset by running <code>install</code> maven goal in `vaadin-client-compiled` module root.
+In Eclipse this is done by right clicking on vaadin-client-compiled project it and choosing *Run As* -> *Maven Build...*.
+* Compile the default themes by running <code>install</code> maven goal in `vaadin-themes` module root.
+In Eclipse this is done by right clicking on vaadin-themes project it and choosing *Run As* -> *Maven Build...*.
 
 Set up extra workspace preferences
 --------
+TODO check if it's relevant
+=====
 The following preferences need to be set to keep the project consistent. You need to do this especially to be able to contribute changes to the project.
 
 1. Open *Window* -> *Preferences* (Windows) or *Eclipse* -> *Preferences* (Mac)
@@ -90,29 +56,53 @@ Indentation size: 4
 
 Running a UI test
 ------
+TODO
+=====
 The *vaadin* project includes an embedded Jetty (*com.vaadin.launcher.DevelopmentServerLauncher*) which is used for running the UI tests.
 In Eclipse you can launch it using the included launch configuration: Right click on *eclipse/Development Server (vaadin).launch" and select *Debug As* -> *Development Server (vaadin)*.
 
 This launches a Jetty on port 8888 which allows you to run any UI class in the project by opening http://localhost:8888/run/&lt;UI class name&gt;?restartApplication in your browser, e.g. [http://localhost:8888/run/com.vaadin.tests.components.label.LabelModes?restartApplication](http://localhost:8888/run/com.vaadin.tests.components.label.LabelModes?restartApplication) (Use ?restartApplication to ensure the correct UI is shown).
 
-Running JUnit tests
+Building a package
 =====
-The unit tests for the projects can be run using
-<pre><code>ant test</code></pre>
+The distribution files can be built by running maven goal
+<pre><code>maven clean install</code></pre>
+in the project root directory.
 
-Note that the included Vaadin TestBench (browser) tests require access to a TestBench cluster, currently only available internally at Vaadin Ltd.
+To use a specific version number, modify <code>&lt;version&gt;</code> tag in root pom.xml file.
+This goal runs all project tests TestBench tests, which require access to a a TestBench cluster, currently only available internally at Vaadin Ltd.
 
-Building a package
+Running TestBench tests
 =====
-The distribution files can be built in two steps.
-
-1. Unpack required gwt jars into the project
-<pre><code>ant -f gwt-files.xml unpack.gwt</code></pre>
-2. Build the project by running
-<pre><code>ant</code></pre>
-in the project root directory (add -Dvaadin.version=1.2.3 to use a specific version number).
+TODO
+=====
+The unit tests for the projects can be run using
+<pre><code>ant test</code></pre>
 
-Setting up other IDEs to Develop Vaadin 7
+Setting up IntelliJ IDEA to Develop Vaadin 7
 =========
+1. Intall and run IDEA. Ultimate Edition is better but Community Edition should also work.
+1. Ensure if Git and Maven plugins are installed, properly configured and enabled.
+1. Formatting settings _TODO_
+1. Clone the repository, using menu VCS -> Checkout from Version Control -> Git -> Git Repository URL -> https://github.com/vaadin/vaadin.git.
+  When the repository is cloned, do **NOT** open it as a project.
+1. Open cloned repository as a maven object. Use File -> Open and choose root _pom.xml_ file
+1. Have a coffee break while IDEA is loading dependencies and indexing the project
+1. Use Maven tool window to compile modules and the whole project
+1. Run UI tests
+ 1. Open *File* -> *Project Structure* -> *vaadin-uitest*
+ 1. Click *Dependencies* tab
+ 1. Click green *+* -> *Library...*
+ 1. From project libraries select *Maven: com.vaadin.external.gwt:gwt-** and click *Add selected*
+ 1. Compile default themes and widgetset (see above)
+ 1. Click *Run* -> *Edit Configurations...* -> Green *+* -> *Application*
+ 1. Set *Main class* into `com.vaadin.launcher.DevelopmentServerLauncher`, *Working dir* into `$MODULE_DIR$`,
+*Use classpath of module* into `vaadin-uitest` and click *Apply*. Now you have a run configuration for UI tests
+
+
+1. Run SuperDev mode _TODO_
+
+TODO remove following & ask Sauli to add a notification about outdated instructions
+=============
 - Unofficial instructions
   - IntelliJ IDEA: http://github.com/Saulis/vaadin-idea-workspace/
diff --git a/all/README.TXT b/all/README.TXT
deleted file mode 100644
index 24d8afb44c..0000000000
--- a/all/README.TXT
+++ /dev/null
@@ -1,13 +0,0 @@
-This Vaadin zip contains all the jars of the Vaadin Framework. Additionally all dependencies are provided in the lib folder.
-
-To use in a web project:
-1. Copy all vaadin-* files except vaadin-client and vaadin-client-compiler to WEB-INF/lib in your project
-2. Copy lib/*.jar to WEB-INF/lib in your project
-3. Copy vaadin-client and vaadin-client-compiler to a lib folder which is on your classpath but will not be deployed. These files are only needed when compiling a module (widget set) to Javascript.
-
-If you are using Eclipse and a standard WTP (Dynamic Web Project or Vaadin Project), step 3 can be:
-Create a /lib folder, copy the files there and right click the lib folder and select "Build Path" -> "Add to Build Path".
-Once this is done, the "Compile widgetset" button provided by the Vaadin Plug-in for Eclipse will work correctly.
-
-
-
diff --git a/all/all-assembly-descriptor.xml b/all/all-assembly-descriptor.xml
new file mode 100644
index 0000000000..3f8a3ab53c
--- /dev/null
+++ b/all/all-assembly-descriptor.xml
@@ -0,0 +1,41 @@
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+	<id>bin</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<dependencySets>
+		<dependencySet>
+			<outputDirectory />
+			<useProjectArtifact>false</useProjectArtifact>
+			<unpack>false</unpack>
+			<useTransitiveDependencies>false</useTransitiveDependencies>
+		</dependencySet>
+		<dependencySet>
+			<scope>compile</scope>
+			<outputDirectory>lib</outputDirectory>
+			<useProjectArtifact>false</useProjectArtifact>
+			<unpack>false</unpack>
+			<useTransitiveDependencies>true</useTransitiveDependencies>
+			<excludes>
+				<exclude>${project.groupId}:vaadin-shared</exclude>
+				<exclude>${project.groupId}:vaadin-push</exclude>
+				<exclude>${project.groupId}:vaadin-server</exclude>
+				<exclude>${project.groupId}:vaadin-themes</exclude>
+				<exclude>${project.groupId}:vaadin-client</exclude>
+				<exclude>${project.groupId}:vaadin-client-compiler</exclude>
+				<exclude>${project.groupId}:vaadin-client-compiled</exclude>
+				<exclude>${project.groupId}:vaadin-widgets</exclude>
+			</excludes>
+		</dependencySet>
+	</dependencySets>
+	<fileSets>
+		<fileSet>
+			<outputDirectory />
+			<directory>${webcontent.dir}</directory>
+		</fileSet>
+	</fileSets>
+</assembly>
diff --git a/all/build.xml b/all/build.xml
deleted file mode 100644
index c3672fc828..0000000000
--- a/all/build.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="vaadin-all" basedir="." default="publish-local"
-    xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:antcontrib="antlib:net.sf.antcontrib">
-    <description>
-        Compiles a zip containing all jars + dependencies
-    </description>
-    <include file="../common.xml" as="common" />
-    <include file="../build.xml" as="vaadin" />
-
-    <!-- global properties -->
-    <property name="module.name" value="vaadin-all" />
-    <property name="result.dir" value="result" />
-    <property name="javadoc.jar"
-        location="${result.dir}/lib/vaadin-all-${vaadin.version}-javadoc.jar" />
-    <property name="temp.dir" location="${result.dir}/temp" />
-    <property name="temp.deps.dir" value="${temp.dir}/lib" />
-    <property name="javadoc.temp.dir" location="${result.dir}/javadoc-temp" />
-    <property name="zip.file"
-        location="${result.dir}/lib/${module.name}-${vaadin.version}.zip" />
-
-    <path id="classpath.javadoc">
-        <fileset dir="${temp.deps.dir}" includes="*.jar">
-        </fileset>
-    </path>
-    <target name="fetch.module.and.dependencies">
-        <fail unless="module" message="No 'module' parameter given" />
-
-        <ivy:cachepath pathid="module.and.deps" inline="true"
-            organisation="com.vaadin" module="vaadin-${module}"
-            revision="${vaadin.version}" />
-        <copy todir="${temp.dir}" flatten="true">
-            <path refid="module.and.deps" />
-        </copy>
-    </target>
-
-    <target name="unzip.to.javadoctemp">
-        <property name="file"
-            location="${temp.dir}/vaadin-${module}-${vaadin.version}.jar" />
-        <unzip src="${file}" dest="${javadoc.temp.dir}" />
-    </target>
-
-    <target name="javadoc" depends="copy-jars">
-        <antcontrib:if>
-            <isset property="nojavadoc" />
-            <then>
-                <jar file="${javadoc.jar}" compress="true">
-                    <fileset dir="${common.jarfiles.dir}" />
-                </jar>
-            </then>
-            <else>
-                <!-- Unpack all source files to javadoc.temp.dir -->
-                <antcontrib:foreach list="${modules.producing.jar}"
-                    target="unzip.to.javadoctemp" param="module" />
-
-                <property name="javadoc.dir" location="${result.dir}/javadoc" />
-                <property name="title" value="Vaadin ${vaadin.version} API" />
-                <javadoc maxmemory="1024m" destdir="${javadoc.dir}"
-                    author="true" version="true" use="true" windowtitle="${title}"
-                    encoding="utf-8" stylesheetfile="javadoc.css">
-                    <packageset dir="${javadoc.temp.dir}">
-                        <!-- TODO Javadoc throws ClassCastException if this 
-                            is included (#9660) -->
-                        <exclude
-                            name="com/google/gwt/uibinder/elementparsers" />
-                    </packageset>
-                    <doctitle>&lt;h1>${title}&lt;/h1></doctitle>
-                    <!-- <header><![CDATA[<script type="text/javascript" 
-                        src=".html-style/style.js"></script>]]></header> -->
-                    <bottom>${javadoc.bottom}</bottom>
-                    <link offline="true"
-                        href="http://docs.oracle.com/javase/6/docs/api/"
-                        packagelistLoc="build/javadoc/j2se-1.6.0" />
-                    <link offline="true"
-                        href="http://java.sun.com/j2ee/1.4/docs/api/"
-                        packagelistLoc="build/javadoc/j2ee-1.4" />
-                    <classpath refid="classpath.javadoc" />
-                </javadoc>
-
-                <!-- Create a javadoc jar -->
-                <jar file="${javadoc.jar}" compress="true">
-                    <fileset dir="${javadoc.dir}" />
-                    <fileset dir="${common.jarfiles.dir}" />
-                </jar>
-            </else>
-        </antcontrib:if>
-    </target>
-
-    <target name="copy-jars">
-        <delete dir="${temp.dir}" />
-        <antcontrib:foreach list="${modules.producing.jar}"
-            target="fetch.module.and.dependencies" param="module" />
-        <!-- All jars are now in temp.dir. Still need to separate vaadin 
-            and deps -->
-        <move todir="${temp.deps.dir}">
-            <fileset dir="${temp.dir}">
-                <exclude name="vaadin-*-${vaadin.version}.*" />
-                <exclude name="vaadin-*-${vaadin.version}-*.*" />
-            </fileset>
-        </move>
-
-
-    </target>
-    <target name="zip" depends="copy-jars, javadoc">
-        <zip destfile="${zip.file}">
-            <fileset dir="${temp.dir}">
-                <!-- Avoid conflicts with servlet and portlet API. They are 
-                    provided by the container -->
-                <exclude name="**/servlet-api*" />
-                <exclude name="**/portlet-api*" />
-                <exclude name="**/portal-service-*" />
-                <!-- Buildhelpers should not even get here ... -->
-                <exclude name="*buildhelpers*" />
-                <!-- Zip users should not need javadoc, sources or pom files -->
-                <exclude name="*.pom" />
-                <exclude name="*-javadoc.jar" />
-                <exclude name="*-sources.jar" />
-            </fileset>
-            <fileset dir="${common.jarfiles.dir}" />
-            <fileset dir="${result.dir}/..">
-                <include name="README.TXT" />
-            </fileset>
-            <!-- Do not include javadoc jar in zip as it is huge (> 40MB) 
-                and most people do not need it. -->
-        </zip>
-    </target>
-
-    <target name="publish-local" depends="zip">
-        <antcall target="common.publish-local" />
-    </target>
-
-    <target name="clean">
-        <antcall target="common.clean" />
-    </target>
-    <target name="checkstyle">
-        <!-- Checkstyle is handled by all separate modules -->
-    </target>
-    <target name="test" depends="checkstyle">
-        <!-- No tests for this zip.. -->
-    </target>
-
-</project>
diff --git a/all/ivy.xml b/all/ivy.xml
deleted file mode 100644
index 156588485f..0000000000
--- a/all/ivy.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
-    xmlns:m="http://ant.apache.org/ivy/maven">
-
-    <info organisation="com.vaadin" module="vaadin-all" revision="${vaadin.version}" />
-
-    <configurations>
-        <conf name="build" />
-    </configurations>
-    <publications>
-        <artifact type="zip" ext="zip" />
-        <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
-    </publications>
-    <dependencies defaultconf="build">
-        <!-- API DEPENDENCIES -->
-
-        <!-- LIBRARY DEPENDENCIES (compile time) -->
-        <!-- Project modules -->
-        <dependency org="com.vaadin" name="vaadin-shared"
-            rev="${vaadin.version}" />
-        <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" />
-        <dependency org="com.vaadin" name="vaadin-client"
-            rev="${vaadin.version}" />
-        <dependency org="com.vaadin" name="vaadin-client-compiler"
-            rev="${vaadin.version}" />
-        <dependency org="com.vaadin" name="vaadin-themes"
-            rev="${vaadin.version}" />
-        <dependency org="com.vaadin" name="vaadin-client-compiled"
-            rev="${vaadin.version}" />
-        <dependency org="com.vaadin" name="vaadin-push" rev="${vaadin.version}" />
-        <dependency org="com.vaadin" name="vaadin-widgets" rev="${vaadin.version}" />
-
-    </dependencies>
-
-</ivy-module>
diff --git a/all/pom.xml b/all/pom.xml
new file mode 100644
index 0000000000..5d29cd73cb
--- /dev/null
+++ b/all/pom.xml
@@ -0,0 +1,376 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.vaadin</groupId>
+		<artifactId>vaadin-root</artifactId>
+		<version>7.7.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>vaadin-all</artifactId>
+	<name>vaadin-all</name>
+	<packaging>jar</packaging>
+
+	<properties>
+		<relnotes.tickets.file>${project.build.directory}/generated-resources/releasenotes/release-notes-tickets.html</relnotes.tickets.file>
+		<relnotes.authors.file>${project.build.directory}/generated-resources/releasenotes/release-notes-authors.html</relnotes.authors.file>
+		<webcontent.dir>${project.build.outputDirectory}/WebContent/</webcontent.dir>
+		<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
+	</properties>
+
+	<url>https://vaadin.com/</url>
+	<description>Vaadin All package</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-shared</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-push</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-server</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-themes</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-client</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-client-compiler</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-client-compiled</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-widgets</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<!-- Release Notes -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>initialize</phase>
+						<id>parse-version</id>
+						<goals>
+							<goal>parse-version</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>checkstyle</goal>
+						</goals>
+						<phase>process-sources</phase>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>filter-release-notes</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<loadfile property="release-notes-tickets" srcFile="${relnotes.tickets.file}"
+									failonerror="false" />
+								<loadfile property="release-notes-authors" srcFile="${relnotes.authors.file}"
+									failonerror="false" />
+								<copy todir="${webcontent.dir}">
+									<fileset dir="src/main/templates/">
+										<patternset>
+											<include name="release-notes.html" />
+										</patternset>
+									</fileset>
+									<filterchain>
+										<expandproperties />
+										<replacetokens begintoken="@" endtoken="@">
+											<token key="version" value="${project.version}" />
+										</replacetokens>
+										<replacetokens begintoken="@" endtoken="@">
+											<token key="version-minor"
+												value="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}" />
+										</replacetokens>
+										<replacetokens begintoken="@" endtoken="@">
+											<token key="builddate" value="${maven.build.timestamp}" />
+										</replacetokens>
+										<replacetokens begintoken="@" endtoken="@">
+											<token key="release-notes-tickets" value="${release-notes-tickets}" />
+										</replacetokens>
+										<replacetokens begintoken="@" endtoken="@">
+											<token key="release-notes-authors" value="${release-notes-authors}" />
+										</replacetokens>
+									</filterchain>
+								</copy>
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- vaadin-all zip -->
+
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<archive>
+						<addMavenDescriptor>false</addMavenDescriptor>
+					</archive>
+					<appendAssemblyId>false</appendAssemblyId>
+					<descriptors>
+						<descriptor>all-assembly-descriptor.xml</descriptor>
+					</descriptors>
+				</configuration>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<!-- Skip install, deploy and javadoc -->
+
+				<plugin>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<configuration>
+						<skip>true</skip>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.sonatype.plugins</groupId>
+					<artifactId>nexus-staging-maven-plugin</artifactId>
+					<configuration>
+						<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+					</configuration>
+				</plugin>
+
+				<plugin>
+					<artifactId>maven-install-plugin</artifactId>
+					<configuration>
+						<skip>true</skip>
+					</configuration>
+				</plugin>
+
+				<plugin>
+					<artifactId>maven-jar-plugin</artifactId>
+					<executions>
+						<execution>
+							<id>default-jar</id>
+							<phase>never</phase>
+						</execution>
+					</executions>
+				</plugin>
+
+				<plugin>
+					<artifactId>maven-source-plugin</artifactId>
+					<configuration>
+						<skipSource>true</skipSource>
+					</configuration>
+				</plugin>
+
+
+				<plugin>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<configuration>
+						<skip>true</skip>
+					</configuration>
+				</plugin>
+
+			</plugins>
+		</pluginManagement>
+	</build>
+
+	<profiles>
+		<profile>
+			<id>release</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>fetch-release-notes-tickets</id>
+								<phase>process-classes</phase>
+								<goals>
+									<goal>exec</goal>
+								</goals>
+								<configuration>
+									<classpathScope>compile</classpathScope>
+									<executable>${java.home}/bin/java</executable>
+									<arguments>
+										<argument>-Dvaadin.version=${project.version}</argument>
+										<argument>-classpath</argument>
+										<classpath />
+
+										<argument>com.vaadin.buildhelpers.FetchReleaseNotesTickets
+										</argument>
+									</arguments>
+									<outputFile>${relnotes.tickets.file}</outputFile>
+								</configuration>
+							</execution>
+							<execution>
+								<id>fetch-release-notes-authors</id>
+								<phase>process-classes</phase>
+								<goals>
+									<goal>exec</goal>
+								</goals>
+								<configuration>
+									<classpathScope>compile</classpathScope>
+									<executable>${java.home}/bin/java</executable>
+									<arguments>
+										<argument>-Dvaadin.version=${project.version}</argument>
+										<argument>-classpath</argument>
+										<classpath />
+
+										<argument>com.vaadin.buildhelpers.FetchReleaseNotesAuthors
+										</argument>
+									</arguments>
+									<outputFile>${relnotes.authors.file}</outputFile>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+
+					<!-- Extract sources for JavaDoc -->
+					<plugin>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>extract-sources</id>
+								<phase>prepare-package</phase>
+								<goals>
+									<goal>unpack</goal>
+								</goals>
+								<configuration>
+									<artifactItems>
+										<artifactItem>
+											<groupId>${project.groupId}</groupId>
+											<artifactId>vaadin-shared</artifactId>
+											<classifier>sources</classifier>
+										</artifactItem>
+
+										<artifactItem>
+											<groupId>${project.groupId}</groupId>
+											<artifactId>vaadin-server</artifactId>
+											<classifier>sources</classifier>
+										</artifactItem>
+
+										<artifactItem>
+											<groupId>${project.groupId}</groupId>
+											<artifactId>vaadin-client</artifactId>
+											<classifier>sources</classifier>
+										</artifactItem>
+									</artifactItems>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+
+					<!-- Add extracted sources -->
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>build-helper-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>add-source-path</id>
+								<phase>prepare-package</phase>
+								<goals>
+									<goal>add-source</goal>
+								</goals>
+								<configuration>
+									<sources>
+										<source>${dependency.unpack.directory}</source>
+									</sources>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+
+					<!-- Make Combined JavaDoc -->
+					<plugin>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>generate-combined-javadoc</id>
+								<phase>package</phase>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+								<configuration>
+									<failOnError>false</failOnError>
+									<excludePackageNames>com.vaadin.builhelpers</excludePackageNames>
+									<skip>false</skip>
+									<stylesheetfile>javadoc.css</stylesheetfile>
+									<links>
+										<link>http://docs.oracle.com/javase/6/docs/api/</link>
+										<link>http://docs.oracle.com/j2ee/1.4/docs/api/</link>
+									</links>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+				<pluginManagement>
+					<plugins>
+						<plugin>
+							<groupId>org.apache.maven.plugins</groupId>
+							<artifactId>maven-gpg-plugin</artifactId>
+							<configuration>
+								<skip>true</skip>
+							</configuration>
+						</plugin>
+					</plugins>
+				</pluginManagement>
+			</build>
+		</profile>
+	</profiles>
+</project>
diff --git a/buildhelpers/src/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java b/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java
index cd85ca6a3f..cd85ca6a3f 100644
--- a/buildhelpers/src/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java
+++ b/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesAuthors.java
diff --git a/buildhelpers/src/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java b/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java
index 0cd06890eb..0cd06890eb 100644
--- a/buildhelpers/src/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java
+++ b/all/src/main/java/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java
diff --git a/all/javadoc.css b/all/src/main/javadoc/javadoc.css
index ffa7288ad4..ffa7288ad4 100644
--- a/all/javadoc.css
+++ b/all/src/main/javadoc/javadoc.css
diff --git a/all/src/main/resources/WebContent/README.TXT b/all/src/main/resources/WebContent/README.TXT
new file mode 100644
index 0000000000..3de8163b4f
--- /dev/null
+++ b/all/src/main/resources/WebContent/README.TXT
@@ -0,0 +1,25 @@
+This Vaadin zip contains all the jars of the Vaadin Framework. Additionally all dependencies are provided in the lib folder.
+
+To use in a web project:
+1. Copy following files from the archive root into WEB-INF/lib in your project:
+   - vaadin-server-*.jar
+   - vaadin-shared-*.jar
+   - vaadin-themes-*.jar
+   - vaadin-push-*.jar (if you need push)
+
+2. Copy following files from the archive /lib into WEB-INF/lib in your project:
+   - vaadin-slf4j-jdk14-*.jar
+   - flute-*.jar
+   - guava-*.jar
+   - js-*.jar
+   - jsoup-*.jar
+   - sac-*.jar
+   - streamhtmlparser-jsilver-*.jar
+   - atmosphere-runtime-*.jar  (if you need push)
+
+3. Copy vaadin-client and vaadin-client-compiler to a lib folder which is on your classpath but will not be deployed.
+These files are only needed when compiling a module (widget set) to Javascript.
+
+4. Read https://vaadin.com/docs/-/part/framework/application/application-overview.html#application.overview to start your development
+
+
diff --git a/WebContent/css/ie.css b/all/src/main/resources/WebContent/css/ie.css
index 4ddd2f51c8..4ddd2f51c8 100644
--- a/WebContent/css/ie.css
+++ b/all/src/main/resources/WebContent/css/ie.css
diff --git a/WebContent/css/styles.css b/all/src/main/resources/WebContent/css/styles.css
index 9bd03ae8bc..9bd03ae8bc 100644
--- a/WebContent/css/styles.css
+++ b/all/src/main/resources/WebContent/css/styles.css
diff --git a/WebContent/img/vaadin-logo.png b/all/src/main/resources/WebContent/img/vaadin-logo.png
index 4096aecbab..4096aecbab 100644
--- a/WebContent/img/vaadin-logo.png
+++ b/all/src/main/resources/WebContent/img/vaadin-logo.png
diff --git a/WebContent/license.html b/all/src/main/resources/WebContent/license.html
index fe37813e57..fe37813e57 100644
--- a/WebContent/license.html
+++ b/all/src/main/resources/WebContent/license.html
diff --git a/WebContent/licenses/OFL.txt b/all/src/main/resources/WebContent/licenses/OFL.txt
index f1a20ac1a8..f1a20ac1a8 100644
--- a/WebContent/licenses/OFL.txt
+++ b/all/src/main/resources/WebContent/licenses/OFL.txt
diff --git a/WebContent/licenses/apache-license-version-2-0.txt b/all/src/main/resources/WebContent/licenses/apache-license-version-2-0.txt
index d645695673..d645695673 100644
--- a/WebContent/licenses/apache-license-version-2-0.txt
+++ b/all/src/main/resources/WebContent/licenses/apache-license-version-2-0.txt
diff --git a/WebContent/licenses/common-development-and-distribution-license-v1-0.txt b/all/src/main/resources/WebContent/licenses/common-development-and-distribution-license-v1-0.txt
index 5cf7a215ec..5cf7a215ec 100644
--- a/WebContent/licenses/common-development-and-distribution-license-v1-0.txt
+++ b/all/src/main/resources/WebContent/licenses/common-development-and-distribution-license-v1-0.txt
diff --git a/WebContent/licenses/cup-open-source-license.txt b/all/src/main/resources/WebContent/licenses/cup-open-source-license.txt
index e14ea3019d..e14ea3019d 100644
--- a/WebContent/licenses/cup-open-source-license.txt
+++ b/all/src/main/resources/WebContent/licenses/cup-open-source-license.txt
diff --git a/WebContent/licenses/eclipse-public-license-v1-0.txt b/all/src/main/resources/WebContent/licenses/eclipse-public-license-v1-0.txt
index d2d1968d3a..d2d1968d3a 100644
--- a/WebContent/licenses/eclipse-public-license-v1-0.txt
+++ b/all/src/main/resources/WebContent/licenses/eclipse-public-license-v1-0.txt
diff --git a/WebContent/licenses/gnu-lesser-general-public-license-version-2-0.txt b/all/src/main/resources/WebContent/licenses/gnu-lesser-general-public-license-version-2-0.txt
index f97ef7272e..f97ef7272e 100644
--- a/WebContent/licenses/gnu-lesser-general-public-license-version-2-0.txt
+++ b/all/src/main/resources/WebContent/licenses/gnu-lesser-general-public-license-version-2-0.txt
diff --git a/WebContent/licenses/gnu-lesser-general-public-license-version-2-1.txt b/all/src/main/resources/WebContent/licenses/gnu-lesser-general-public-license-version-2-1.txt
index f20c547bd0..f20c547bd0 100644
--- a/WebContent/licenses/gnu-lesser-general-public-license-version-2-1.txt
+++ b/all/src/main/resources/WebContent/licenses/gnu-lesser-general-public-license-version-2-1.txt
diff --git a/WebContent/licenses/google-bsd-license.txt b/all/src/main/resources/WebContent/licenses/google-bsd-license.txt
index 705db579c9..705db579c9 100644
--- a/WebContent/licenses/google-bsd-license.txt
+++ b/all/src/main/resources/WebContent/licenses/google-bsd-license.txt
diff --git a/WebContent/licenses/google-cloud-platform-terms-of-service.txt b/all/src/main/resources/WebContent/licenses/google-cloud-platform-terms-of-service.txt
index f8ad5bc2ba..f8ad5bc2ba 100644
--- a/WebContent/licenses/google-cloud-platform-terms-of-service.txt
+++ b/all/src/main/resources/WebContent/licenses/google-cloud-platform-terms-of-service.txt
diff --git a/WebContent/licenses/icu-license-icu-1-8-1-and-later.txt b/all/src/main/resources/WebContent/licenses/icu-license-icu-1-8-1-and-later.txt
index bb5c29ab98..bb5c29ab98 100644
--- a/WebContent/licenses/icu-license-icu-1-8-1-and-later.txt
+++ b/all/src/main/resources/WebContent/licenses/icu-license-icu-1-8-1-and-later.txt
diff --git a/WebContent/licenses/jetty-web-container-license.txt b/all/src/main/resources/WebContent/licenses/jetty-web-container-license.txt
index 21d4ed3d0e..21d4ed3d0e 100644
--- a/WebContent/licenses/jetty-web-container-license.txt
+++ b/all/src/main/resources/WebContent/licenses/jetty-web-container-license.txt
diff --git a/WebContent/licenses/mozilla-public-license-v1-1.txt b/all/src/main/resources/WebContent/licenses/mozilla-public-license-v1-1.txt
index 7714141d15..7714141d15 100644
--- a/WebContent/licenses/mozilla-public-license-v1-1.txt
+++ b/all/src/main/resources/WebContent/licenses/mozilla-public-license-v1-1.txt
diff --git a/WebContent/licenses/new-bsd-license.txt b/all/src/main/resources/WebContent/licenses/new-bsd-license.txt
index 40db12f902..40db12f902 100644
--- a/WebContent/licenses/new-bsd-license.txt
+++ b/all/src/main/resources/WebContent/licenses/new-bsd-license.txt
diff --git a/WebContent/licenses/ow2-asm-license.txt b/all/src/main/resources/WebContent/licenses/ow2-asm-license.txt
index b8ed869a5c..b8ed869a5c 100644
--- a/WebContent/licenses/ow2-asm-license.txt
+++ b/all/src/main/resources/WebContent/licenses/ow2-asm-license.txt
diff --git a/WebContent/licenses/smartsprites-bsd-license.txt b/all/src/main/resources/WebContent/licenses/smartsprites-bsd-license.txt
index 0f63e3bfb0..0f63e3bfb0 100644
--- a/WebContent/licenses/smartsprites-bsd-license.txt
+++ b/all/src/main/resources/WebContent/licenses/smartsprites-bsd-license.txt
diff --git a/WebContent/licenses/the-mit-license.txt b/all/src/main/resources/WebContent/licenses/the-mit-license.txt
index 764a44ba72..764a44ba72 100644
--- a/WebContent/licenses/the-mit-license.txt
+++ b/all/src/main/resources/WebContent/licenses/the-mit-license.txt
diff --git a/WebContent/licenses/the-mx4j-license.txt b/all/src/main/resources/WebContent/licenses/the-mx4j-license.txt
index 267787a201..267787a201 100644
--- a/WebContent/licenses/the-mx4j-license.txt
+++ b/all/src/main/resources/WebContent/licenses/the-mx4j-license.txt
diff --git a/WebContent/licenses/w3c-software-copyright-notice-and-license.txt b/all/src/main/resources/WebContent/licenses/w3c-software-copyright-notice-and-license.txt
index a5f52260b4..a5f52260b4 100644
--- a/WebContent/licenses/w3c-software-copyright-notice-and-license.txt
+++ b/all/src/main/resources/WebContent/licenses/w3c-software-copyright-notice-and-license.txt
diff --git a/buildhelpers/src/com/vaadin/buildhelpers/authormap.properties b/all/src/main/resources/com/vaadin/buildhelpers/authormap.properties
index 15b8ad2cba..15b8ad2cba 100644
--- a/buildhelpers/src/com/vaadin/buildhelpers/authormap.properties
+++ b/all/src/main/resources/com/vaadin/buildhelpers/authormap.properties
diff --git a/WebContent/release-notes.html b/all/src/main/templates/release-notes.html
index 828aa193b9..b9dcc9774b 100644
--- a/WebContent/release-notes.html
+++ b/all/src/main/templates/release-notes.html
@@ -95,60 +95,28 @@
             enhancements. Below is a list of the most notable changes:</p>
 
         <ul>
-            <li>New configurable client-server automatic reconnect handling and warning dialogs</li>
-            <li>Grid columns can be resized by the user</li>
-            <li>Grid non-modal editor mode and unbuffered datasource binding</li>
-            <li>More fluent Grid scrolling for touch devices</li>
-            <li>Better customizability of Grid (data generators for communication, customizable selection models etc.)</li>
-            <li>Configurable keyboard, touch and mouse navigation support for Grid editor</li>
-            <li>Declarative HTML serialization enhancements for Vaadin Designer 1.0</li>
-            <li>Better handling of closing a window with keyboard shortcuts</li>
-            <li>Column collapsing events for Table</li>
-            <li>Most Components fire a ContextClickEvent when the user tries to open a context menu.
-                This event is specialised to contain some extra context for Grid, Table, TreeTable and Tree,
-                and used by the <a href="https://vaadin.com/addon/vaadin-contextmenu">ContextMenu add-on</a>.</li>
-            <li>New push transport mode WEBSOCKET_XHR (WebSockets from server to client, XHR from client to
-                server) which allows setting of cookies, using request scopes with CDI/Spring etc.</li>
-            <li>Navigator is more extensible and can be used with dependency injection</li>
-            <li>It is possible to customize the push URL using PushConfiguration.setPushUrl().
-                This enables implementing some push related add-ons such as push on portals.</li>
+            <li>Vaadin Framework is now built with Maven</li>
+            <li>System properties can now override application properties, e.g. -DproductionMode=true
+                (<a href="http://dev.vaadin.com/ticket/19683">#19683</a>)</li>
+            <li>Vaadin can now automatically use default widgetset AppWidgetset optionally generated
+                by the latest Vaadin Maven plug-in (<a href="http://dev.vaadin.com/ticket/19675">#19675</a>)</li>
         </ul>
 
         <p>
-            For enhancements introduced in Vaadin 7.5, see the <a
-                href="http://vaadin.com/download/release/7.5/7.5.0/release-notes.html">Release
-                Notes for Vaadin 7.5.0</a>.
+            For enhancements introduced in Vaadin 7.6, see the <a
+                href="http://vaadin.com/download/release/7.6/7.6.0/release-notes.html">Release
+                Notes for Vaadin 7.6.0</a>.
         </p>
 
         <h3 id="incompatible">Incompatible or Behavior-altering Changes in @version-minor@</h3>
         <ul>
-            <li>Window.setCloseShortcut() is now deprecated. ESCAPE is no longer a hard-coded default, but rather a soft one, and
-                can be removed. If the close-shortcut attribute of the v-windowelement is present, it must list all close
-                shortcuts, including ESCAPE, separated by whitespace. Existing, unchanged code should behave as before.
-                See ticket <a href="https://dev.vaadin.com/ticket/17383">#17383</a> for more information on the reasoning
-                behind the change.</li>
-            <li>Grid SelectionModels are now Extensions. This update removes all selection related variables and API from 
-                GridConnector, GridState, GridServerRpc and GridClientRpc</li>
-            <li>StringToEnumConverter now explicitly supports Enum types with custom toString() implementations.
-                This may affect applications that relied on the undefined behavior in previous versions.</li>
-            <li>The Section enumeration from client-side of the Grid has been moved to GridConstants</li>
-            <li>The order in which AttachEvents are fired has been changed. When attaching a component with child components,
-                events are now fired first for the children and last for the root component. The order is thus the same as
-                the order in which custom code in overridden Component.attach methods would be executed. Please refer to
-                ticket <a href="https://dev.vaadin.com/ticket/16348">#16348</a> for more information on this change.</li>
-            <li>Jsoup library version 1.8.3 is incompatible with the version 1.8.1 used in early 7.6 alphas and 7.5. This might 
-                cause problems with external libraries compiled against said versions.</li>
-            <li>Declarative format is now using "vaadin-" as a default prefix instead of the "v-" prefix used in 7.5. 
-                This default can be changed in deployment configuration.</li>
-            <li>The annotations @PreserveOnRefresh, @Push, @Theme, @Title, @VaadinServletConfiguration and @Widgetset now use
-                @Inherited. The annotation is also looked up in extended interfaces for backwards compatibility.</li>
-            <li>Server-side timings of request processing are only sent to the client when not in production mode. Using the
-                timings in TestBench tests requires the server not to be in production mode.</li>
-            <li>System properties now override application parameters for settings such as production mode.</li>
+            <li>Vaadin artifacts no longer bring a transitive dependency to javax.servlet:servlet-api.</li>
+            <li>System properties now override application parameters for settings such as production mode (see above).</li>
         </ul>
         <h3 id="knownissues">Known Issues and Limitations</h3>
         <ul>
-            <li>Vaadin TouchKit versions prior to 4.1.0 do not work with 7.6. Please use version 4.1.0 or above.</li>
+            <li>OSGi support is has some issues</li>
+            <li>Vaadin TouchKit versions prior to 4.1.0 do not work with Vaadin 7.7. Please use version 4.1.0 or above.</li>
             <li>Context click events are not generated on iOS devices
                 (<a href="http://dev.vaadin.com/ticket/19367">#19367</a>)</li>
             <li>Drag'n'drop in a Table doesn't work on touch devices running
@@ -195,7 +163,7 @@
             your users happy. <b>Vaadin</b> is available under the
             Apache License, Version 2.0 (see the
             <tt>license.html</tt>
-            in the Vaadin ZIP or JAR package).
+            in the Vaadin ZIP package).
         </p>
 
         <p>
diff --git a/bom/build.xml b/bom/build.xml
deleted file mode 100644
index 42d7303b7b..0000000000
--- a/bom/build.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="vaadin-bom" basedir="." default="publish-local"
-	xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:antcontrib="antlib:net.sf.antcontrib">
-    <description>
-        Compiles a BOM (Bill of Materials) Maven artifact
-    </description>
-    <include file="../common.xml" as="common" />
-    <include file="../build.xml" as="vaadin" />
-
-    <!-- global properties -->
-    <property name="module.name" value="vaadin-bom" />
-    <property name="result.dir" value="result" />
-
-	<target name="bom" description="Generates a BOM (Bill of Materials) pom.xml. Either for a snapshot or a release version">
-        <fail unless="result.dir" message="No result.dir parameter given" />
-        <condition property="vaadin.maven.version" value="${vaadin.version}">
-            <isset property="build.release" />
-        </condition>
-        <!-- if this wasn't already set by the condition, this is a snapshot -->
-        <property name="vaadin.maven.version" value="${vaadin.version.major}.${vaadin.version.minor}-SNAPSHOT" />
-
-        <property name="bom.xml" location="${result.dir}/lib/vaadin-bom-${vaadin.version}.pom" />
-
-        <copy file="vaadin-bom.pom" tofile="${bom.xml}" overwrite="true">
-            <filterchain>
-                <replacestring from="@vaadin.version@" to="${vaadin.maven.version}" />
-            </filterchain>
-        </copy>
-    </target>
-	
-    <target name="publish-local" depends="bom">
-    	<antcall target="common.publish-local" />
-    </target>
-
-    <target name="clean">
-        <antcall target="common.clean" />
-    </target>
-    <target name="checkstyle">
-        <!-- No code in this module -->
-    </target>
-    <target name="test" depends="checkstyle">
-        <!-- No tests for this BOM.. -->
-    </target>
-
-</project>
diff --git a/bom/ivy.xml b/bom/ivy.xml
deleted file mode 100644
index 39abb30d80..0000000000
--- a/bom/ivy.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
-    xmlns:m="http://ant.apache.org/ivy/maven">
-
-    <info organisation="com.vaadin" module="vaadin-bom" revision="${vaadin.version}" />
-
-    <configurations>
-        <conf name="build" />
-    </configurations>
-    <publications>
-        <artifact type="pom" ext="pom" />
-    </publications>
-    <dependencies defaultconf="build">
-    </dependencies>
-
-</ivy-module>
diff --git a/bom/pom.xml b/bom/pom.xml
new file mode 100644
index 0000000000..124b604382
--- /dev/null
+++ b/bom/pom.xml
@@ -0,0 +1,59 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-root</artifactId>
+        <version>7.7.0-SNAPSHOT</version>
+    </parent>
+    <groupId>com.vaadin</groupId>
+    <artifactId>vaadin-bom</artifactId>
+    <packaging>pom</packaging>
+    <name>Vaadin Framework (Bill of Materials)</name>
+    <description>Vaadin Framework (Bill of Materials)</description>
+    <url>http://vaadin.com</url>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.vaadin</groupId>
+                <artifactId>vaadin-shared</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.vaadin</groupId>
+                <artifactId>vaadin-server</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.vaadin</groupId>
+                <artifactId>vaadin-push</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.vaadin</groupId>
+                <artifactId>vaadin-widgets</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.vaadin</groupId>
+                <artifactId>vaadin-client</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.vaadin</groupId>
+                <artifactId>vaadin-client-compiler</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.vaadin</groupId>
+                <artifactId>vaadin-client-compiled</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.vaadin</groupId>
+                <artifactId>vaadin-themes</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
diff --git a/bom/vaadin-bom.pom b/bom/vaadin-bom.pom
deleted file mode 100644
index f2b482ad9b..0000000000
--- a/bom/vaadin-bom.pom
+++ /dev/null
@@ -1,103 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.vaadin</groupId>
-        <artifactId>vaadin-parent</artifactId>
-        <version>1.0.0</version>
-    </parent>
-    <groupId>com.vaadin</groupId>
-    <artifactId>vaadin-bom</artifactId>
-    <version>@vaadin.version@</version>
-    <packaging>pom</packaging>
-    <name>Vaadin Framework (Bill of Materials)</name>
-    <description>Vaadin Framework (Bill of Materials)</description>
-    <organization>
-        <name>Vaadin Ltd</name>
-        <url>http://vaadin.com</url>
-    </organization>
-    <url>http://vaadin.com</url>
-    <licenses>
-        <license>
-            <name>Apache License Version 2.0</name>
-            <distribution>repo</distribution>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-        </license>
-    </licenses>
-    <scm>
-        <connection>scm:https:https://github.com/vaadin/vaadin.git</connection>
-        <developerConnection>scm:https:https://github.com/vaadin/vaadin.git</developerConnection>
-        <url>https://github.com/vaadin/vaadin</url>
-    </scm>
-    <developers>
-        <developer>
-            <id>artur</id>
-            <name>Artur Signell</name>
-            <email>artur.signell@vaadin.com</email>
-            <url>http://vaadin.com/web/artur</url>
-            <organization>Vaadin Ltd</organization>
-            <organizationUrl>http://vaadin.com/</organizationUrl>
-            <roles>
-                <role>architect</role>
-                <role>developer</role>
-                <role>team manager</role>
-            </roles>
-            <timezone>2</timezone>
-        </developer>
-        <developer>
-            <id>hesara</id>
-            <name>Henri Sara</name>
-            <email>hesara@vaadin.com</email>
-            <organization>Vaadin Ltd</organization>
-            <organizationUrl>http://vaadin.com/</organizationUrl>
-            <roles>
-                <role>developer</role>
-            </roles>
-            <timezone>2</timezone>
-        </developer>
-    </developers>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.vaadin</groupId>
-                <artifactId>vaadin-shared</artifactId>
-                <version>@vaadin.version@</version>
-            </dependency>
-            <dependency>
-                <groupId>com.vaadin</groupId>
-                <artifactId>vaadin-server</artifactId>
-                <version>@vaadin.version@</version>
-            </dependency>
-            <dependency>
-                <groupId>com.vaadin</groupId>
-                <artifactId>vaadin-push</artifactId>
-                <version>@vaadin.version@</version>
-            </dependency>
-            <dependency>
-                <groupId>com.vaadin</groupId>
-                <artifactId>vaadin-widgets</artifactId>
-                <version>@vaadin.version@</version>
-            </dependency>
-            <dependency>
-                <groupId>com.vaadin</groupId>
-                <artifactId>vaadin-client</artifactId>
-                <version>@vaadin.version@</version>
-            </dependency>
-            <dependency>
-                <groupId>com.vaadin</groupId>
-                <artifactId>vaadin-client-compiler</artifactId>
-                <version>@vaadin.version@</version>
-            </dependency>
-            <dependency>
-                <groupId>com.vaadin</groupId>
-                <artifactId>vaadin-client-compiled</artifactId>
-                <version>@vaadin.version@</version>
-            </dependency>
-            <dependency>
-                <groupId>com.vaadin</groupId>
-                <artifactId>vaadin-themes</artifactId>
-                <version>@vaadin.version@</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>
diff --git a/build.properties b/build.properties
index 332771139c..2148fc00e6 100644
--- a/build.properties
+++ b/build.properties
@@ -4,7 +4,7 @@ ivy.organisation=com.vaadin
 vaadin.vendor=Vaadin Ltd
 vaadin.url=http://vaadin.com
 vaadin.java.version=1.6
-vaadin.version=0.0.0.unversioned-development-build
+vaadin.version=7.7.0-SNAPSHOT
 vaadin.sass.version=0.9.13
 gwt.version=2.7.0.vaadin3
 commons-io.version=2.4
diff --git a/build.xml b/build.xml
deleted file mode 100644
index a88892772e..0000000000
--- a/build.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="vaadin" basedir="." default="package" xmlns:ivy="antlib:org.apache.ivy.ant">
-    <include file="common.xml" as="common" />
-
-    <path id="vaadin.buildhelpers.classpath" location="${vaadin.basedir}/buildhelpers/result/classes" />
-
-    <!-- ================================= target: all ================================= -->
-    <!--<target name="all" description="Compiles all parts of the project" 
-        depends="buildhelpers,theme-compiler,shared,server,client"> -->
-    <target name="package" description="Compiles and packages all modules in the project" depends="buildorder">
-        <subant buildpathref="build-path" target="publish-local">
-        </subant>
-    </target>
-
-    <target name="buildorder" depends="official.build.checks">
-        <!-- Find out a good build order -->
-        <ivy:buildlist reference="ivy.build.path">
-            <fileset dir="." includes="**/build.xml">
-                <exclude name="build.xml" />
-                <exclude name="build/**" />
-                <exclude name="bin/**" />
-                <exclude name="buildhelpers/**" />
-                <exclude name="all/**" />
-            </fileset>
-        </ivy:buildlist>
-        <path id="build-path">
-            <path location="buildhelpers/build.xml" />
-            <path refid="ivy.build.path" />
-            <path location="all/build.xml" />
-        </path>
-    </target>
-    <target name="clean" depends="buildorder">
-        <subant buildpathref="build-path" target="clean">
-        </subant>
-        <delete dir="result" />
-        <!-- Clean IVY cache (~/.ivy2) so no old artifacts are fetched from 
-            there (leave everything but Vaadin artifacts) -->
-        <delete dir="${ivy.cache.dir}/com.vaadin" />
-        <delete dir="${ivy.cache.dir}/com.carrotsearch" />
-
-    </target>
-    <target name="checkstyle" depends="buildorder">
-        <subant buildpathref="build-path" target="checkstyle" />
-    </target>
-    <target name="test" depends="buildorder">
-        <subant buildpathref="build-path" target="test" />
-    </target>
-
-    <target name="test-all" depends="buildorder">
-        <parallel>
-            <!-- JUnit tests, can be run without a server -->
-            <subant buildpathref="build-path" target="test" />
-
-            <!-- Server deployment + TestBench tests  -->
-            <antcall target="integration-test" />
-        </parallel>
-    </target>
-
-    <target name="integration-test" depends="buildorder">
-        <property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />
-
-        <ant antfile="uitest/build.xml" target="test-testbench">
-            <property name="war.file" location="${war.file}" />
-        </ant>
-     </target>
-
-    <target name="official.build.checks" if="build.release">
-        <condition property="java.version.matches">
-            <equals arg1="${ant.java.version}" arg2="${vaadin.java.version}" />
-        </condition>
-        <fail unless="java.version.matches" message="Java version is ${ant.java.version}, but Vaadin must be compiled with genuine Java ${vaadin.java.version} compiler." />
-        <echo>Java version is ${ant.java.version} as required.</echo>
-    </target>
-
-</project>
diff --git a/build/common.xml b/build/common.xml
deleted file mode 100644
index 9220cf6612..0000000000
--- a/build/common.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-
-<project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:ivy="antlib:org.apache.ivy.ant" name="common" basedir="../" default="init-deps">
-
-    <property name="ivy.install.version" value="2.2.0" />
-    <property name="ivy.jar.name" value="ivy-${ivy.install.version}.jar" />
-    <property name="ivy.jar.dir" value="${user.home}/.ant/lib" />
-    <property name="ivy.jar.file" value="${ivy.jar.dir}/${ivy.jar.name}" />
-
-    <target name="init-deps" description="Configure Ivy dependency management and load common task definitions" depends="init-taskdefs" unless="deps.initialized">
-        <property name="deps.initialized" value="1" />
-    </target>
-
-    <target name="check-ivy-installed">
-        <available property="ivy.installed" file="${ivy.jar.file}" />
-        <available property="ivy.installed" classname="org.apache.ivy.ant.IvyConfigure" />
-        <antcall target="common.ivy-download" />
-    </target>
-
-    <target name="ivy-download" unless="ivy.installed">
-        <mkdir dir="${ivy.jar.dir}" />
-        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" dest="${ivy.jar.file}" usetimestamp="true" />
-    </target>
-
-    <target name="ivy-configure" depends="check-ivy-installed" unless="deps.initialized">
-        <!-- Ivy task definitions -->
-        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${ivy.jar.file}" />
-        <!-- Ivy settings -->
-        <property name="ivy.settings.file" value="${project.root}/build/ivy/ivysettings.xml" />
-        <ivy:configure />
-    </target>
-
-    <target name="init-taskdefs" depends="ivy-configure" unless="deps.initialized">
-        <echo>Loading Ant tasks</echo>
-        <ivy:resolve log="download-only" file="${project.root}/build/ivy/ivy.xml" conf="taskdefs" />
-        <ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" />
-        <taskdef resource="emma_ant.properties" classpathref="taskdefs.classpath" />
-
-        <!-- ant contrib required for flow control (for loop, if, property 
-            override) -->
-        <!-- Note that we have to use a namespace to avoid clash when running 
-            sub-ant. -->
-        <taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml" classpathref="taskdefs.classpath" />
-
-        <!-- ant contrib for Maven integration -->
-        <taskdef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" />
-
-        <!-- jarjar -->
-        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="taskdefs.classpath" />
-
-    </target>
-
-</project>
diff --git a/build/ide.xml b/build/ide.xml
deleted file mode 100755
index 68ed24a6a7..0000000000
--- a/build/ide.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0"?>
-
-<project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:ivy="antlib:org.apache.ivy.ant" name="Build script for IDE users" basedir=".." default="theme-and-default-widgetset">
-    <property name="work.dir" location="work" />
-    <property file="build.properties" />
-
-    <!-- Setting this to 0 disables the parallel compilation -->
-    <property name="threadsPerProcessor" value="1" />
-
-    <target name="resolve" unless="resolve.done">
-        <ivy:resolve log="download-only" file="client-compiler/ivy.xml" conf="ide" />
-        <ivy:cachepath pathid="client-compiler.deps" conf="ide" />
-        <ivy:resolve log="download-only" file="server/ivy.xml" conf="ide" />
-        <ivy:cachepath pathid="server.deps" conf="ide" />
-        <ivy:resolve log="download-only" file="client/ivy.xml" conf="ide" />
-        <ivy:cachepath pathid="client.deps" conf="ide" />
-        <ivy:resolve log="download-only" file="shared/ivy.xml" conf="ide" />
-        <ivy:cachepath pathid="shared.deps" conf="ide" />
-        <ivy:resolve log="download-only" file="uitest/ivy.xml" conf="ide" />
-        <ivy:cachepath pathid="uitest.deps" conf="ide" />
-        <ivy:resolve log="download-only" file="buildhelpers/ivy.xml" />
-        <ivy:cachepath pathid="buildhelpers.deps" />
-        <ivy:resolve log="download-only" file="gwt/ivy.xml" conf="ide" />
-        <ivy:cachepath pathid="gwt.deps" conf="ide" />
-
-        <path id="classpath">
-            <path location="bin" />
-            <path location="build/classes" />
-            <path refid="client-compiler.deps" />
-            <path refid="server.deps" />
-            <path refid="shared.deps" />
-            <path refid="client.deps" />
-            <path refid="buildhelpers.deps" />
-            <path refid="gwt.deps" />
-            <path refid="uitest.deps" />
-            <path location="server/src" />
-            <path location="shared/src" />
-            <path location="uitest/src" />
-            <path location="client/src" />
-        </path>
-        <property name="resolve.done" value="true" />
-    </target>
-
-    <target name="theme-and-default-widgetset" depends="resolve">
-        <!-- threadCount is ignored unless threadsPerProcessor is 0 -->
-        <parallel threadsPerProcessor="${threadsPerProcessor}" threadCount="1">
-            <antcall target="default-widgetset" inheritRefs="true" />
-            <antcall target="themes" inheritRefs="true" />
-            <antcall target="vaadinPush.js" inheritRefs="true" />
-        </parallel>
-    </target>
-
-    <target name="themes" depends="resolve">
-        <!-- threadCount is ignored unless threadsPerProcessor is 0 -->
-        <parallel threadsPerProcessor="${threadsPerProcessor}" threadCount="1">
-            <antcall target="compile-theme" inheritRefs="true">
-                <param name="theme" value="base" />
-            </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
-                <param name="theme" value="runo" />
-            </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
-                <param name="theme" value="reindeer" />
-            </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
-                <param name="theme" value="chameleon" />
-            </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
-                <param name="theme" value="liferay" />
-            </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
-                <param name="theme" value="valo" />
-            </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
-                <param name="theme" value="tests-valo" />
-            </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
-                <param name="theme" value="tests-valo-dark" />
-            </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
-                <param name="theme" value="tests-valo-metro" />
-            </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
-                <param name="theme" value="tests-valo-flat" />
-            </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
-                <param name="theme" value="tests-valo-flatdark" />
-            </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
-                <param name="theme" value="tests-valo-facebook" />
-            </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
-                <param name="theme" value="tests-valo-blueprint" />
-            </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
-              <param name="theme" value="tests-valo-light" />
-            </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
-              <param name="theme" value="tests-valo-disabled-animations" />
-            </antcall>
-            <antcall target="compile-theme" inheritRefs="true">
-              <param name="theme" value="tests-valo-no-font-awesome" />
-            </antcall>
-        </parallel>
-    </target>
-
-    <target name="compile-theme" depends="resolve">
-        <java classname="com.vaadin.buildhelpers.CompileTheme" failonerror="yes" fork="yes">
-            <classpath refid="classpath" />
-            <jvmarg value="-Djava.awt.headless=true" />
-            <arg value="--theme" />
-            <arg value="${theme}" />
-            <arg value="--theme-folder" />
-            <arg value="WebContent/VAADIN/themes" />
-            <arg value="--version" />
-            <arg value="${vaadin.version}" />
-        </java>
-
-    </target>
-
-
-    <target name="default-widgetset">
-        <antcall target="compile-widgetset" inheritRefs="true">
-            <param name="widgetset" value="com.vaadin.DefaultWidgetSet" />
-        </antcall>
-    </target>
-
-    <target name="testing-widgetset">
-        <antcall target="compile-widgetset" inheritRefs="true">
-            <param name="widgetset" value="com.vaadin.tests.widgetset.TestingWidgetSet" />
-        </antcall>
-    </target>
-
-    <target name="compile-widgetset" depends="resolve">
-        <property name="module" value="${widgetset}" />
-        <property name="module.output.dir" location="WebContent/VAADIN/widgetsets" />
-        <property name="logLevel" value="TRACE" />
-        <property name="style" value="PRETTY" />
-        <property name="localWorkers" value="2" />
-        <!-- Whether assertions should be compiled into the widgetset. 
-             Either "-ea" to enable or "" to disable. -->
-        <property name="assertions" value="-ea" />
-        <property name="extraParams" value="" />
-        
-        <property name="gwt.usearchives" value="true" />
-        <property name="gwt.persistentunitcache" value="false" />
-
-        <mkdir dir="${module.output.dir}" />
-
-        <echo>Compiling ${module} to ${module.output.dir} with parameters -logLevel ${logLevel} -style ${style} -localWorkers ${localWorkers} ${assertions} -strict ${extraParams}</echo>
-
-        <!--<ivy:resolve log="download-only" inline="true" organisation="javax.validation" module="validation-api" 
-            revision="1.0.0.GA"/> -->
-
-        <!-- compile the module -->
-        <java classname="com.google.gwt.dev.Compiler" classpathref="classpath" failonerror="yes" fork="yes" maxmemory="512m">
-            <arg value="-workDir" />
-            <arg value="${work.dir}" />
-            <arg value="-logLevel" />
-            <arg value="${logLevel}" />
-            <arg value="-war" />
-            <arg value="${module.output.dir}" />
-            <arg value="-style" />
-            <arg value="${style}" />
-            <arg value="-localWorkers" />
-            <arg value="${localWorkers}" />
-            <arg line="${assertions}" />
-            <arg value="-strict" />
-            <arg line="${extraParams}" />
-            <arg value="${module}" />
-
-            <sysproperty key="vFailIfNotSerializable" value="true" />
-
-            <jvmarg value="-Xss8M" />
-            <jvmarg value="-Xmx1G" />
-            <jvmarg value="-XX:MaxPermSize=256M" />
-            <jvmarg value="-Djava.awt.headless=true" />
-            <jvmarg value="-Dgwt.usearchives=${gwt.usearchives}" />
-            <jvmarg value="-Dgwt.persistentunitcache=${gwt.persistentunitcache}" />
-        </java>
-    </target>
-    <target name="vaadinPush.js" depends="resolve">
-        <ant antfile="${basedir}/push/build.xml" target="vaadinPush.js" dir="${basedir}/push" />
-        <property name="js.output.dir" location="WebContent" />
-        <property name="push.js.dir" location="${basedir}/push/result/js" />
-        <copy todir="${js.output.dir}">
-            <fileset dir="${push.js.dir}" includes="VAADIN/vaadinPush*" excludes="**/*.gz">
-            </fileset>
-        </copy>
-    </target>
-    
-    <target name="clean-unitcache">
-        <delete dir="WebContent/VAADIN/gwt-unitCache" />
-    </target>
-</project>
diff --git a/buildhelpers/build.xml b/buildhelpers/build.xml
deleted file mode 100644
index 05b8c8397f..0000000000
--- a/buildhelpers/build.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="vaadin-buildhelpers" basedir="." default="publish-local"
-    xmlns:ivy="antlib:org.apache.ivy.ant">
-    <description>
-        Compiles build helpers used when building other
-        modules.
-    </description>
-    <include file="../build.xml" as="vaadin" />
-    <include file="../common.xml" as="common" />
-
-    <property name="module.name" value="vaadin-buildhelpers" />
-    <property name="module.symbolic" value="com.vaadin.buildhelpers" />
-    <property name="result.dir" location="result" />
-    <path id="classpath.compile.custom" />
-
-    <property name="filtered.webcontent.dir" location="${result.dir}/WebContent" />
-    <property name="release-notes-tickets-file" location="${result.dir}/release-notes-tickets.html" />
-    <property name="release-notes-authors-file" location="${result.dir}/release-notes-authors.html" />
-
-    <target name="jar" depends="filter.webcontent">
-        <antcall target="common.compile" />
-        <property name="result.jar"
-            location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
-        <property name="classes" location="${result.dir}/classes" />
-        <property name="src" location="${result.dir}/../src" />
-
-        <jar destfile="${result.jar}" duplicate="fail" index="true">
-            <fileset dir="${classes}" excludes="${classes.exclude}"
-                erroronmissingdir="false" />
-            <fileset dir="${filtered.webcontent.dir}/.."
-                includes="WebContent/**" />
-        </jar>
-    </target>
-
-    <target name="publish-local" depends="jar">
-        <antcall target="common.publish-local" />
-    </target>
-
-    <target name="clean">
-        <antcall target="common.clean" />
-    </target>
-
-    <target name="filter.webcontent"
-        depends="fetch-release-notes-tickets,fetch-release-notes-authors">
-        <!-- Running without build.release-notes will cause an error, which 
-            is ignored -->
-        <loadfile property="release-notes-tickets" srcFile="${release-notes-tickets-file}"
-            failonerror="false" />
-        <loadfile property="release-notes-authors" srcFile="${release-notes-authors-file}"
-            failonerror="false" />
-
-        <delete dir="${filtered.webcontent.dir}" />
-        <copy todir="${filtered.webcontent.dir}">
-            <fileset dir="${vaadin.basedir}/WebContent">
-                <include name="img/**" />
-            </fileset>
-        </copy>
-        <copy todir="${filtered.webcontent.dir}">
-            <fileset dir="${vaadin.basedir}/WebContent">
-                <patternset>
-                    <include name="release-notes.html" />
-                    <include name="license.html" />
-                    <include name="licenses/**" />
-                    <include name="css/**" />
-                </patternset>
-            </fileset>
-            <filterchain>
-                <expandproperties />
-                <replacetokens begintoken="@" endtoken="@">
-                    <token key="version" value="${vaadin.version}" />
-                </replacetokens>
-                <replacetokens begintoken="@" endtoken="@">
-                    <token key="version-minor"
-                        value="${vaadin.version.major}.${vaadin.version.minor}" />
-                </replacetokens>
-                <replacetokens begintoken="@" endtoken="@">
-                    <token key="builddate" value="${build.date}" />
-                </replacetokens>
-                <replacetokens begintoken="@" endtoken="@">
-                    <token key="release-notes-tickets" value="${release-notes-tickets}" />
-                </replacetokens>
-                <replacetokens begintoken="@" endtoken="@">
-                    <token key="release-notes-authors" value="${release-notes-authors}" />
-                </replacetokens>
-            </filterchain>
-        </copy>
-    </target>
-
-
-    <target name="fetch-release-notes-tickets" if="build.release-notes">
-        <mkdir dir="${filtered.webcontent.dir}" />
-        <antcall target="exec-buildhelper">
-            <param name="main.class"
-                value="com.vaadin.buildhelpers.FetchReleaseNotesTickets" />
-            <param name="output" location="${release-notes-tickets-file}" />
-        </antcall>
-    </target>
-
-    <target name="fetch-release-notes-authors" if="build.release-notes">
-        <copy file="src/com/vaadin/buildhelpers/authormap.properties"
-            tofile="${result.dir}/classes/com/vaadin/buildhelpers/authormap.properties" />
-
-        <mkdir dir="${filtered.webcontent.dir}" />
-        <antcall target="exec-buildhelper">
-            <param name="main.class"
-                value="com.vaadin.buildhelpers.FetchReleaseNotesAuthors" />
-            <param name="output" location="${release-notes-authors-file}" />
-        </antcall>
-        <delete
-            file="${result.dir}/classes/com/vaadin/buildhelpers/authormap.properties" />
-    </target>
-
-    <target name="exec-buildhelper">
-        <antcall target="common.compile" />
-        <fail unless="main.class" message="No main class given in 'main.class'" />
-        <fail unless="output" message="No output file given in 'output'" />
-        <ivy:resolve log="download-only" conf="build" />
-        <ivy:cachepath pathid="deps" />
-        <java classname="${main.class}" output="${output}"
-            failonerror="true" fork="yes">
-            <classpath>
-                <pathelement location="${result.dir}/classes" />
-            </classpath>
-            <classpath refid="deps" />
-            <jvmarg value="-Dvaadin.version=${vaadin.version}" />
-        </java>
-    </target>
-
-    <target name="checkstyle">
-        <antcall target="common.checkstyle">
-            <param name="cs.src" location="src" />
-        </antcall>
-    </target>
-
-    <target name="test" depends="checkstyle">
-        <!--<antcall target="common.test.run" /> -->
-        <echo>WHAT? No JUnit tests for ${module.name}!</echo>
-    </target>
-</project>
diff --git a/buildhelpers/ivy.xml b/buildhelpers/ivy.xml
deleted file mode 100644
index 8053328b54..0000000000
--- a/buildhelpers/ivy.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
-    xmlns:m="http://ant.apache.org/ivy/maven">
-
-    <info organisation="com.vaadin" module="vaadin-buildhelpers"
-        revision="${vaadin.version}">
-        <license name="Apache Software License 2.0"
-            url="http://www.apache.org/licenses/LICENSE-2.0" />
-        <ivyauthor name="Vaadin Ltd" url="http://vaadin.com" />
-        <description homepage="http://vaadin.com">
-            Vaadin is a web application
-            framework for Rich Internet Applications (RIA).
-        </description>
-    </info>
-    <configurations>
-        <conf name="build" />
-        <conf name="build-provided" />
-        <conf name="ide" visibility="private" />
-    </configurations>
-    <publications>
-        <artifact type="jar" />
-    </publications>
-    <dependencies>
-        <!-- client-compiler, server and uitest also use commons-io -->
-        <dependency org="commons-io" name="commons-io" rev="${commons-io.version}" />
-        <dependency org="commons-cli" name="commons-cli" rev="1.2" />
-        <dependency org="com.vaadin" name="vaadin-sass-compiler"
-                    rev="${vaadin.sass.version}" />
-
-        <!-- Internally used, for now -->
-        <dependency org="com.carrotsearch" name="smartsprites"
-                    rev="0.2.10" />
-    </dependencies>
-
-</ivy-module>
diff --git a/buildhelpers/pom.xml b/buildhelpers/pom.xml
new file mode 100644
index 0000000000..cfe8187c11
--- /dev/null
+++ b/buildhelpers/pom.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.vaadin</groupId>
+		<artifactId>vaadin-root</artifactId>
+		<version>7.7.0-SNAPSHOT</version>
+	</parent>
+	<groupId>com.vaadin</groupId>
+	<artifactId>vaadin-buildhelpers</artifactId>
+	<name>vaadin-buildhelpers</name>
+	<packaging>jar</packaging>
+
+	<url>https://vaadin.com/</url>
+	<description>Vaadin build helpers</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>${commons-io.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-cli</groupId>
+			<artifactId>commons-cli</artifactId>
+			<version>1.2</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-sass-compiler</artifactId>
+			<version>${vaadin.sass.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.carrotsearch</groupId>
+			<artifactId>smartsprites</artifactId>
+			<version>0.2.10</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>checkstyle</goal>
+						</goals>
+						<phase>process-sources</phase>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<index>false</index>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+
+		<!-- Skip sources jar -->
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<artifactId>maven-source-plugin</artifactId>
+					<configuration>
+						<skipSource>true</skipSource>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.sonatype.plugins</groupId>
+					<artifactId>nexus-staging-maven-plugin</artifactId>
+					<configuration>
+						<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+</project>
diff --git a/buildhelpers/src/com/vaadin/buildhelpers/CompileTheme.java b/buildhelpers/src/main/java/com/vaadin/buildhelpers/CompileTheme.java
index d97025bdb6..d97025bdb6 100644
--- a/buildhelpers/src/com/vaadin/buildhelpers/CompileTheme.java
+++ b/buildhelpers/src/main/java/com/vaadin/buildhelpers/CompileTheme.java
diff --git a/buildhelpers/src/com/vaadin/buildhelpers/GeneratePackageExports.java b/buildhelpers/src/main/java/com/vaadin/buildhelpers/GeneratePackageExports.java
index d4ad3f838c..d4ad3f838c 100644
--- a/buildhelpers/src/com/vaadin/buildhelpers/GeneratePackageExports.java
+++ b/buildhelpers/src/main/java/com/vaadin/buildhelpers/GeneratePackageExports.java
diff --git a/buildhelpers/src/com/vaadin/buildhelpers/ManifestWriter.java b/buildhelpers/src/main/java/com/vaadin/buildhelpers/ManifestWriter.java
index 9e9b29c4a1..9e9b29c4a1 100644
--- a/buildhelpers/src/com/vaadin/buildhelpers/ManifestWriter.java
+++ b/buildhelpers/src/main/java/com/vaadin/buildhelpers/ManifestWriter.java
diff --git a/checkstyle/vaadin-checkstyle.xml b/checkstyle/vaadin-checkstyle.xml
index 4f25ec6996..eb6c625067 100644
--- a/checkstyle/vaadin-checkstyle.xml
+++ b/checkstyle/vaadin-checkstyle.xml
@@ -144,11 +144,12 @@
         <module name="IllegalImport" /> <!-- defaults to sun.* packages -->
         <module name="RedundantImport" />
         <module name="UnusedImports" />
+<!--
         <module name="ImportControl">
             <property name="file" value="${checkstyle.importControl.file}" />
             <property name="severity" value="error" />
         </module>
-
+-->
 
         <!-- Checks for Size Violations. -->
         <!-- See http://checkstyle.sf.net/config_sizes.html -->
diff --git a/client-compiled/build.xml b/client-compiled/build.xml
deleted file mode 100644
index 5eb8decd22..0000000000
--- a/client-compiled/build.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="vaadin-client-compiled" basedir="." default="publish-local"
-    xmlns:ivy="antlib:org.apache.ivy.ant">
-    <description>
-        Compiled (JS+HTML) version of client side
-    </description>
-
-    <include file="../common.xml" as="common" />
-    <include file="../build.xml" as="vaadin" />
-    <include file="../gwt-files.xml" as="gwtfiles" />
-
-    <!-- global properties -->
-    <property name="module.name" value="vaadin-client-compiled" />
-    <property name="module.symbolic" value="com.vaadin.client-compiled" />
-    <property name="result.dir" value="result" />
-    <property name="gwtar.dir" location="${result.dir}/gwtar" />
-    <property name="work.dir" location="${result.dir}/work" />
-    <property name="module.output.dir" location="${result.dir}/VAADIN/widgetsets" />
-    <property name="compiled.jar"
-        location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
-    <property name="compiled-cache.jar"
-        location="${result.dir}/lib/${module.name}-cache-${vaadin.version}.jar" />
-
-    <union id="jar.includes">
-        <fileset dir="${result.dir}">
-            <include name="VAADIN/widgetsets/com.vaadin*/**" />
-        </fileset>
-    </union>
-
-    <target name="default-widgetset-cache">
-        <antcall target="compile-module-cache">
-            <param name="module" value="com.vaadin.DefaultWidgetSet" />
-        </antcall>
-    </target>
-
-    <target name="default-widgetset">
-        <antcall target="compile-module">
-            <param name="module" value="com.vaadin.DefaultWidgetSet" />
-        </antcall>
-    </target>
-
-
-    <target name="compile-module-cache">
-        <fail unless="module"
-            message="You must give the module to compile in the 'module' parameter" />
-        <ivy:resolve log="download-only" resolveid="common"
-            conf="compile-module" />
-        <ivy:cachepath pathid="classpath.compile.widgetset"
-            conf="compile-module" />
-        <echo>Creating gwtar files for ${module} in ${gwtar.dir}</echo>
-
-        <!-- Produce gwtar files for the separate JAR -->
-        <java classname="com.google.gwt.dev.CompileModule"
-            classpathref="classpath.compile.widgetset" failonerror="yes"
-            fork="yes" maxmemory="512m">
-            <arg value="-out" />
-            <arg value="${gwtar.dir}" />
-            <arg value="-strict" />
-            <arg value="${module}" />
-
-            <jvmarg value="-Xss8M" />
-            <jvmarg value="-XX:MaxPermSize=256M" />
-            <jvmarg value="-Djava.awt.headless=true" />
-        </java>
-    </target>
-
-    <target name="compile-module">
-        <fail unless="module"
-            message="You must give the module to compile in the 'module' parameter" />
-        <property name="style" value="OBF" />
-        <property name="localWorkers" value="6" />
-        <property name="extraParams" value="" />
-
-        <ivy:resolve log="download-only" resolveid="common"
-            conf="compile-module" />
-        <ivy:cachepath pathid="classpath.compile.widgetset"
-            conf="compile-module" />
-
-        <mkdir dir="${module.output.dir}" />
-
-        <echo>Compiling ${module} to ${module.output.dir}</echo>
-
-        <!-- compile the module -->
-        <java classname="com.google.gwt.dev.Compiler" classpathref="classpath.compile.widgetset"
-            failonerror="yes" fork="yes" maxmemory="512m">
-            <classpath location="${compiled-cache.jar}" />
-            <arg value="-workDir" />
-            <arg value="${work.dir}" />
-            <arg value="-logLevel" />
-            <arg value="TRACE" />
-            <arg value="-war" />
-            <arg value="${module.output.dir}" />
-            <arg value="-style" />
-            <arg value="${style}" />
-
-            <arg value="-localWorkers" />
-            <arg value="${localWorkers}" />
-            <arg value="-strict" />
-            <!-- Disabled for now as it breaks code, e.g. ButtonWithShortcutNotRendered -->
-            <!-- <arg value="-XenableClosureCompiler" /> -->
-            <arg line="${extraParams}" />
-            <arg value="${module}" />
-
-            <sysproperty key="vFailIfNotSerializable" value="true" />
-
-            <jvmarg value="-Xss8M" />
-            <jvmarg value="-XX:MaxPermSize=256M" />
-            <jvmarg value="-Djava.awt.headless=true" />
-        </java>
-
-    </target>
-
-    <target name="client-compiled-cache.jar" depends="default-widgetset-cache">
-        <jar file="${compiled-cache.jar}" compress="true">
-            <fileset dir="${gwtar.dir}">
-                <include name="**/*.gwtar" />
-            </fileset>
-            <union refid="client-compiled-cache.gwt.includes" />
-            <fileset dir="${common.jarfiles.dir}" />
-        </jar>
-    </target>
-
-    <target name="jar" depends="default-widgetset">
-        <antcall target="common.jar">
-            <param name="osgi.extra.package.prefixes" value="VAADIN/widgetsets/" />
-            <param name="osgi.includeNumberPackages" value="1" />
-            <reference torefid="extra.jar.includes" refid="jar.includes" />
-        </antcall>
-    </target>
-
-    <target name="publish-local" depends="jar">
-        <antcall target="common.publish-local">
-            <param name="conf" value="build" />
-        </antcall>
-    </target>
-
-    <target name="clean">
-        <antcall target="common.clean" />
-    </target>
-
-    <target name="checkstyle">
-        <echo>No java files in module</echo>
-    </target>
-    <target name="test" depends="checkstyle">
-        <!--<antcall target="common.test.run" /> -->
-        <echo>WHAT? No tests for ${module.name}!</echo>
-    </target>
-
-</project>
diff --git a/client-compiled/ivy.xml b/client-compiled/ivy.xml
deleted file mode 100644
index 2f1dcfd22f..0000000000
--- a/client-compiled/ivy.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
-    xmlns:m="http://ant.apache.org/ivy/maven">
-
-    <info organisation="com.vaadin" module="vaadin-client-compiled"
-        revision="${vaadin.version}" />
-
-    <configurations>
-        <conf name="build" />
-        <conf name="build-provided" />
-        <conf name="compile-module" visibility="private" />
-    </configurations>
-    <publications>
-        <artifact type="jar" ext="jar" />
-        <!-- <artifact type="source" ext="jar" m:classifier="sources" /> -->
-        <!-- <artifact type="javadoc" ext="jar" m:classifier="javadoc" /> -->
-        <artifact type="pom" ext="pom" />
-        <!-- cache must be a separate artifact, not within vaadin-client-compiled -->
-        <!-- <artifact type="jar" name="vaadin-client-compiled-cache"/> -->
-    </publications>
-    <dependencies>
-        <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" conf="compile-module-> build" />
-        <dependency org="com.vaadin" name="vaadin-client"
-            rev="${vaadin.version}" conf="compile-module-> build" />
-        <dependency org="com.vaadin" name="vaadin-client-compiler"
-            rev="${vaadin.version}" conf="compile-module-> build" />
-    </dependencies>
-
-</ivy-module>
diff --git a/client-compiled/pom.xml b/client-compiled/pom.xml
new file mode 100644
index 0000000000..f231af3ed2
--- /dev/null
+++ b/client-compiled/pom.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.vaadin</groupId>
+		<artifactId>vaadin-root</artifactId>
+		<version>7.7.0-SNAPSHOT</version>
+	</parent>
+	<groupId>com.vaadin</groupId>
+	<artifactId>vaadin-client-compiled</artifactId>
+	<name>vaadin-client-compiled</name>
+	<packaging>jar</packaging>
+
+	<properties>
+		<widgetset.name>com.vaadin.DefaultWidgetSet</widgetset.name>
+		<widgetset.style>OBF</widgetset.style>
+		<widgetset.local.workers>6</widgetset.local.workers>
+	</properties>
+
+	<url>https://vaadin.com/</url>
+	<description>Vaadin client compiled</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-server</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-client</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-client-compiler</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-buildhelpers</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-export-package</id>
+						<phase>package</phase>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<configuration>
+							<classpathScope>compile</classpathScope>
+							<executable>${java.home}/bin/java</executable>
+							<arguments>
+								<argument>-Dvaadin.version=${project.version}</argument>
+								<argument>-DincludeNumberPackages=1</argument>
+
+								<argument>-classpath</argument>
+								<classpath />
+
+								<argument>com.vaadin.buildhelpers.GeneratePackageExports</argument>
+
+								<argument>${project.build.directory}/${project.build.finalName}.${project.packaging}</argument>
+								<argument>VAADIN/widgetsets</argument>
+							</arguments>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>com.vaadin</groupId>
+				<artifactId>vaadin-maven-plugin</artifactId>
+				<configuration>
+					<modules>
+						<module>com.vaadin.DefaultWidgetSet</module>
+					</modules>
+					<webappDirectory>${project.build.outputDirectory}/VAADIN/widgetsets</webappDirectory>
+					<persistentunitcachedir>${project.build.directory}/gwt-unitCache</persistentunitcachedir>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+						<!-- Export package is handled in exec plugin -->
+						<Export-Package></Export-Package>
+						<Import-Package></Import-Package>
+					</instructions>
+				</configuration>
+				<executions>
+					<execution>
+						<id>bundle-manifest</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.6</version>
+				<configuration>
+					<archive>
+						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+						<index>false</index>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.codehaus.mojo
+										</groupId>
+										<artifactId>
+											exec-maven-plugin
+										</artifactId>
+										<versionRange>
+											[1.4.0,)
+										</versionRange>
+										<goals>
+											<goal>exec</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore />
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+
+</project>
diff --git a/client-compiler/build.xml b/client-compiler/build.xml
deleted file mode 100644
index 5a5d1a6161..0000000000
--- a/client-compiler/build.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="vaadin-client-compiler" basedir="." default="publish-local"
-    xmlns:ivy="antlib:org.apache.ivy.ant">
-    <description>
-        Compiles build helpers used when building other
-        modules.
-    </description>
-    <include file="../common.xml" as="common" />
-    <include file="../build.xml" as="vaadin" />
-    <include file="../gwt-files.xml" as="gwtfiles" />
-
-    <!-- global properties -->
-    <property name="module.name" value="vaadin-client-compiler" />
-    <property name="module.symbolic" value="com.vaadin.client-compiler" />
-    <property name="result.dir" value="result" />
-    <path id="classpath.compile.custom">
-        <fileset file="${gwt.dev.jar}" />
-    </path>
-    <path id="classpath.test.custom">
-        <fileset dir="${result.dir}/classes">
-            <include name="**/*" />
-        </fileset>
-    </path>
-    <property name="extra.classes" value="**/*.properties" />
-    <!-- don't try to copy the same files twice (first from classes and then 
-        from sources) in order for the build not to fail when packaging the JAR -->
-    <property name="jar.exclude" value="**/*.properties" />
-    <union id="compiler.includes">
-        <union refid="client-compiler.gwt.includes" />
-        <fileset dir="${result.dir}">
-            <include name="com/google/gwt/dev/About.properties" />
-        </fileset>
-    </union>
-
-    <target name="jar">
-        <!-- Get Git revision -->
-        <exec executable="git" outputproperty="git.revision"
-            failifexecutionfails="false" errorproperty="">
-            <arg value="describe" />
-            <arg value="--tags" />
-            <arg value="--always" />
-            <arg value="HEAD" />
-        </exec>
-
-        <echo file="${result.dir}/com/google/gwt/dev/About.properties">gwt.version=${vaadin.version}
-            gwt.svnrev=${git.revision}</echo>
-
-        <antcall target="common.jar">
-            <reference refid="compiler.includes" torefid="extra.jar.includes" />
-        </antcall>
-
-    </target>
-
-    <target name="publish-local" depends="jar">
-        <antcall target="common.sources.jar">
-            <reference torefid="extra.jar.includes" refid="compiler.includes" />
-        </antcall>
-        <antcall target="common.javadoc.jar" />
-
-        <antcall target="common.publish-local" />
-    </target>
-
-    <target name="clean">
-        <antcall target="common.clean" />
-    </target>
-
-    <target name="checkstyle">
-        <antcall target="common.checkstyle">
-            <param name="cs.src" location="src" />
-        </antcall>
-    </target>
-
-    <target name="test" depends="checkstyle">
-        <antcall target="common.test.run" />
-        <!--<echo>WHAT? No tests for ${module.name}!</echo> -->
-    </target>
-
-</project>
diff --git a/client-compiler/ivy.xml b/client-compiler/ivy.xml
deleted file mode 100644
index 8f6b74876e..0000000000
--- a/client-compiler/ivy.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
-    xmlns:m="http://ant.apache.org/ivy/maven">
-
-    <info organisation="com.vaadin" module="vaadin-client-compiler"
-        revision="${vaadin.version}" />
-
-    <configurations>
-        <conf name="build" />
-        <conf name="build-provided" />
-        <conf name="ide" visibility="private" />
-        <conf name="test" visibility="private" />
-    </configurations>
-    <publications>
-        <artifact type="jar" ext="jar" />
-        <artifact type="source" ext="jar" m:classifier="sources" />
-        <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
-        <artifact type="pom" ext="pom" />
-    </publications>
-    <dependencies>
-        <dependency org="com.vaadin" name="vaadin-shared"
-            rev="${vaadin.version}" conf="build" />
-        <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" conf="build" />
-        <dependency org="com.vaadin" name="vaadin-client"
-            rev="${vaadin.version}" conf="build,test" />
-        <dependency org="com.vaadin" name="vaadin-sass-compiler"
-            rev="${vaadin.sass.version}" conf="build,ide->default">
-            <!-- remove cssparser override once sass-compiler is updated -->
-            <exclude name="cssparser" />
-        </dependency>
-
-        <dependency org="commons-collections" name="commons-collections"
-            rev="3.2.2" conf="build,ide -> default" />
-        <dependency org="commons-logging" name="commons-logging"
-            rev="1.1.3" conf="build,ide -> default" />
-
-        <dependency org="ant" name="ant" rev="1.6.5"
-            conf="build,ide -> default" />
-        <dependency org="net.sourceforge.cssparser" name="cssparser"
-            rev="0.9.11" conf="build,ide -> default" />
-        <dependency org="ant" name="ant" rev="1.6.5"
-            conf="build,ide -> default" />
-        <dependency org="ant" name="ant-launcher" rev="1.6.5"
-            conf="build,ide -> default" />
-        <dependency org="org.ow2.asm" name="asm"
-            rev="5.0.3" conf="build-> default" />
-        <dependency org="org.ow2.asm" name="asm-util"
-            rev="5.0.3" conf="build-> default" />
-        <dependency org="org.ow2.asm" name="asm-commons"
-            rev="5.0.3" conf="build-> default" />
-
-        <dependency org="org.eclipse.jetty" name="jetty-annotations"
-            rev="8.1.12.v20130726" conf="build,ide -> default">
-            <exclude org="org.eclipse.jetty.orbit"></exclude>
-        </dependency>
-        <dependency org="org.eclipse.jetty" name="jetty-servlets"
-            rev="8.1.12.v20130726" conf="build,ide -> default">
-            <exclude org="org.eclipse.jetty.orbit"></exclude>
-        </dependency>
-
-        <dependency org="org.eclipse.jetty" name="jetty-util"
-            rev="8.1.12.v20130726" conf="build,ide -> default" />
-
-        <dependency org="org.jdesktop" name="swing-worker"
-            rev="1.1" conf="build,ide -> default" />
-        <dependency org="commons-codec" name="commons-codec"
-            rev="1.8" conf="build,ide -> default" />
-        <dependency org="commons-io" name="commons-io"
-            rev="${commons-io.version}" conf="build,ide -> default" />
-        <dependency org="org.apache.commons" name="commons-lang3"
-            rev="3.1" conf="build,ide -> default" />
-        <dependency org="org.apache.james" name="apache-mime4j"
-            rev="0.6" conf="build,ide -> default" />
-
-        <dependency org="org.apache.httpcomponents" name="httpclient"
-            rev="4.3.1" conf="build,ide -> default" />
-        <dependency org="org.apache.httpcomponents" name="httpcore"
-            rev="4.3" conf="build,ide -> default" />
-        <dependency org="org.apache.httpcomponents" name="httpmime"
-            rev="4.3.1" conf="build,ide -> default" />
-
-        <dependency org="net.sourceforge.nekohtml" name="nekohtml"
-            rev="1.9.19" conf="build,ide -> default" />
-        <dependency org="xalan" name="serializer" rev="2.7.1"
-            conf="build,ide -> default" />
-        <dependency org="xerces" name="xercesImpl" rev="2.11.0"
-            conf="build,ide -> default" />
-        <dependency org="xml-apis" name="xml-apis" rev="1.4.01"
-            conf="build,ide -> default" />
-
-        <dependency org="com.ibm.icu" name="icu4j" rev="50.1.1"
-            conf="build,ide -> default" />
-
-        <dependency org="com.vaadin" name="vaadin-client-compiler-deps"
-            rev="1.2.0" conf="build,ide -> default" />
-
-        <dependency org="junit" name="junit" rev="4.11"
-            conf="test,ide -> default" />
-
-
-    </dependencies>
-
-</ivy-module>
diff --git a/client-compiler/pom.xml b/client-compiler/pom.xml
new file mode 100644
index 0000000000..f97b85fd51
--- /dev/null
+++ b/client-compiler/pom.xml
@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.vaadin</groupId>
+		<artifactId>vaadin-root</artifactId>
+		<version>7.7.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>vaadin-client-compiler</artifactId>
+	<name>vaadin-client-compiler</name>
+	<packaging>jar</packaging>
+
+	<url>https://vaadin.com/</url>
+	<description>Vaadin client compiler</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-shared</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-server</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-client</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-sass-compiler</artifactId>
+			<version>${vaadin.sass.version}</version>
+			<!-- remove cssparser override once sass-compiler is updated -->
+			<exclusions>
+				<exclusion>
+					<groupId>net.sourceforge.cssparser</groupId>
+					<artifactId>cssparser</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.3</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sourceforge.cssparser</groupId>
+			<artifactId>cssparser</artifactId>
+			<version>0.9.11</version>
+		</dependency>
+		<dependency>
+			<groupId>ant</groupId>
+			<artifactId>ant</artifactId>
+			<version>1.6.5</version>
+		</dependency>
+		<dependency>
+			<groupId>ant</groupId>
+			<artifactId>ant-launcher</artifactId>
+			<version>1.6.5</version>
+		</dependency>
+		<dependency>
+			<groupId>org.ow2.asm</groupId>
+			<artifactId>asm</artifactId>
+			<version>5.0.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.ow2.asm</groupId>
+			<artifactId>asm-util</artifactId>
+			<version>5.0.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.ow2.asm</groupId>
+			<artifactId>asm-commons</artifactId>
+			<version>5.0.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-annotations</artifactId>
+			<version>8.1.12.v20130726</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.eclipse.jetty.orbit</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-servlets</artifactId>
+			<version>8.1.12.v20130726</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.eclipse.jetty.orbit</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
+
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-util</artifactId>
+			<version>8.1.12.v20130726</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jdesktop</groupId>
+			<artifactId>swing-worker</artifactId>
+			<version>1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.8</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>${commons-io.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.james</groupId>
+			<artifactId>apache-mime4j</artifactId>
+			<version>0.6</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+			<version>4.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpmime</artifactId>
+			<version>4.3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sourceforge.nekohtml</groupId>
+			<artifactId>nekohtml</artifactId>
+			<version>1.9.19</version>
+		</dependency>
+		<dependency>
+			<groupId>xalan</groupId>
+			<artifactId>serializer</artifactId>
+			<version>2.7.1</version>
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.11.0</version>
+		</dependency>
+		<dependency>
+			<groupId>xml-apis</groupId>
+			<artifactId>xml-apis</artifactId>
+			<version>1.4.01</version>
+		</dependency>
+		<dependency>
+			<groupId>com.ibm.icu</groupId>
+			<artifactId>icu4j</artifactId>
+			<version>50.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-client-compiler-deps</artifactId>
+			<version>1.2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin.external.gwt</groupId>
+			<artifactId>gwt-dev</artifactId>
+			<version>${vaadin.gwt.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
+
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>unpack-dependencies</id>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>com.vaadin.external.gwt</groupId>
+									<artifactId>gwt-dev</artifactId>
+									<includes>
+										about_files/**,
+										com/google/gwt/core/**,
+										com/google/gwt/dev/**,
+										com/google/gwt/lang/**,
+										com/google/gwt/soyc/**,
+										com/google/gwt/thirdparty/json/**,
+										com/google/gwt/util/**,
+										license/LICENSE.sax.txt,
+										netscape/**,
+										org/apache/COPYING,
+										org/apache/jasper/**,
+										org/apache/commons/el/**,
+										org/apache/commons/lang3/**,
+										templates/*,
+										about.html,
+										jetty-dir.css,
+										plugin.properties
+									</includes>
+									<excludes>
+										com/google/gwt/dev/protobuf/**,
+										com/google/gwt/dev/About.properties
+									</excludes>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>checkstyle</goal>
+						</goals>
+						<phase>process-sources</phase>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<!-- Copy .java files to package -->
+					<execution>
+						<id>copy-sources</id>
+						<!-- here the phase you need -->
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.outputDirectory}</outputDirectory>
+							<resources>
+								<resource>
+									<directory>src/main/java</directory>
+									<filtering>false</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+						<Export-Package>com.vaadin.*;version="${project.version}",com.google.gwt.*;version="${project.version}"</Export-Package>
+						<!--TODO decide gwt packages version number<Export-Package>com.vaadin.*;version="${project.version}",com.google.gwt.*;version="${vaadin.gwt.version}"</Export-Package> -->
+						<Import-Package></Import-Package> <!--todo find out what should be in Import-Package -->
+					</instructions>
+				</configuration>
+				<executions>
+					<execution>
+						<id>bundle-manifest</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+						<index />
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>animal-sniffer-maven-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/client-compiler/src/com/vaadin/sass/linker/SassLinker.java b/client-compiler/src/main/java/com/vaadin/sass/linker/SassLinker.java
index dda6733384..dda6733384 100644
--- a/client-compiler/src/com/vaadin/sass/linker/SassLinker.java
+++ b/client-compiler/src/main/java/com/vaadin/sass/linker/SassLinker.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java
index 2d08329e9a..2d08329e9a 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java
index 2b8ccc87d0..2b8ccc87d0 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ArraySerializer.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ArraySerializer.java
index 0049ae9b50..0049ae9b50 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ArraySerializer.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ArraySerializer.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java
index 992a012005..992a012005 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
index b4531eb08e..b4531eb08e 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorInitVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorInitVisitor.java
index ea3b097fa2..ea3b097fa2 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorInitVisitor.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ConnectorInitVisitor.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/CustomSerializer.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/CustomSerializer.java
index bb3dd4f61d..bb3dd4f61d 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/CustomSerializer.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/CustomSerializer.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/EnumSerializer.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/EnumSerializer.java
index 9876baf946..9876baf946 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/EnumSerializer.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/EnumSerializer.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java
index a31dafe05c..a31dafe05c 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/GeneratedSerializer.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/GeneratedSerializer.java
index 6afb172ea2..6afb172ea2 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/GeneratedSerializer.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/GeneratedSerializer.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java
index a7a6c568da..a7a6c568da 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java
index 32aad92774..32aad92774 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/OnStateChangeVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/OnStateChangeVisitor.java
index 1c0da9d9e8..1c0da9d9e8 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/OnStateChangeVisitor.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/OnStateChangeVisitor.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/Property.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/Property.java
index 0c849bead5..0c849bead5 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/Property.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/Property.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java
index 8b645aa492..8b645aa492 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java
index 86ece28041..86ece28041 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java
index 046c5c4611..046c5c4611 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/TypeVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/TypeVisitor.java
index 028e4cc44d..028e4cc44d 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/TypeVisitor.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/TypeVisitor.java
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java
index 9a9cac18ba..9a9cac18ba 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java
+++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java
diff --git a/client-compiler/src/com/vaadin/tools/CvalAddonsChecker.java b/client-compiler/src/main/java/com/vaadin/tools/CvalAddonsChecker.java
index aab7231258..aab7231258 100644
--- a/client-compiler/src/com/vaadin/tools/CvalAddonsChecker.java
+++ b/client-compiler/src/main/java/com/vaadin/tools/CvalAddonsChecker.java
diff --git a/client-compiler/src/com/vaadin/tools/CvalChecker.java b/client-compiler/src/main/java/com/vaadin/tools/CvalChecker.java
index 9217781695..9217781695 100644
--- a/client-compiler/src/com/vaadin/tools/CvalChecker.java
+++ b/client-compiler/src/main/java/com/vaadin/tools/CvalChecker.java
diff --git a/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java b/client-compiler/src/main/java/com/vaadin/tools/WidgetsetCompiler.java
index 7c06e9d7af..7c06e9d7af 100755
--- a/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java
+++ b/client-compiler/src/main/java/com/vaadin/tools/WidgetsetCompiler.java
diff --git a/client-compiler/src/main/resources/com/google/gwt/dev/About.properties b/client-compiler/src/main/resources/com/google/gwt/dev/About.properties
new file mode 100644
index 0000000000..364c323136
--- /dev/null
+++ b/client-compiler/src/main/resources/com/google/gwt/dev/About.properties
@@ -0,0 +1,2 @@
+gwt.version=${project.version}
+gwt.svnrev=
diff --git a/client-compiler/src/com/vaadin/tools/CvalChecker.properties b/client-compiler/src/main/resources/com/vaadin/tools/CvalChecker.properties
index 3f4fd52cb7..3f4fd52cb7 100644
--- a/client-compiler/src/com/vaadin/tools/CvalChecker.properties
+++ b/client-compiler/src/main/resources/com/vaadin/tools/CvalChecker.properties
diff --git a/client-compiler/tests/src/com/vaadin/tools/CvalAddonsCheckerTest.java b/client-compiler/src/test/java/com/vaadin/tools/CvalAddonsCheckerTest.java
index 1fb9413ee4..c6200bc7e0 100644
--- a/client-compiler/tests/src/com/vaadin/tools/CvalAddonsCheckerTest.java
+++ b/client-compiler/src/test/java/com/vaadin/tools/CvalAddonsCheckerTest.java
@@ -33,6 +33,8 @@ import static com.vaadin.tools.CvalCheckerTest.saveCache;
 import static com.vaadin.tools.CvalCheckerTest.unreachableLicenseProvider;
 import static com.vaadin.tools.CvalCheckerTest.validLicenseProvider;
 
+import java.net.URL;
+import java.net.URLClassLoader;
 import java.util.List;
 
 import org.junit.Assert;
@@ -58,6 +60,10 @@ public class CvalAddonsCheckerTest {
 
         deleteCache(productNameCval);
         System.getProperties().remove(licenseName);
+
+        // Set up a new URLClassLoader for the thread
+        Thread thread = Thread.currentThread();
+        thread.setContextClassLoader(new URLClassLoader(new URL[0], null));
     }
 
     @Test
@@ -83,7 +89,7 @@ public class CvalAddonsCheckerTest {
         // We have a license that has never been validated from the server and
         // we are offline
         // -> Show a message on compile time (“Your license for TouchKit 4 has
-        // not been validated.”)
+        // not been validated.")
         System.setProperty(licenseName, VALID_KEY);
         addonChecker.setLicenseProvider(unreachableLicenseProvider);
         captureSystemOut();
@@ -153,7 +159,7 @@ public class CvalAddonsCheckerTest {
         // -> Work as expected
         // -> Show info message “Using TouchKit 4 license
         // 312-312321-321312-3-12-312-312
-        // licensed to <licensee> (1 developer license)”
+        // licensed to <licensee> (1 developer license)"
         System.setProperty(licenseName, VALID_KEY);
         addonChecker.setLicenseProvider(validLicenseProvider);
         captureSystemOut();
diff --git a/client-compiler/tests/src/com/vaadin/tools/CvalAddonstCheckerUseCasesTest.java b/client-compiler/src/test/java/com/vaadin/tools/CvalAddonstCheckerUseCasesTest.java
index 89c8fc1f81..01cfe2087e 100644
--- a/client-compiler/tests/src/com/vaadin/tools/CvalAddonstCheckerUseCasesTest.java
+++ b/client-compiler/src/test/java/com/vaadin/tools/CvalAddonstCheckerUseCasesTest.java
@@ -35,7 +35,11 @@ import static com.vaadin.tools.CvalCheckerTest.unreachableLicenseProvider;
 import static com.vaadin.tools.CvalCheckerTest.validEvaluationLicenseProvider;
 import static com.vaadin.tools.CvalCheckerTest.validLicenseProvider;
 
+import java.net.URL;
+import java.net.URLClassLoader;
+
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.tools.CvalChecker.CvalServer;
@@ -81,59 +85,111 @@ public class CvalAddonstCheckerUseCasesTest {
         }
     }
 
+    @Before
+    public void setUp() {
+        // Set up a new URLClassLoader for the thread
+        Thread thread = Thread.currentThread();
+        thread.setContextClassLoader(new URLClassLoader(new URL[0], null));
+    }
+
+    /* TODO: Use more descriptive test names */
+    
     @Test
-    public void testUseCases() throws Exception {
+    public void testUseCase1() throws Exception {
         useCase(1, License.NONE, Version.AGPL, Validated.NO, Network.OFF,
                 Compile.YES, Cached.NO, Message.AGPL);
+    }
 
+    @Test
+    public void testUseCase2() throws Exception {
         useCase(2, License.NONE, Version.CVAL, Validated.NO, Network.ON,
                 Compile.NO, Cached.NO, Message.NO_LICENSE);
+    }
 
+    @Test
+    public void testUseCase3() throws Exception {
         useCase(3, License.NONE, Version.CVAL, Validated.NO, Network.OFF,
                 Compile.NO, Cached.NO, Message.NO_LICENSE);
+    }
 
+    @Test
+    public void testUseCase4() throws Exception {
         useCase(4, License.EVAL, Version.CVAL, Validated.NO, Network.ON,
                 Compile.YES, Cached.YES, Message.EVALUATION);
+    }
 
+    @Test
+    public void testUseCase5() throws Exception {
         useCase(5, License.INVALID, Version.CVAL, Validated.NO, Network.OFF,
                 Compile.YES, Cached.NO, Message.NO_VALIDATED);
+    }
 
+    @Test
+    public void testUseCase6() throws Exception {
         useCase(6, License.INVALID, Version.CVAL, Validated.NO, Network.ON,
                 Compile.NO, Cached.NO, Message.INVALID);
+    }
 
+    @Test
+    public void testUseCase7() throws Exception {
         useCase(7, License.REAL, Version.CVAL, Validated.NO, Network.ON,
                 Compile.YES, Cached.YES, Message.VALID);
+    }
 
+    @Test
+    public void testUseCase8() throws Exception {
         useCase(8, License.REAL, Version.CVAL, Validated.NO, Network.OFF,
                 Compile.YES, Cached.NO, Message.NO_VALIDATED);
+    }
 
+    @Test
+    public void testUseCase9() throws Exception {
         useCase(9, License.REAL, Version.CVAL, Validated.YES, Network.OFF,
                 Compile.YES, Cached.YES, Message.VALID);
+    }
 
+    @Test
+    public void testUseCase10() throws Exception {
         useCase(10, License.EVAL_EXPIRED, Version.CVAL, Validated.NO,
                 Network.ON, Compile.NO, Cached.YES, Message.EXPIRED);
+    }
 
+    @Test
+    public void testUseCase11() throws Exception {
         useCase(11, License.EVAL_EXPIRED, Version.CVAL, Validated.YES,
                 Network.OFF, Compile.NO, Cached.YES, Message.EXPIRED);
+    }
 
+    @Test
+    public void testUseCase12() throws Exception {
         useCase(12, License.REAL_EXPIRED, Version.CVAL, Validated.YES,
                 Network.OFF, Compile.NO, Cached.YES, Message.EXPIRED);
+    }
 
+    @Test
+    public void testUseCase13() throws Exception {
         useCase(13, License.REAL_EXPIRED, Version.CVAL, Validated.NO,
                 Network.ON, Compile.NO, Cached.YES, Message.EXPIRED);
+    }
 
+    @Test
+    public void testUseCase14() throws Exception {
         useCase(14, License.INVALID, Version.CVAL, Validated.OLD_KEY,
                 Network.OFF, Compile.YES, Cached.NO, Message.NO_VALIDATED);
     }
 
     @Test
-    public void testMultipleLicenseUseCases() throws Exception {
+    public void testMultipleLicenseUseCase15() throws Exception {
         addLicensedJarToClasspath("test.foo", VAADIN_CVAL);
         System.setProperty(computeLicenseName("test.foo"), VALID_KEY);
-
         useCase(15, License.REAL, Version.CVAL, Validated.YES, Network.OFF,
                 Compile.YES, Cached.YES, Message.NO_VALIDATED);
+    }
 
+    @Test
+    public void testMultipleLicenseUseCase16() throws Exception {
+        addLicensedJarToClasspath("test.foo", VAADIN_CVAL);
+        System.setProperty(computeLicenseName("test.foo"), VALID_KEY);
         useCase(16, License.REAL, Version.CVAL, Validated.YES, Network.ON,
                 Compile.NO, Cached.YES, Message.INVALID);
     }
diff --git a/client-compiler/tests/src/com/vaadin/tools/CvalCheckerTest.java b/client-compiler/src/test/java/com/vaadin/tools/CvalCheckerTest.java
index 6da455b2f6..6e1a8e57ed 100644
--- a/client-compiler/tests/src/com/vaadin/tools/CvalCheckerTest.java
+++ b/client-compiler/src/test/java/com/vaadin/tools/CvalCheckerTest.java
@@ -304,14 +304,14 @@ public class CvalCheckerTest {
         testManifest.getMainAttributes().putValue(VAADIN_ADDON_VERSION, "2");
 
         // Create a temporary Jar
-        File testJarFile = File.createTempFile("vaadin." + productName, "jar");
+        File testJarFile = File.createTempFile("vaadin." + productName, ".jar");
         testJarFile.deleteOnExit();
         JarOutputStream target = new JarOutputStream(new FileOutputStream(
                 testJarFile), testManifest);
         target.close();
 
         // Add the new jar to our classpath (use reflection)
-        URL url = new URL("file://" + testJarFile.getAbsolutePath());
+        URL url = testJarFile.toURI().toURL();
         final Method addURL = URLClassLoader.class.getDeclaredMethod("addURL",
                 new Class[] { URL.class });
         addURL.setAccessible(true);
diff --git a/client/build.xml b/client/build.xml
deleted file mode 100644
index 1e65dc37c5..0000000000
--- a/client/build.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="vaadin-client" basedir="." default="publish-local">
-    <description>
-        Compiles build helpers used when building other
-        modules.
-    </description>
-    <include file="../common.xml" as="common" />
-    <include file="../build.xml" as="vaadin" />
-    <include file="../gwt-files.xml" as="gwtfiles" />
-
-    <!-- global properties -->
-    <property name="module.name" value="vaadin-client" />
-    <property name="module.symbolic" value="com.vaadin.client" />
-    <property name="result.dir" value="result" />
-
-    <path id="classpath.compile.custom">
-        <!-- Could possibly compile GWT files also here to verify that a) 
-            the same dependencies are used and b) all dependencies have been declared -->
-        <fileset file="${gwt.user.jar}" />
-        <fileset file="${gwt.elemental.jar}" />
-    </path>
-    <path id="classpath.test.custom" />
-
-    <target name="jar">
-        <property name="jar.file"
-            location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
-        <antcall target="common.jar">
-            <reference refid="client.gwt.includes" torefid="extra.jar.includes" />
-        </antcall>
-        <jar destfile="${jar.file}" update="true">
-            <manifest>
-                <attribute name="Vaadin-Package-Version"
-                    value="1" />
-                <attribute name="Vaadin-Widgetsets" value="com.vaadin.DefaultWidgetSet" />
-            </manifest>
-        </jar>
-        <!-- Hack to add validation dependency with source classifier -->
-        <property name="pom.xml"
-            location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" />
-        <copy file="${pom.xml}" tofile="${temp.pom}">
-            <filterchain>
-                <replacestring from="  &lt;/dependencies&gt;"
-                    to="    &lt;dependency&gt;
-               &lt;groupId&gt;javax.validation&lt;/groupId&gt;
-               &lt;artifactId&gt;validation-api&lt;/artifactId&gt;
-               &lt;version&gt;1.0.0.GA&lt;/version&gt;
-               &lt;scope&gt;compile&lt;/scope&gt;
-               &lt;classifier&gt;sources&lt;/classifier&gt;
-             &lt;/dependency&gt;
-  &lt;/dependencies&gt;" />
-            </filterchain>
-        </copy>
-        <move file="${temp.pom}" tofile="${pom.xml}" />
-    </target>
-
-    <target name="publish-local" depends="jar">
-        <antcall target="common.sources.jar">
-            <reference torefid="extra.jar.includes" refid="client.gwt.includes" />
-        </antcall>
-        <antcall target="common.javadoc.jar" />
-
-        <antcall target="common.publish-local" />
-    </target>
-
-    <target name="clean">
-        <antcall target="common.clean" />
-    </target>
-
-    <target name="checkstyle">
-        <antcall target="common.checkstyle">
-            <param name="cs.src" location="src" />
-        </antcall>
-    </target>
-
-    <target name="test" depends="checkstyle">
-        <antcall target="common.test.run" />
-    </target>
-
-</project>
diff --git a/client/ivy.xml b/client/ivy.xml
deleted file mode 100644
index 6b941af818..0000000000
--- a/client/ivy.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
-    xmlns:m="http://ant.apache.org/ivy/maven">
-
-    <info organisation="com.vaadin" module="vaadin-client"
-        revision="${vaadin.version}" />
-
-    <configurations>
-        <conf name="build" />
-        <conf name="build-provided" />
-        <conf name="ide" visibility="private" />
-        <conf name="test" />
-    </configurations>
-    <publications>
-        <artifact type="jar" ext="jar" />
-        <artifact type="source" ext="jar" m:classifier="sources" />
-        <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
-        <artifact type="pom" ext="pom" />
-    </publications>
-    <dependencies defaultconf="build" defaultconfmapping="build,ide->default">
-        <!-- API DEPENDENCIES -->
-
-        <!-- LIBRARY DEPENDENCIES (compile time) -->
-        <!-- Project modules -->
-        <dependency org="com.vaadin" name="vaadin-shared"
-            rev="${vaadin.version}" conf="build,test->build">
-            <exclude type="pom" conf="test" />
-        </dependency>
-        <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" conf="build,test->build">
-            <exclude type="pom" conf="test" />
-        </dependency>
-
-        <!-- gwt-user dependencies -->
-        <dependency org="org.w3c.css" name="sac" rev="1.3" />
-
-        <dependency org="junit" name="junit" rev="4.11"
-            conf="test->default" />
-
-        <dependency org="javax.validation" name="validation-api"
-            rev="1.0.0.GA" conf="build->default,sources" />
-
-        <!-- Testing dependencies -->
-        <dependency org="org.easymock" name="easymock" rev="3.0"
-            conf="test,ide-> default" />
-
-    </dependencies>
-
-</ivy-module>
diff --git a/client/pom.xml b/client/pom.xml
new file mode 100644
index 0000000000..8a80b3ddbb
--- /dev/null
+++ b/client/pom.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.vaadin</groupId>
+		<artifactId>vaadin-root</artifactId>
+		<version>7.7.0-SNAPSHOT</version>
+	</parent>
+	<groupId>com.vaadin</groupId>
+	<artifactId>vaadin-client</artifactId>
+	<name>vaadin-client</name>
+	<packaging>jar</packaging>
+
+	<url>https://vaadin.com/</url>
+	<description>Vaadin client</description>
+
+	<dependencies>
+		<!-- LIBRARY DEPENDENCIES (compile time) -->
+		<!-- Project modules -->
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-shared</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-server</artifactId>
+			<version>${project.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.vaadin</groupId>
+					<artifactId>vaadin-sass-compiler</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<!-- gwt-user dependencies -->
+		<dependency>
+			<groupId>org.w3c.css</groupId>
+			<artifactId>sac</artifactId>
+			<version>1.3</version>
+		</dependency>
+
+		<!-- Bean Validation API -->
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>${javax.validation.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>${javax.validation.version}</version>
+			<classifier>sources</classifier>
+		</dependency>
+
+		<!-- Testing dependencies -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.11</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.easymock</groupId>
+			<artifactId>easymock</artifactId>
+			<version>3.0</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- Needed GWT dependencies. Required parts are packaged to jar -->
+		<dependency>
+			<groupId>com.vaadin.external.gwt</groupId>
+			<artifactId>gwt-user</artifactId>
+			<version>${vaadin.gwt.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin.external.gwt</groupId>
+			<artifactId>gwt-elemental</artifactId>
+			<version>${vaadin.gwt.version}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+
+			<!-- Copy needed GWT dependencies to package -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>unpack-dependencies</id>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>com.vaadin.external.gwt</groupId>
+									<artifactId>gwt-user</artifactId>
+									<excludes>
+										META-INF/**,
+										**/*.gwtar,
+										com/google/gwt/*/server/**,
+										com/google/gwt/*/shared/**,
+										com/google/gwt/*/*/shared/**,
+										com/google/web/bindery/*/shared/**,
+										com/google/gwt/user/client/rpc/IsSerializable.*,
+										com/google/gwt/thirdparty/streamhtmlparser/**,
+										org/w3c/**,
+										javax/servlet/**
+									</excludes>
+								</artifactItem>
+								<artifactItem>
+									<groupId>com.vaadin.external.gwt</groupId>
+									<artifactId>gwt-elemental</artifactId>
+									<excludes>META-INF/**</excludes>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<!-- Copy .java files to package -->
+					<execution>
+						<id>copy-sources</id>
+						<!-- here the phase you need -->
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.outputDirectory}</outputDirectory>
+							<resources>
+								<resource>
+									<directory>src/main/resources</directory>
+									<filtering>false</filtering>
+								</resource>
+								<resource>
+									<directory>src/main/java</directory>
+									<filtering>false</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+						<Export-Package>com.vaadin.*;version="${project.version}",com.google.*;version="${project.version}"</Export-Package>
+						<Import-Package></Import-Package>
+					</instructions>
+				</configuration>
+				<executions>
+					<execution>
+						<id>bundle-manifest</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+						<index>false</index>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+						<manifestEntries>
+							<Vaadin-Package-Version>1</Vaadin-Package-Version>
+							<Vaadin-Widgetsets>com.vaadin.DefaultWidgetSet</Vaadin-Widgetsets>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>checkstyle</goal>
+						</goals>
+						<phase>process-sources</phase>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>animal-sniffer-maven-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/client/src/com/vaadin/client/AnimationUtil.java b/client/src/main/java/com/vaadin/client/AnimationUtil.java
index 063a0a163e..063a0a163e 100644
--- a/client/src/com/vaadin/client/AnimationUtil.java
+++ b/client/src/main/java/com/vaadin/client/AnimationUtil.java
diff --git a/client/src/com/vaadin/client/ApplicationConfiguration.java b/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java
index f14802c931..f14802c931 100644
--- a/client/src/com/vaadin/client/ApplicationConfiguration.java
+++ b/client/src/main/java/com/vaadin/client/ApplicationConfiguration.java
diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/main/java/com/vaadin/client/ApplicationConnection.java
index 97ddd14764..97ddd14764 100644
--- a/client/src/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/main/java/com/vaadin/client/ApplicationConnection.java
diff --git a/client/src/com/vaadin/client/BrowserInfo.java b/client/src/main/java/com/vaadin/client/BrowserInfo.java
index 8dcefddcf5..8dcefddcf5 100644
--- a/client/src/com/vaadin/client/BrowserInfo.java
+++ b/client/src/main/java/com/vaadin/client/BrowserInfo.java
diff --git a/client/src/com/vaadin/client/CSSRule.java b/client/src/main/java/com/vaadin/client/CSSRule.java
index a1ddce6d0a..a1ddce6d0a 100644
--- a/client/src/com/vaadin/client/CSSRule.java
+++ b/client/src/main/java/com/vaadin/client/CSSRule.java
diff --git a/client/src/com/vaadin/client/ComponentConnector.java b/client/src/main/java/com/vaadin/client/ComponentConnector.java
index d0c943d553..d0c943d553 100644
--- a/client/src/com/vaadin/client/ComponentConnector.java
+++ b/client/src/main/java/com/vaadin/client/ComponentConnector.java
diff --git a/client/src/com/vaadin/client/ComponentDetail.java b/client/src/main/java/com/vaadin/client/ComponentDetail.java
index 9e5e2a82a8..9e5e2a82a8 100644
--- a/client/src/com/vaadin/client/ComponentDetail.java
+++ b/client/src/main/java/com/vaadin/client/ComponentDetail.java
diff --git a/client/src/com/vaadin/client/ComponentDetailMap.java b/client/src/main/java/com/vaadin/client/ComponentDetailMap.java
index c99ebd2738..c99ebd2738 100644
--- a/client/src/com/vaadin/client/ComponentDetailMap.java
+++ b/client/src/main/java/com/vaadin/client/ComponentDetailMap.java
diff --git a/client/src/com/vaadin/client/ComputedStyle.java b/client/src/main/java/com/vaadin/client/ComputedStyle.java
index 65a6e69019..65a6e69019 100644
--- a/client/src/com/vaadin/client/ComputedStyle.java
+++ b/client/src/main/java/com/vaadin/client/ComputedStyle.java
diff --git a/client/src/com/vaadin/client/ConnectorHierarchyChangeEvent.java b/client/src/main/java/com/vaadin/client/ConnectorHierarchyChangeEvent.java
index 267b3d3bfd..267b3d3bfd 100644
--- a/client/src/com/vaadin/client/ConnectorHierarchyChangeEvent.java
+++ b/client/src/main/java/com/vaadin/client/ConnectorHierarchyChangeEvent.java
diff --git a/client/src/com/vaadin/client/ConnectorMap.java b/client/src/main/java/com/vaadin/client/ConnectorMap.java
index 3200dd6ab4..3200dd6ab4 100644
--- a/client/src/com/vaadin/client/ConnectorMap.java
+++ b/client/src/main/java/com/vaadin/client/ConnectorMap.java
diff --git a/client/src/com/vaadin/client/ContainerResizedListener.java b/client/src/main/java/com/vaadin/client/ContainerResizedListener.java
index 702542f0ac..702542f0ac 100644
--- a/client/src/com/vaadin/client/ContainerResizedListener.java
+++ b/client/src/main/java/com/vaadin/client/ContainerResizedListener.java
diff --git a/client/src/com/vaadin/client/DateTimeService.java b/client/src/main/java/com/vaadin/client/DateTimeService.java
index 04006d85fb..04006d85fb 100644
--- a/client/src/com/vaadin/client/DateTimeService.java
+++ b/client/src/main/java/com/vaadin/client/DateTimeService.java
diff --git a/client/src/com/vaadin/client/DeferredWorker.java b/client/src/main/java/com/vaadin/client/DeferredWorker.java
index cc22cda2a2..cc22cda2a2 100644
--- a/client/src/com/vaadin/client/DeferredWorker.java
+++ b/client/src/main/java/com/vaadin/client/DeferredWorker.java
diff --git a/client/src/com/vaadin/client/DirectionalManagedLayout.java b/client/src/main/java/com/vaadin/client/DirectionalManagedLayout.java
index eab9811082..eab9811082 100644
--- a/client/src/com/vaadin/client/DirectionalManagedLayout.java
+++ b/client/src/main/java/com/vaadin/client/DirectionalManagedLayout.java
diff --git a/client/src/com/vaadin/client/EventHelper.java b/client/src/main/java/com/vaadin/client/EventHelper.java
index 1ee252af0f..1ee252af0f 100644
--- a/client/src/com/vaadin/client/EventHelper.java
+++ b/client/src/main/java/com/vaadin/client/EventHelper.java
diff --git a/client/src/com/vaadin/client/FastStringMap.java b/client/src/main/java/com/vaadin/client/FastStringMap.java
index ba3d07025b..ba3d07025b 100644
--- a/client/src/com/vaadin/client/FastStringMap.java
+++ b/client/src/main/java/com/vaadin/client/FastStringMap.java
diff --git a/client/src/com/vaadin/client/FastStringSet.java b/client/src/main/java/com/vaadin/client/FastStringSet.java
index 756bd374dc..756bd374dc 100644
--- a/client/src/com/vaadin/client/FastStringSet.java
+++ b/client/src/main/java/com/vaadin/client/FastStringSet.java
diff --git a/client/src/com/vaadin/client/Focusable.java b/client/src/main/java/com/vaadin/client/Focusable.java
index 05b32a7b05..05b32a7b05 100644
--- a/client/src/com/vaadin/client/Focusable.java
+++ b/client/src/main/java/com/vaadin/client/Focusable.java
diff --git a/client/src/com/vaadin/client/HasChildMeasurementHintConnector.java b/client/src/main/java/com/vaadin/client/HasChildMeasurementHintConnector.java
index bb76377cd1..bb76377cd1 100644
--- a/client/src/com/vaadin/client/HasChildMeasurementHintConnector.java
+++ b/client/src/main/java/com/vaadin/client/HasChildMeasurementHintConnector.java
diff --git a/client/src/com/vaadin/client/HasComponentsConnector.java b/client/src/main/java/com/vaadin/client/HasComponentsConnector.java
index 19b93edd61..19b93edd61 100644
--- a/client/src/com/vaadin/client/HasComponentsConnector.java
+++ b/client/src/main/java/com/vaadin/client/HasComponentsConnector.java
diff --git a/client/src/com/vaadin/client/JavaScriptConnectorHelper.java b/client/src/main/java/com/vaadin/client/JavaScriptConnectorHelper.java
index 1833b370e5..1833b370e5 100644
--- a/client/src/com/vaadin/client/JavaScriptConnectorHelper.java
+++ b/client/src/main/java/com/vaadin/client/JavaScriptConnectorHelper.java
diff --git a/client/src/com/vaadin/client/JavaScriptExtension.java b/client/src/main/java/com/vaadin/client/JavaScriptExtension.java
index 9c60d38a5a..9c60d38a5a 100644
--- a/client/src/com/vaadin/client/JavaScriptExtension.java
+++ b/client/src/main/java/com/vaadin/client/JavaScriptExtension.java
diff --git a/client/src/com/vaadin/client/JsArrayObject.java b/client/src/main/java/com/vaadin/client/JsArrayObject.java
index b6dcf3789d..b6dcf3789d 100644
--- a/client/src/com/vaadin/client/JsArrayObject.java
+++ b/client/src/main/java/com/vaadin/client/JsArrayObject.java
diff --git a/client/src/com/vaadin/client/LayoutManager.java b/client/src/main/java/com/vaadin/client/LayoutManager.java
index ed83e195d7..ed83e195d7 100644
--- a/client/src/com/vaadin/client/LayoutManager.java
+++ b/client/src/main/java/com/vaadin/client/LayoutManager.java
diff --git a/client/src/com/vaadin/client/LayoutManagerIE8.java b/client/src/main/java/com/vaadin/client/LayoutManagerIE8.java
index 479155d0e6..479155d0e6 100644
--- a/client/src/com/vaadin/client/LayoutManagerIE8.java
+++ b/client/src/main/java/com/vaadin/client/LayoutManagerIE8.java
diff --git a/client/src/com/vaadin/client/LocaleNotLoadedException.java b/client/src/main/java/com/vaadin/client/LocaleNotLoadedException.java
index 6f59e786e4..6f59e786e4 100644
--- a/client/src/com/vaadin/client/LocaleNotLoadedException.java
+++ b/client/src/main/java/com/vaadin/client/LocaleNotLoadedException.java
diff --git a/client/src/com/vaadin/client/LocaleService.java b/client/src/main/java/com/vaadin/client/LocaleService.java
index dcd1c9ea4e..dcd1c9ea4e 100644
--- a/client/src/com/vaadin/client/LocaleService.java
+++ b/client/src/main/java/com/vaadin/client/LocaleService.java
diff --git a/client/src/com/vaadin/client/MeasuredSize.java b/client/src/main/java/com/vaadin/client/MeasuredSize.java
index 2099008350..2099008350 100644
--- a/client/src/com/vaadin/client/MeasuredSize.java
+++ b/client/src/main/java/com/vaadin/client/MeasuredSize.java
diff --git a/client/src/com/vaadin/client/MouseEventDetailsBuilder.java b/client/src/main/java/com/vaadin/client/MouseEventDetailsBuilder.java
index 11ebe3925c..11ebe3925c 100644
--- a/client/src/com/vaadin/client/MouseEventDetailsBuilder.java
+++ b/client/src/main/java/com/vaadin/client/MouseEventDetailsBuilder.java
diff --git a/client/src/com/vaadin/client/Paintable.java b/client/src/main/java/com/vaadin/client/Paintable.java
index 34f2d0714f..34f2d0714f 100644
--- a/client/src/com/vaadin/client/Paintable.java
+++ b/client/src/main/java/com/vaadin/client/Paintable.java
diff --git a/client/src/com/vaadin/client/Profiler.java b/client/src/main/java/com/vaadin/client/Profiler.java
index 3923b66218..3923b66218 100644
--- a/client/src/com/vaadin/client/Profiler.java
+++ b/client/src/main/java/com/vaadin/client/Profiler.java
diff --git a/client/src/com/vaadin/client/RenderInformation.java b/client/src/main/java/com/vaadin/client/RenderInformation.java
index 8fd3fc7e0b..8fd3fc7e0b 100644
--- a/client/src/com/vaadin/client/RenderInformation.java
+++ b/client/src/main/java/com/vaadin/client/RenderInformation.java
diff --git a/client/src/com/vaadin/client/RenderSpace.java b/client/src/main/java/com/vaadin/client/RenderSpace.java
index dff774aa6f..dff774aa6f 100644
--- a/client/src/com/vaadin/client/RenderSpace.java
+++ b/client/src/main/java/com/vaadin/client/RenderSpace.java
diff --git a/client/src/com/vaadin/client/ResourceLoader.java b/client/src/main/java/com/vaadin/client/ResourceLoader.java
index 559768d09c..559768d09c 100644
--- a/client/src/com/vaadin/client/ResourceLoader.java
+++ b/client/src/main/java/com/vaadin/client/ResourceLoader.java
diff --git a/client/src/com/vaadin/client/ServerConnector.java b/client/src/main/java/com/vaadin/client/ServerConnector.java
index 0bc2ac9995..0bc2ac9995 100644
--- a/client/src/com/vaadin/client/ServerConnector.java
+++ b/client/src/main/java/com/vaadin/client/ServerConnector.java
diff --git a/client/src/com/vaadin/client/SimpleTree.java b/client/src/main/java/com/vaadin/client/SimpleTree.java
index 3c63f54d5f..3c63f54d5f 100644
--- a/client/src/com/vaadin/client/SimpleTree.java
+++ b/client/src/main/java/com/vaadin/client/SimpleTree.java
diff --git a/client/src/com/vaadin/client/StyleConstants.java b/client/src/main/java/com/vaadin/client/StyleConstants.java
index fad88f1359..fad88f1359 100644
--- a/client/src/com/vaadin/client/StyleConstants.java
+++ b/client/src/main/java/com/vaadin/client/StyleConstants.java
diff --git a/client/src/com/vaadin/client/SuperDevMode.java b/client/src/main/java/com/vaadin/client/SuperDevMode.java
index f664244715..f664244715 100644
--- a/client/src/com/vaadin/client/SuperDevMode.java
+++ b/client/src/main/java/com/vaadin/client/SuperDevMode.java
diff --git a/client/src/com/vaadin/client/TooltipInfo.java b/client/src/main/java/com/vaadin/client/TooltipInfo.java
index c1dd5037eb..c1dd5037eb 100644
--- a/client/src/com/vaadin/client/TooltipInfo.java
+++ b/client/src/main/java/com/vaadin/client/TooltipInfo.java
diff --git a/client/src/com/vaadin/client/UIDL.java b/client/src/main/java/com/vaadin/client/UIDL.java
index 2c2a5de308..2c2a5de308 100644
--- a/client/src/com/vaadin/client/UIDL.java
+++ b/client/src/main/java/com/vaadin/client/UIDL.java
diff --git a/client/src/com/vaadin/client/Util.java b/client/src/main/java/com/vaadin/client/Util.java
index 8b5caa6051..8b5caa6051 100644
--- a/client/src/com/vaadin/client/Util.java
+++ b/client/src/main/java/com/vaadin/client/Util.java
diff --git a/client/src/com/vaadin/client/VCaption.java b/client/src/main/java/com/vaadin/client/VCaption.java
index ace4fd7184..ace4fd7184 100644
--- a/client/src/com/vaadin/client/VCaption.java
+++ b/client/src/main/java/com/vaadin/client/VCaption.java
diff --git a/client/src/com/vaadin/client/VCaptionWrapper.java b/client/src/main/java/com/vaadin/client/VCaptionWrapper.java
index 382126f409..382126f409 100644
--- a/client/src/com/vaadin/client/VCaptionWrapper.java
+++ b/client/src/main/java/com/vaadin/client/VCaptionWrapper.java
diff --git a/client/src/com/vaadin/client/VConsole.java b/client/src/main/java/com/vaadin/client/VConsole.java
index c01711c5b3..c01711c5b3 100644
--- a/client/src/com/vaadin/client/VConsole.java
+++ b/client/src/main/java/com/vaadin/client/VConsole.java
diff --git a/client/src/com/vaadin/client/VErrorMessage.java b/client/src/main/java/com/vaadin/client/VErrorMessage.java
index 271c7b1be8..271c7b1be8 100644
--- a/client/src/com/vaadin/client/VErrorMessage.java
+++ b/client/src/main/java/com/vaadin/client/VErrorMessage.java
diff --git a/client/src/com/vaadin/client/VLoadingIndicator.java b/client/src/main/java/com/vaadin/client/VLoadingIndicator.java
index 7c7edeb04f..7c7edeb04f 100644
--- a/client/src/com/vaadin/client/VLoadingIndicator.java
+++ b/client/src/main/java/com/vaadin/client/VLoadingIndicator.java
diff --git a/client/src/com/vaadin/client/VSchedulerImpl.java b/client/src/main/java/com/vaadin/client/VSchedulerImpl.java
index 2c0657eb59..2c0657eb59 100644
--- a/client/src/com/vaadin/client/VSchedulerImpl.java
+++ b/client/src/main/java/com/vaadin/client/VSchedulerImpl.java
diff --git a/client/src/com/vaadin/client/VTooltip.java b/client/src/main/java/com/vaadin/client/VTooltip.java
index f3d65cd20a..f3d65cd20a 100644
--- a/client/src/com/vaadin/client/VTooltip.java
+++ b/client/src/main/java/com/vaadin/client/VTooltip.java
diff --git a/client/src/com/vaadin/client/VUIDLBrowser.java b/client/src/main/java/com/vaadin/client/VUIDLBrowser.java
index 08f4c653a5..08f4c653a5 100644
--- a/client/src/com/vaadin/client/VUIDLBrowser.java
+++ b/client/src/main/java/com/vaadin/client/VUIDLBrowser.java
diff --git a/client/src/com/vaadin/client/ValueMap.java b/client/src/main/java/com/vaadin/client/ValueMap.java
index 460b6491d0..460b6491d0 100644
--- a/client/src/com/vaadin/client/ValueMap.java
+++ b/client/src/main/java/com/vaadin/client/ValueMap.java
diff --git a/client/src/com/vaadin/client/WidgetInstantiator.java b/client/src/main/java/com/vaadin/client/WidgetInstantiator.java
index 727db967ef..727db967ef 100644
--- a/client/src/com/vaadin/client/WidgetInstantiator.java
+++ b/client/src/main/java/com/vaadin/client/WidgetInstantiator.java
diff --git a/client/src/com/vaadin/client/WidgetLoader.java b/client/src/main/java/com/vaadin/client/WidgetLoader.java
index 4cc1cd1d5f..4cc1cd1d5f 100644
--- a/client/src/com/vaadin/client/WidgetLoader.java
+++ b/client/src/main/java/com/vaadin/client/WidgetLoader.java
diff --git a/client/src/com/vaadin/client/WidgetMap.java b/client/src/main/java/com/vaadin/client/WidgetMap.java
index ec053eb511..ec053eb511 100644
--- a/client/src/com/vaadin/client/WidgetMap.java
+++ b/client/src/main/java/com/vaadin/client/WidgetMap.java
diff --git a/client/src/com/vaadin/client/WidgetSet.java b/client/src/main/java/com/vaadin/client/WidgetSet.java
index e85eac388f..e85eac388f 100644
--- a/client/src/com/vaadin/client/WidgetSet.java
+++ b/client/src/main/java/com/vaadin/client/WidgetSet.java
diff --git a/client/src/com/vaadin/client/WidgetUtil.java b/client/src/main/java/com/vaadin/client/WidgetUtil.java
index 8161ceff19..8161ceff19 100644
--- a/client/src/com/vaadin/client/WidgetUtil.java
+++ b/client/src/main/java/com/vaadin/client/WidgetUtil.java
diff --git a/client/src/com/vaadin/client/annotations/OnStateChange.java b/client/src/main/java/com/vaadin/client/annotations/OnStateChange.java
index d15e32f493..d15e32f493 100644
--- a/client/src/com/vaadin/client/annotations/OnStateChange.java
+++ b/client/src/main/java/com/vaadin/client/annotations/OnStateChange.java
diff --git a/client/src/com/vaadin/client/communication/AbstractServerConnectorEvent.java b/client/src/main/java/com/vaadin/client/communication/AbstractServerConnectorEvent.java
index 9f99a451e1..9f99a451e1 100644
--- a/client/src/com/vaadin/client/communication/AbstractServerConnectorEvent.java
+++ b/client/src/main/java/com/vaadin/client/communication/AbstractServerConnectorEvent.java
diff --git a/client/src/com/vaadin/client/communication/AtmospherePushConnection.java b/client/src/main/java/com/vaadin/client/communication/AtmospherePushConnection.java
index dd44d1cb6b..dd44d1cb6b 100644
--- a/client/src/com/vaadin/client/communication/AtmospherePushConnection.java
+++ b/client/src/main/java/com/vaadin/client/communication/AtmospherePushConnection.java
diff --git a/client/src/com/vaadin/client/communication/ConnectionStateHandler.java b/client/src/main/java/com/vaadin/client/communication/ConnectionStateHandler.java
index cc33dd0086..cc33dd0086 100644
--- a/client/src/com/vaadin/client/communication/ConnectionStateHandler.java
+++ b/client/src/main/java/com/vaadin/client/communication/ConnectionStateHandler.java
diff --git a/client/src/com/vaadin/client/communication/Date_Serializer.java b/client/src/main/java/com/vaadin/client/communication/Date_Serializer.java
index 14eb6e4e3d..14eb6e4e3d 100644
--- a/client/src/com/vaadin/client/communication/Date_Serializer.java
+++ b/client/src/main/java/com/vaadin/client/communication/Date_Serializer.java
diff --git a/client/src/com/vaadin/client/communication/DefaultConnectionStateHandler.java b/client/src/main/java/com/vaadin/client/communication/DefaultConnectionStateHandler.java
index f32bd5c5ea..f32bd5c5ea 100644
--- a/client/src/com/vaadin/client/communication/DefaultConnectionStateHandler.java
+++ b/client/src/main/java/com/vaadin/client/communication/DefaultConnectionStateHandler.java
diff --git a/client/src/com/vaadin/client/communication/DefaultReconnectDialog.java b/client/src/main/java/com/vaadin/client/communication/DefaultReconnectDialog.java
index 05b4e109ff..05b4e109ff 100644
--- a/client/src/com/vaadin/client/communication/DefaultReconnectDialog.java
+++ b/client/src/main/java/com/vaadin/client/communication/DefaultReconnectDialog.java
diff --git a/client/src/com/vaadin/client/communication/DiffJSONSerializer.java b/client/src/main/java/com/vaadin/client/communication/DiffJSONSerializer.java
index d433a8964c..d433a8964c 100644
--- a/client/src/com/vaadin/client/communication/DiffJSONSerializer.java
+++ b/client/src/main/java/com/vaadin/client/communication/DiffJSONSerializer.java
diff --git a/client/src/com/vaadin/client/communication/HasJavaScriptConnectorHelper.java b/client/src/main/java/com/vaadin/client/communication/HasJavaScriptConnectorHelper.java
index deb5900b89..deb5900b89 100644
--- a/client/src/com/vaadin/client/communication/HasJavaScriptConnectorHelper.java
+++ b/client/src/main/java/com/vaadin/client/communication/HasJavaScriptConnectorHelper.java
diff --git a/client/src/com/vaadin/client/communication/Heartbeat.java b/client/src/main/java/com/vaadin/client/communication/Heartbeat.java
index f38fbca5c8..f38fbca5c8 100644
--- a/client/src/com/vaadin/client/communication/Heartbeat.java
+++ b/client/src/main/java/com/vaadin/client/communication/Heartbeat.java
diff --git a/client/src/com/vaadin/client/communication/JSONSerializer.java b/client/src/main/java/com/vaadin/client/communication/JSONSerializer.java
index 59e0329ae1..59e0329ae1 100644
--- a/client/src/com/vaadin/client/communication/JSONSerializer.java
+++ b/client/src/main/java/com/vaadin/client/communication/JSONSerializer.java
diff --git a/client/src/com/vaadin/client/communication/JavaScriptMethodInvocation.java b/client/src/main/java/com/vaadin/client/communication/JavaScriptMethodInvocation.java
index 43366902e2..43366902e2 100644
--- a/client/src/com/vaadin/client/communication/JavaScriptMethodInvocation.java
+++ b/client/src/main/java/com/vaadin/client/communication/JavaScriptMethodInvocation.java
diff --git a/client/src/com/vaadin/client/communication/JsonDecoder.java b/client/src/main/java/com/vaadin/client/communication/JsonDecoder.java
index 0ce89c873e..0ce89c873e 100644
--- a/client/src/com/vaadin/client/communication/JsonDecoder.java
+++ b/client/src/main/java/com/vaadin/client/communication/JsonDecoder.java
diff --git a/client/src/com/vaadin/client/communication/JsonEncoder.java b/client/src/main/java/com/vaadin/client/communication/JsonEncoder.java
index 8d2a447ac5..8d2a447ac5 100644
--- a/client/src/com/vaadin/client/communication/JsonEncoder.java
+++ b/client/src/main/java/com/vaadin/client/communication/JsonEncoder.java
diff --git a/client/src/com/vaadin/client/communication/MessageHandler.java b/client/src/main/java/com/vaadin/client/communication/MessageHandler.java
index 3ffadeb9ce..3ffadeb9ce 100644
--- a/client/src/com/vaadin/client/communication/MessageHandler.java
+++ b/client/src/main/java/com/vaadin/client/communication/MessageHandler.java
diff --git a/client/src/com/vaadin/client/communication/MessageSender.java b/client/src/main/java/com/vaadin/client/communication/MessageSender.java
index 5862809b0c..5862809b0c 100644
--- a/client/src/com/vaadin/client/communication/MessageSender.java
+++ b/client/src/main/java/com/vaadin/client/communication/MessageSender.java
diff --git a/client/src/com/vaadin/client/communication/PushConnection.java b/client/src/main/java/com/vaadin/client/communication/PushConnection.java
index 489d2c39a4..489d2c39a4 100644
--- a/client/src/com/vaadin/client/communication/PushConnection.java
+++ b/client/src/main/java/com/vaadin/client/communication/PushConnection.java
diff --git a/client/src/com/vaadin/client/communication/ReconnectDialog.java b/client/src/main/java/com/vaadin/client/communication/ReconnectDialog.java
index 1e77eb63b8..1e77eb63b8 100644
--- a/client/src/com/vaadin/client/communication/ReconnectDialog.java
+++ b/client/src/main/java/com/vaadin/client/communication/ReconnectDialog.java
diff --git a/client/src/com/vaadin/client/communication/RpcManager.java b/client/src/main/java/com/vaadin/client/communication/RpcManager.java
index dfcfb47f46..dfcfb47f46 100644
--- a/client/src/com/vaadin/client/communication/RpcManager.java
+++ b/client/src/main/java/com/vaadin/client/communication/RpcManager.java
diff --git a/client/src/com/vaadin/client/communication/RpcProxy.java b/client/src/main/java/com/vaadin/client/communication/RpcProxy.java
index b757590f77..b757590f77 100644
--- a/client/src/com/vaadin/client/communication/RpcProxy.java
+++ b/client/src/main/java/com/vaadin/client/communication/RpcProxy.java
diff --git a/client/src/com/vaadin/client/communication/ServerRpcQueue.java b/client/src/main/java/com/vaadin/client/communication/ServerRpcQueue.java
index e5d5ea8a25..e5d5ea8a25 100644
--- a/client/src/com/vaadin/client/communication/ServerRpcQueue.java
+++ b/client/src/main/java/com/vaadin/client/communication/ServerRpcQueue.java
diff --git a/client/src/com/vaadin/client/communication/StateChangeEvent.java b/client/src/main/java/com/vaadin/client/communication/StateChangeEvent.java
index c2c1ceaea9..c2c1ceaea9 100644
--- a/client/src/com/vaadin/client/communication/StateChangeEvent.java
+++ b/client/src/main/java/com/vaadin/client/communication/StateChangeEvent.java
diff --git a/client/src/com/vaadin/client/communication/TranslatedURLReference.java b/client/src/main/java/com/vaadin/client/communication/TranslatedURLReference.java
index 9296662234..9296662234 100644
--- a/client/src/com/vaadin/client/communication/TranslatedURLReference.java
+++ b/client/src/main/java/com/vaadin/client/communication/TranslatedURLReference.java
diff --git a/client/src/com/vaadin/client/communication/URLReference_Serializer.java b/client/src/main/java/com/vaadin/client/communication/URLReference_Serializer.java
index 71403c3fb3..71403c3fb3 100644
--- a/client/src/com/vaadin/client/communication/URLReference_Serializer.java
+++ b/client/src/main/java/com/vaadin/client/communication/URLReference_Serializer.java
diff --git a/client/src/com/vaadin/client/communication/XhrConnection.java b/client/src/main/java/com/vaadin/client/communication/XhrConnection.java
index 11e3cf3cb7..11e3cf3cb7 100644
--- a/client/src/com/vaadin/client/communication/XhrConnection.java
+++ b/client/src/main/java/com/vaadin/client/communication/XhrConnection.java
diff --git a/client/src/com/vaadin/client/communication/XhrConnectionError.java b/client/src/main/java/com/vaadin/client/communication/XhrConnectionError.java
index 025f1d70e7..025f1d70e7 100644
--- a/client/src/com/vaadin/client/communication/XhrConnectionError.java
+++ b/client/src/main/java/com/vaadin/client/communication/XhrConnectionError.java
diff --git a/client/src/com/vaadin/client/componentlocator/ComponentLocator.java b/client/src/main/java/com/vaadin/client/componentlocator/ComponentLocator.java
index 0dfaf99cc1..0dfaf99cc1 100644
--- a/client/src/com/vaadin/client/componentlocator/ComponentLocator.java
+++ b/client/src/main/java/com/vaadin/client/componentlocator/ComponentLocator.java
diff --git a/client/src/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java b/client/src/main/java/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java
index 517d979c8e..517d979c8e 100644
--- a/client/src/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java
+++ b/client/src/main/java/com/vaadin/client/componentlocator/LegacyLocatorStrategy.java
diff --git a/client/src/com/vaadin/client/componentlocator/LocatorStrategy.java b/client/src/main/java/com/vaadin/client/componentlocator/LocatorStrategy.java
index 15a156a815..15a156a815 100644
--- a/client/src/com/vaadin/client/componentlocator/LocatorStrategy.java
+++ b/client/src/main/java/com/vaadin/client/componentlocator/LocatorStrategy.java
diff --git a/client/src/com/vaadin/client/componentlocator/LocatorUtil.java b/client/src/main/java/com/vaadin/client/componentlocator/LocatorUtil.java
index 7de0de3855..7de0de3855 100644
--- a/client/src/com/vaadin/client/componentlocator/LocatorUtil.java
+++ b/client/src/main/java/com/vaadin/client/componentlocator/LocatorUtil.java
diff --git a/client/src/com/vaadin/client/componentlocator/SelectorPredicate.java b/client/src/main/java/com/vaadin/client/componentlocator/SelectorPredicate.java
index 31f6cc9b05..31f6cc9b05 100644
--- a/client/src/com/vaadin/client/componentlocator/SelectorPredicate.java
+++ b/client/src/main/java/com/vaadin/client/componentlocator/SelectorPredicate.java
diff --git a/client/src/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java b/client/src/main/java/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java
index 44bdeddff3..44bdeddff3 100644
--- a/client/src/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java
+++ b/client/src/main/java/com/vaadin/client/componentlocator/VaadinFinderLocatorStrategy.java
diff --git a/client/src/com/vaadin/client/connectors/AbstractRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/AbstractRendererConnector.java
index f7e3c15ac8..f7e3c15ac8 100644
--- a/client/src/com/vaadin/client/connectors/AbstractRendererConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/AbstractRendererConnector.java
diff --git a/client/src/com/vaadin/client/connectors/AbstractSelectionModelConnector.java b/client/src/main/java/com/vaadin/client/connectors/AbstractSelectionModelConnector.java
index 3a96f0f03b..3a96f0f03b 100644
--- a/client/src/com/vaadin/client/connectors/AbstractSelectionModelConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/AbstractSelectionModelConnector.java
diff --git a/client/src/com/vaadin/client/connectors/ButtonRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java
index 094ca24b5a..094ca24b5a 100644
--- a/client/src/com/vaadin/client/connectors/ButtonRendererConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java
diff --git a/client/src/com/vaadin/client/connectors/ClickableRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/ClickableRendererConnector.java
index 9d16a57a17..9d16a57a17 100644
--- a/client/src/com/vaadin/client/connectors/ClickableRendererConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/ClickableRendererConnector.java
diff --git a/client/src/com/vaadin/client/connectors/DateRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/DateRendererConnector.java
index c861df6369..c861df6369 100644
--- a/client/src/com/vaadin/client/connectors/DateRendererConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/DateRendererConnector.java
diff --git a/client/src/com/vaadin/client/connectors/DetailComponentManagerConnector.java b/client/src/main/java/com/vaadin/client/connectors/DetailComponentManagerConnector.java
index 6830d27ef0..6830d27ef0 100644
--- a/client/src/com/vaadin/client/connectors/DetailComponentManagerConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/DetailComponentManagerConnector.java
diff --git a/client/src/com/vaadin/client/connectors/GridConnector.java b/client/src/main/java/com/vaadin/client/connectors/GridConnector.java
index f53d9c9d04..f53d9c9d04 100644
--- a/client/src/com/vaadin/client/connectors/GridConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/GridConnector.java
diff --git a/client/src/com/vaadin/client/connectors/ImageRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/ImageRendererConnector.java
index f7690cb6fe..f7690cb6fe 100644
--- a/client/src/com/vaadin/client/connectors/ImageRendererConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/ImageRendererConnector.java
diff --git a/client/src/com/vaadin/client/connectors/JavaScriptRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java
index 1229922a9c..1229922a9c 100644
--- a/client/src/com/vaadin/client/connectors/JavaScriptRendererConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java
diff --git a/client/src/com/vaadin/client/connectors/MultiSelectionModelConnector.java b/client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java
index 5d00619995..5d00619995 100644
--- a/client/src/com/vaadin/client/connectors/MultiSelectionModelConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java
diff --git a/client/src/com/vaadin/client/connectors/NoSelectionModelConnector.java b/client/src/main/java/com/vaadin/client/connectors/NoSelectionModelConnector.java
index b9f2d626c2..b9f2d626c2 100644
--- a/client/src/com/vaadin/client/connectors/NoSelectionModelConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/NoSelectionModelConnector.java
diff --git a/client/src/com/vaadin/client/connectors/NumberRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/NumberRendererConnector.java
index c044e0d6f1..c044e0d6f1 100644
--- a/client/src/com/vaadin/client/connectors/NumberRendererConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/NumberRendererConnector.java
diff --git a/client/src/com/vaadin/client/connectors/ProgressBarRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/ProgressBarRendererConnector.java
index 9b5e8a9677..9b5e8a9677 100644
--- a/client/src/com/vaadin/client/connectors/ProgressBarRendererConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/ProgressBarRendererConnector.java
diff --git a/client/src/com/vaadin/client/connectors/RpcDataSourceConnector.java b/client/src/main/java/com/vaadin/client/connectors/RpcDataSourceConnector.java
index d744bbc1c7..d744bbc1c7 100644
--- a/client/src/com/vaadin/client/connectors/RpcDataSourceConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/RpcDataSourceConnector.java
diff --git a/client/src/com/vaadin/client/connectors/SingleSelectionModelConnector.java b/client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java
index fddf3865a2..fddf3865a2 100644
--- a/client/src/com/vaadin/client/connectors/SingleSelectionModelConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java
diff --git a/client/src/com/vaadin/client/connectors/TextRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/TextRendererConnector.java
index baf317510d..baf317510d 100644
--- a/client/src/com/vaadin/client/connectors/TextRendererConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/TextRendererConnector.java
diff --git a/client/src/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java b/client/src/main/java/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java
index 72d8db3c4a..72d8db3c4a 100644
--- a/client/src/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java
diff --git a/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java b/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java
index 05ac7182c5..05ac7182c5 100644
--- a/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java
+++ b/client/src/main/java/com/vaadin/client/data/AbstractRemoteDataSource.java
diff --git a/client/src/com/vaadin/client/data/CacheStrategy.java b/client/src/main/java/com/vaadin/client/data/CacheStrategy.java
index 79ce537314..79ce537314 100644
--- a/client/src/com/vaadin/client/data/CacheStrategy.java
+++ b/client/src/main/java/com/vaadin/client/data/CacheStrategy.java
diff --git a/client/src/com/vaadin/client/data/DataChangeHandler.java b/client/src/main/java/com/vaadin/client/data/DataChangeHandler.java
index 35f1eafea9..35f1eafea9 100644
--- a/client/src/com/vaadin/client/data/DataChangeHandler.java
+++ b/client/src/main/java/com/vaadin/client/data/DataChangeHandler.java
diff --git a/client/src/com/vaadin/client/data/DataSource.java b/client/src/main/java/com/vaadin/client/data/DataSource.java
index f3711c3c68..f3711c3c68 100644
--- a/client/src/com/vaadin/client/data/DataSource.java
+++ b/client/src/main/java/com/vaadin/client/data/DataSource.java
diff --git a/client/src/com/vaadin/client/debug/internal/AnalyzeLayoutsPanel.java b/client/src/main/java/com/vaadin/client/debug/internal/AnalyzeLayoutsPanel.java
index fc9f3856b5..fc9f3856b5 100644
--- a/client/src/com/vaadin/client/debug/internal/AnalyzeLayoutsPanel.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/AnalyzeLayoutsPanel.java
diff --git a/client/src/com/vaadin/client/debug/internal/ConnectorInfoPanel.java b/client/src/main/java/com/vaadin/client/debug/internal/ConnectorInfoPanel.java
index 5269d82bd6..5269d82bd6 100644
--- a/client/src/com/vaadin/client/debug/internal/ConnectorInfoPanel.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/ConnectorInfoPanel.java
diff --git a/client/src/com/vaadin/client/debug/internal/DebugButton.java b/client/src/main/java/com/vaadin/client/debug/internal/DebugButton.java
index f797197afb..f797197afb 100644
--- a/client/src/com/vaadin/client/debug/internal/DebugButton.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/DebugButton.java
diff --git a/client/src/com/vaadin/client/debug/internal/ErrorNotificationHandler.java b/client/src/main/java/com/vaadin/client/debug/internal/ErrorNotificationHandler.java
index 5d128cbdcc..5d128cbdcc 100644
--- a/client/src/com/vaadin/client/debug/internal/ErrorNotificationHandler.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/ErrorNotificationHandler.java
diff --git a/client/src/com/vaadin/client/debug/internal/HierarchyPanel.java b/client/src/main/java/com/vaadin/client/debug/internal/HierarchyPanel.java
index c5c134fc31..c5c134fc31 100644
--- a/client/src/com/vaadin/client/debug/internal/HierarchyPanel.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/HierarchyPanel.java
diff --git a/client/src/com/vaadin/client/debug/internal/HierarchySection.java b/client/src/main/java/com/vaadin/client/debug/internal/HierarchySection.java
index ffb4042e69..ffb4042e69 100644
--- a/client/src/com/vaadin/client/debug/internal/HierarchySection.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/HierarchySection.java
diff --git a/client/src/com/vaadin/client/debug/internal/Highlight.java b/client/src/main/java/com/vaadin/client/debug/internal/Highlight.java
index e91f4abcbb..e91f4abcbb 100644
--- a/client/src/com/vaadin/client/debug/internal/Highlight.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/Highlight.java
diff --git a/client/src/com/vaadin/client/debug/internal/Icon.java b/client/src/main/java/com/vaadin/client/debug/internal/Icon.java
index a30dc05fcb..a30dc05fcb 100644
--- a/client/src/com/vaadin/client/debug/internal/Icon.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/Icon.java
diff --git a/client/src/com/vaadin/client/debug/internal/InfoSection.java b/client/src/main/java/com/vaadin/client/debug/internal/InfoSection.java
index 39ff345cb1..39ff345cb1 100644
--- a/client/src/com/vaadin/client/debug/internal/InfoSection.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/InfoSection.java
diff --git a/client/src/com/vaadin/client/debug/internal/LogSection.java b/client/src/main/java/com/vaadin/client/debug/internal/LogSection.java
index 30abb4fff9..30abb4fff9 100644
--- a/client/src/com/vaadin/client/debug/internal/LogSection.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/LogSection.java
diff --git a/client/src/com/vaadin/client/debug/internal/NetworkSection.java b/client/src/main/java/com/vaadin/client/debug/internal/NetworkSection.java
index 5b0579238f..5b0579238f 100644
--- a/client/src/com/vaadin/client/debug/internal/NetworkSection.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/NetworkSection.java
diff --git a/client/src/com/vaadin/client/debug/internal/OptimizedWidgetsetPanel.java b/client/src/main/java/com/vaadin/client/debug/internal/OptimizedWidgetsetPanel.java
index d9aad9e61b..d9aad9e61b 100644
--- a/client/src/com/vaadin/client/debug/internal/OptimizedWidgetsetPanel.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/OptimizedWidgetsetPanel.java
diff --git a/client/src/com/vaadin/client/debug/internal/ProfilerSection.java b/client/src/main/java/com/vaadin/client/debug/internal/ProfilerSection.java
index 2851563884..2851563884 100644
--- a/client/src/com/vaadin/client/debug/internal/ProfilerSection.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/ProfilerSection.java
diff --git a/client/src/com/vaadin/client/debug/internal/Section.java b/client/src/main/java/com/vaadin/client/debug/internal/Section.java
index 876b9bbc27..876b9bbc27 100644
--- a/client/src/com/vaadin/client/debug/internal/Section.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/Section.java
diff --git a/client/src/com/vaadin/client/debug/internal/SelectConnectorListener.java b/client/src/main/java/com/vaadin/client/debug/internal/SelectConnectorListener.java
index 46c8070b30..46c8070b30 100644
--- a/client/src/com/vaadin/client/debug/internal/SelectConnectorListener.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/SelectConnectorListener.java
diff --git a/client/src/com/vaadin/client/debug/internal/SelectorPath.java b/client/src/main/java/com/vaadin/client/debug/internal/SelectorPath.java
index 3f21e46a96..3f21e46a96 100644
--- a/client/src/com/vaadin/client/debug/internal/SelectorPath.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/SelectorPath.java
diff --git a/client/src/com/vaadin/client/debug/internal/TestBenchSection.java b/client/src/main/java/com/vaadin/client/debug/internal/TestBenchSection.java
index d0b6b10722..d0b6b10722 100644
--- a/client/src/com/vaadin/client/debug/internal/TestBenchSection.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/TestBenchSection.java
diff --git a/client/src/com/vaadin/client/debug/internal/VDebugWindow.java b/client/src/main/java/com/vaadin/client/debug/internal/VDebugWindow.java
index fbc838f861..fbc838f861 100644
--- a/client/src/com/vaadin/client/debug/internal/VDebugWindow.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/VDebugWindow.java
diff --git a/client/src/com/vaadin/client/debug/internal/theme/DebugWindowStyles.java b/client/src/main/java/com/vaadin/client/debug/internal/theme/DebugWindowStyles.java
index 249b24a938..249b24a938 100644
--- a/client/src/com/vaadin/client/debug/internal/theme/DebugWindowStyles.java
+++ b/client/src/main/java/com/vaadin/client/debug/internal/theme/DebugWindowStyles.java
diff --git a/client/src/com/vaadin/client/event/PointerCancelEvent.java b/client/src/main/java/com/vaadin/client/event/PointerCancelEvent.java
index 906a07b120..906a07b120 100644
--- a/client/src/com/vaadin/client/event/PointerCancelEvent.java
+++ b/client/src/main/java/com/vaadin/client/event/PointerCancelEvent.java
diff --git a/client/src/com/vaadin/client/event/PointerCancelHandler.java b/client/src/main/java/com/vaadin/client/event/PointerCancelHandler.java
index fa2210b73c..fa2210b73c 100644
--- a/client/src/com/vaadin/client/event/PointerCancelHandler.java
+++ b/client/src/main/java/com/vaadin/client/event/PointerCancelHandler.java
diff --git a/client/src/com/vaadin/client/event/PointerDownEvent.java b/client/src/main/java/com/vaadin/client/event/PointerDownEvent.java
index eeae9891f2..eeae9891f2 100644
--- a/client/src/com/vaadin/client/event/PointerDownEvent.java
+++ b/client/src/main/java/com/vaadin/client/event/PointerDownEvent.java
diff --git a/client/src/com/vaadin/client/event/PointerDownHandler.java b/client/src/main/java/com/vaadin/client/event/PointerDownHandler.java
index dfd9a358eb..dfd9a358eb 100644
--- a/client/src/com/vaadin/client/event/PointerDownHandler.java
+++ b/client/src/main/java/com/vaadin/client/event/PointerDownHandler.java
diff --git a/client/src/com/vaadin/client/event/PointerEvent.java b/client/src/main/java/com/vaadin/client/event/PointerEvent.java
index 71e73f945c..71e73f945c 100644
--- a/client/src/com/vaadin/client/event/PointerEvent.java
+++ b/client/src/main/java/com/vaadin/client/event/PointerEvent.java
diff --git a/client/src/com/vaadin/client/event/PointerEventSupport.java b/client/src/main/java/com/vaadin/client/event/PointerEventSupport.java
index 99d73745c5..99d73745c5 100644
--- a/client/src/com/vaadin/client/event/PointerEventSupport.java
+++ b/client/src/main/java/com/vaadin/client/event/PointerEventSupport.java
diff --git a/client/src/com/vaadin/client/event/PointerEventSupportImpl.java b/client/src/main/java/com/vaadin/client/event/PointerEventSupportImpl.java
index 7605104ade..7605104ade 100644
--- a/client/src/com/vaadin/client/event/PointerEventSupportImpl.java
+++ b/client/src/main/java/com/vaadin/client/event/PointerEventSupportImpl.java
diff --git a/client/src/com/vaadin/client/event/PointerEventSupportImplIE10.java b/client/src/main/java/com/vaadin/client/event/PointerEventSupportImplIE10.java
index 1de2f9722f..1de2f9722f 100644
--- a/client/src/com/vaadin/client/event/PointerEventSupportImplIE10.java
+++ b/client/src/main/java/com/vaadin/client/event/PointerEventSupportImplIE10.java
diff --git a/client/src/com/vaadin/client/event/PointerEventSupportImplModernIE.java b/client/src/main/java/com/vaadin/client/event/PointerEventSupportImplModernIE.java
index 851c600bcb..851c600bcb 100644
--- a/client/src/com/vaadin/client/event/PointerEventSupportImplModernIE.java
+++ b/client/src/main/java/com/vaadin/client/event/PointerEventSupportImplModernIE.java
diff --git a/client/src/com/vaadin/client/event/PointerMoveEvent.java b/client/src/main/java/com/vaadin/client/event/PointerMoveEvent.java
index 6a4a81e17d..6a4a81e17d 100644
--- a/client/src/com/vaadin/client/event/PointerMoveEvent.java
+++ b/client/src/main/java/com/vaadin/client/event/PointerMoveEvent.java
diff --git a/client/src/com/vaadin/client/event/PointerMoveHandler.java b/client/src/main/java/com/vaadin/client/event/PointerMoveHandler.java
index ad6a93da8d..ad6a93da8d 100644
--- a/client/src/com/vaadin/client/event/PointerMoveHandler.java
+++ b/client/src/main/java/com/vaadin/client/event/PointerMoveHandler.java
diff --git a/client/src/com/vaadin/client/event/PointerUpEvent.java b/client/src/main/java/com/vaadin/client/event/PointerUpEvent.java
index 005902d7f7..005902d7f7 100644
--- a/client/src/com/vaadin/client/event/PointerUpEvent.java
+++ b/client/src/main/java/com/vaadin/client/event/PointerUpEvent.java
diff --git a/client/src/com/vaadin/client/event/PointerUpHandler.java b/client/src/main/java/com/vaadin/client/event/PointerUpHandler.java
index 587b249634..587b249634 100644
--- a/client/src/com/vaadin/client/event/PointerUpHandler.java
+++ b/client/src/main/java/com/vaadin/client/event/PointerUpHandler.java
diff --git a/client/src/com/vaadin/client/extensions/AbstractExtensionConnector.java b/client/src/main/java/com/vaadin/client/extensions/AbstractExtensionConnector.java
index 79eaa2f8b9..79eaa2f8b9 100644
--- a/client/src/com/vaadin/client/extensions/AbstractExtensionConnector.java
+++ b/client/src/main/java/com/vaadin/client/extensions/AbstractExtensionConnector.java
diff --git a/client/src/com/vaadin/client/extensions/BrowserWindowOpenerConnector.java b/client/src/main/java/com/vaadin/client/extensions/BrowserWindowOpenerConnector.java
index 11e3e80a14..11e3e80a14 100644
--- a/client/src/com/vaadin/client/extensions/BrowserWindowOpenerConnector.java
+++ b/client/src/main/java/com/vaadin/client/extensions/BrowserWindowOpenerConnector.java
diff --git a/client/src/com/vaadin/client/extensions/FileDownloaderConnector.java b/client/src/main/java/com/vaadin/client/extensions/FileDownloaderConnector.java
index bed6622a6c..bed6622a6c 100644
--- a/client/src/com/vaadin/client/extensions/FileDownloaderConnector.java
+++ b/client/src/main/java/com/vaadin/client/extensions/FileDownloaderConnector.java
diff --git a/client/src/com/vaadin/client/extensions/ResponsiveConnector.java b/client/src/main/java/com/vaadin/client/extensions/ResponsiveConnector.java
index ae330be8f4..ae330be8f4 100644
--- a/client/src/com/vaadin/client/extensions/ResponsiveConnector.java
+++ b/client/src/main/java/com/vaadin/client/extensions/ResponsiveConnector.java
diff --git a/client/src/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java b/client/src/main/java/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java
index 364b948573..364b948573 100644
--- a/client/src/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java
+++ b/client/src/main/java/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java
diff --git a/client/src/com/vaadin/client/metadata/AsyncBundleLoader.java b/client/src/main/java/com/vaadin/client/metadata/AsyncBundleLoader.java
index 9b7f611281..9b7f611281 100644
--- a/client/src/com/vaadin/client/metadata/AsyncBundleLoader.java
+++ b/client/src/main/java/com/vaadin/client/metadata/AsyncBundleLoader.java
diff --git a/client/src/com/vaadin/client/metadata/BundleLoadCallback.java b/client/src/main/java/com/vaadin/client/metadata/BundleLoadCallback.java
index 399ac87d4e..399ac87d4e 100644
--- a/client/src/com/vaadin/client/metadata/BundleLoadCallback.java
+++ b/client/src/main/java/com/vaadin/client/metadata/BundleLoadCallback.java
diff --git a/client/src/com/vaadin/client/metadata/ConnectorBundleLoader.java b/client/src/main/java/com/vaadin/client/metadata/ConnectorBundleLoader.java
index e67fee96cf..e67fee96cf 100644
--- a/client/src/com/vaadin/client/metadata/ConnectorBundleLoader.java
+++ b/client/src/main/java/com/vaadin/client/metadata/ConnectorBundleLoader.java
diff --git a/client/src/com/vaadin/client/metadata/InvokationHandler.java b/client/src/main/java/com/vaadin/client/metadata/InvokationHandler.java
index 4faf0a1484..4faf0a1484 100644
--- a/client/src/com/vaadin/client/metadata/InvokationHandler.java
+++ b/client/src/main/java/com/vaadin/client/metadata/InvokationHandler.java
diff --git a/client/src/com/vaadin/client/metadata/Invoker.java b/client/src/main/java/com/vaadin/client/metadata/Invoker.java
index 6e263829c0..6e263829c0 100644
--- a/client/src/com/vaadin/client/metadata/Invoker.java
+++ b/client/src/main/java/com/vaadin/client/metadata/Invoker.java
diff --git a/client/src/com/vaadin/client/metadata/JsniInvoker.java b/client/src/main/java/com/vaadin/client/metadata/JsniInvoker.java
index d6a60c89f3..d6a60c89f3 100644
--- a/client/src/com/vaadin/client/metadata/JsniInvoker.java
+++ b/client/src/main/java/com/vaadin/client/metadata/JsniInvoker.java
diff --git a/client/src/com/vaadin/client/metadata/Method.java b/client/src/main/java/com/vaadin/client/metadata/Method.java
index 8757a9de20..8757a9de20 100644
--- a/client/src/com/vaadin/client/metadata/Method.java
+++ b/client/src/main/java/com/vaadin/client/metadata/Method.java
diff --git a/client/src/com/vaadin/client/metadata/NoDataException.java b/client/src/main/java/com/vaadin/client/metadata/NoDataException.java
index 45ea67d017..45ea67d017 100644
--- a/client/src/com/vaadin/client/metadata/NoDataException.java
+++ b/client/src/main/java/com/vaadin/client/metadata/NoDataException.java
diff --git a/client/src/com/vaadin/client/metadata/OnStateChangeMethod.java b/client/src/main/java/com/vaadin/client/metadata/OnStateChangeMethod.java
index 47749fcd52..47749fcd52 100644
--- a/client/src/com/vaadin/client/metadata/OnStateChangeMethod.java
+++ b/client/src/main/java/com/vaadin/client/metadata/OnStateChangeMethod.java
diff --git a/client/src/com/vaadin/client/metadata/Property.java b/client/src/main/java/com/vaadin/client/metadata/Property.java
index 90b29b32b7..90b29b32b7 100644
--- a/client/src/com/vaadin/client/metadata/Property.java
+++ b/client/src/main/java/com/vaadin/client/metadata/Property.java
diff --git a/client/src/com/vaadin/client/metadata/ProxyHandler.java b/client/src/main/java/com/vaadin/client/metadata/ProxyHandler.java
index 6fba8a8155..6fba8a8155 100644
--- a/client/src/com/vaadin/client/metadata/ProxyHandler.java
+++ b/client/src/main/java/com/vaadin/client/metadata/ProxyHandler.java
diff --git a/client/src/com/vaadin/client/metadata/Type.java b/client/src/main/java/com/vaadin/client/metadata/Type.java
index 15617ffe3c..15617ffe3c 100644
--- a/client/src/com/vaadin/client/metadata/Type.java
+++ b/client/src/main/java/com/vaadin/client/metadata/Type.java
diff --git a/client/src/com/vaadin/client/metadata/TypeData.java b/client/src/main/java/com/vaadin/client/metadata/TypeData.java
index 9addc4ffb2..9addc4ffb2 100644
--- a/client/src/com/vaadin/client/metadata/TypeData.java
+++ b/client/src/main/java/com/vaadin/client/metadata/TypeData.java
diff --git a/client/src/com/vaadin/client/metadata/TypeDataStore.java b/client/src/main/java/com/vaadin/client/metadata/TypeDataStore.java
index e3c1c8392a..e3c1c8392a 100644
--- a/client/src/com/vaadin/client/metadata/TypeDataStore.java
+++ b/client/src/main/java/com/vaadin/client/metadata/TypeDataStore.java
diff --git a/client/src/com/vaadin/client/renderers/ButtonRenderer.java b/client/src/main/java/com/vaadin/client/renderers/ButtonRenderer.java
index b173aef60a..b173aef60a 100644
--- a/client/src/com/vaadin/client/renderers/ButtonRenderer.java
+++ b/client/src/main/java/com/vaadin/client/renderers/ButtonRenderer.java
diff --git a/client/src/com/vaadin/client/renderers/ClickableRenderer.java b/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java
index caffc521d1..caffc521d1 100644
--- a/client/src/com/vaadin/client/renderers/ClickableRenderer.java
+++ b/client/src/main/java/com/vaadin/client/renderers/ClickableRenderer.java
diff --git a/client/src/com/vaadin/client/renderers/ComplexRenderer.java b/client/src/main/java/com/vaadin/client/renderers/ComplexRenderer.java
index 262de79468..262de79468 100644
--- a/client/src/com/vaadin/client/renderers/ComplexRenderer.java
+++ b/client/src/main/java/com/vaadin/client/renderers/ComplexRenderer.java
diff --git a/client/src/com/vaadin/client/renderers/DateRenderer.java b/client/src/main/java/com/vaadin/client/renderers/DateRenderer.java
index 4d15fac724..4d15fac724 100644
--- a/client/src/com/vaadin/client/renderers/DateRenderer.java
+++ b/client/src/main/java/com/vaadin/client/renderers/DateRenderer.java
diff --git a/client/src/com/vaadin/client/renderers/HtmlRenderer.java b/client/src/main/java/com/vaadin/client/renderers/HtmlRenderer.java
index ec6dc761f6..ec6dc761f6 100644
--- a/client/src/com/vaadin/client/renderers/HtmlRenderer.java
+++ b/client/src/main/java/com/vaadin/client/renderers/HtmlRenderer.java
diff --git a/client/src/com/vaadin/client/renderers/ImageRenderer.java b/client/src/main/java/com/vaadin/client/renderers/ImageRenderer.java
index d52bc1ba6d..d52bc1ba6d 100644
--- a/client/src/com/vaadin/client/renderers/ImageRenderer.java
+++ b/client/src/main/java/com/vaadin/client/renderers/ImageRenderer.java
diff --git a/client/src/com/vaadin/client/renderers/NumberRenderer.java b/client/src/main/java/com/vaadin/client/renderers/NumberRenderer.java
index a040e8d1ce..a040e8d1ce 100644
--- a/client/src/com/vaadin/client/renderers/NumberRenderer.java
+++ b/client/src/main/java/com/vaadin/client/renderers/NumberRenderer.java
diff --git a/client/src/com/vaadin/client/renderers/ProgressBarRenderer.java b/client/src/main/java/com/vaadin/client/renderers/ProgressBarRenderer.java
index 5b2c70d274..5b2c70d274 100644
--- a/client/src/com/vaadin/client/renderers/ProgressBarRenderer.java
+++ b/client/src/main/java/com/vaadin/client/renderers/ProgressBarRenderer.java
diff --git a/client/src/com/vaadin/client/renderers/Renderer.java b/client/src/main/java/com/vaadin/client/renderers/Renderer.java
index b2e9acd582..b2e9acd582 100644
--- a/client/src/com/vaadin/client/renderers/Renderer.java
+++ b/client/src/main/java/com/vaadin/client/renderers/Renderer.java
diff --git a/client/src/com/vaadin/client/renderers/TextRenderer.java b/client/src/main/java/com/vaadin/client/renderers/TextRenderer.java
index 3f704fd0b4..3f704fd0b4 100644
--- a/client/src/com/vaadin/client/renderers/TextRenderer.java
+++ b/client/src/main/java/com/vaadin/client/renderers/TextRenderer.java
diff --git a/client/src/com/vaadin/client/renderers/WidgetRenderer.java b/client/src/main/java/com/vaadin/client/renderers/WidgetRenderer.java
index d7219e7241..d7219e7241 100644
--- a/client/src/com/vaadin/client/renderers/WidgetRenderer.java
+++ b/client/src/main/java/com/vaadin/client/renderers/WidgetRenderer.java
diff --git a/client/src/com/vaadin/client/ui/AbstractClickEventHandler.java b/client/src/main/java/com/vaadin/client/ui/AbstractClickEventHandler.java
index a2c54ec7ca..a2c54ec7ca 100644
--- a/client/src/com/vaadin/client/ui/AbstractClickEventHandler.java
+++ b/client/src/main/java/com/vaadin/client/ui/AbstractClickEventHandler.java
diff --git a/client/src/com/vaadin/client/ui/AbstractComponentConnector.java b/client/src/main/java/com/vaadin/client/ui/AbstractComponentConnector.java
index e040386e63..e040386e63 100644
--- a/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/AbstractComponentConnector.java
diff --git a/client/src/com/vaadin/client/ui/AbstractComponentContainerConnector.java b/client/src/main/java/com/vaadin/client/ui/AbstractComponentContainerConnector.java
index f808fb194c..f808fb194c 100644
--- a/client/src/com/vaadin/client/ui/AbstractComponentContainerConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/AbstractComponentContainerConnector.java
diff --git a/client/src/com/vaadin/client/ui/AbstractConnector.java b/client/src/main/java/com/vaadin/client/ui/AbstractConnector.java
index 7f8d6c2b14..7f8d6c2b14 100644
--- a/client/src/com/vaadin/client/ui/AbstractConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/AbstractConnector.java
diff --git a/client/src/com/vaadin/client/ui/AbstractFieldConnector.java b/client/src/main/java/com/vaadin/client/ui/AbstractFieldConnector.java
index 8d8df81bd8..8d8df81bd8 100644
--- a/client/src/com/vaadin/client/ui/AbstractFieldConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/AbstractFieldConnector.java
diff --git a/client/src/com/vaadin/client/ui/AbstractHasComponentsConnector.java b/client/src/main/java/com/vaadin/client/ui/AbstractHasComponentsConnector.java
index 27210de10d..27210de10d 100644
--- a/client/src/com/vaadin/client/ui/AbstractHasComponentsConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/AbstractHasComponentsConnector.java
diff --git a/client/src/com/vaadin/client/ui/AbstractLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/AbstractLayoutConnector.java
index 6e1dde3863..6e1dde3863 100644
--- a/client/src/com/vaadin/client/ui/AbstractLayoutConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/AbstractLayoutConnector.java
diff --git a/client/src/com/vaadin/client/ui/AbstractSingleComponentContainerConnector.java b/client/src/main/java/com/vaadin/client/ui/AbstractSingleComponentContainerConnector.java
index 954803b64c..954803b64c 100644
--- a/client/src/com/vaadin/client/ui/AbstractSingleComponentContainerConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/AbstractSingleComponentContainerConnector.java
diff --git a/client/src/com/vaadin/client/ui/Action.java b/client/src/main/java/com/vaadin/client/ui/Action.java
index d7593740d6..d7593740d6 100644
--- a/client/src/com/vaadin/client/ui/Action.java
+++ b/client/src/main/java/com/vaadin/client/ui/Action.java
diff --git a/client/src/com/vaadin/client/ui/ActionOwner.java b/client/src/main/java/com/vaadin/client/ui/ActionOwner.java
index 73c3675438..73c3675438 100644
--- a/client/src/com/vaadin/client/ui/ActionOwner.java
+++ b/client/src/main/java/com/vaadin/client/ui/ActionOwner.java
diff --git a/client/src/com/vaadin/client/ui/CalendarEntry.java b/client/src/main/java/com/vaadin/client/ui/CalendarEntry.java
index 8050f0aab1..8050f0aab1 100644
--- a/client/src/com/vaadin/client/ui/CalendarEntry.java
+++ b/client/src/main/java/com/vaadin/client/ui/CalendarEntry.java
diff --git a/client/src/com/vaadin/client/ui/ClickEventHandler.java b/client/src/main/java/com/vaadin/client/ui/ClickEventHandler.java
index 7947e0560c..7947e0560c 100644
--- a/client/src/com/vaadin/client/ui/ClickEventHandler.java
+++ b/client/src/main/java/com/vaadin/client/ui/ClickEventHandler.java
diff --git a/client/src/com/vaadin/client/ui/ConnectorFocusAndBlurHandler.java b/client/src/main/java/com/vaadin/client/ui/ConnectorFocusAndBlurHandler.java
index 8272f99d25..8272f99d25 100644
--- a/client/src/com/vaadin/client/ui/ConnectorFocusAndBlurHandler.java
+++ b/client/src/main/java/com/vaadin/client/ui/ConnectorFocusAndBlurHandler.java
diff --git a/client/src/com/vaadin/client/ui/Field.java b/client/src/main/java/com/vaadin/client/ui/Field.java
index 99bfe107b3..99bfe107b3 100644
--- a/client/src/com/vaadin/client/ui/Field.java
+++ b/client/src/main/java/com/vaadin/client/ui/Field.java
diff --git a/client/src/com/vaadin/client/ui/FocusElementPanel.java b/client/src/main/java/com/vaadin/client/ui/FocusElementPanel.java
index d0ddca0935..d0ddca0935 100644
--- a/client/src/com/vaadin/client/ui/FocusElementPanel.java
+++ b/client/src/main/java/com/vaadin/client/ui/FocusElementPanel.java
diff --git a/client/src/com/vaadin/client/ui/FocusUtil.java b/client/src/main/java/com/vaadin/client/ui/FocusUtil.java
index 4750b89173..4750b89173 100644
--- a/client/src/com/vaadin/client/ui/FocusUtil.java
+++ b/client/src/main/java/com/vaadin/client/ui/FocusUtil.java
diff --git a/client/src/com/vaadin/client/ui/FocusableFlexTable.java b/client/src/main/java/com/vaadin/client/ui/FocusableFlexTable.java
index 8deec2babb..8deec2babb 100644
--- a/client/src/com/vaadin/client/ui/FocusableFlexTable.java
+++ b/client/src/main/java/com/vaadin/client/ui/FocusableFlexTable.java
diff --git a/client/src/com/vaadin/client/ui/FocusableFlowPanel.java b/client/src/main/java/com/vaadin/client/ui/FocusableFlowPanel.java
index 77a26361ef..77a26361ef 100644
--- a/client/src/com/vaadin/client/ui/FocusableFlowPanel.java
+++ b/client/src/main/java/com/vaadin/client/ui/FocusableFlowPanel.java
diff --git a/client/src/com/vaadin/client/ui/FocusableScrollPanel.java b/client/src/main/java/com/vaadin/client/ui/FocusableScrollPanel.java
index 1ac5a08ccd..1ac5a08ccd 100644
--- a/client/src/com/vaadin/client/ui/FocusableScrollPanel.java
+++ b/client/src/main/java/com/vaadin/client/ui/FocusableScrollPanel.java
diff --git a/client/src/com/vaadin/client/ui/FontIcon.java b/client/src/main/java/com/vaadin/client/ui/FontIcon.java
index 74d094a0f2..74d094a0f2 100644
--- a/client/src/com/vaadin/client/ui/FontIcon.java
+++ b/client/src/main/java/com/vaadin/client/ui/FontIcon.java
diff --git a/client/src/com/vaadin/client/ui/Icon.java b/client/src/main/java/com/vaadin/client/ui/Icon.java
index 277fc2dd5d..277fc2dd5d 100644
--- a/client/src/com/vaadin/client/ui/Icon.java
+++ b/client/src/main/java/com/vaadin/client/ui/Icon.java
diff --git a/client/src/com/vaadin/client/ui/ImageIcon.java b/client/src/main/java/com/vaadin/client/ui/ImageIcon.java
index 7174c73637..7174c73637 100644
--- a/client/src/com/vaadin/client/ui/ImageIcon.java
+++ b/client/src/main/java/com/vaadin/client/ui/ImageIcon.java
diff --git a/client/src/com/vaadin/client/ui/JavaScriptComponentConnector.java b/client/src/main/java/com/vaadin/client/ui/JavaScriptComponentConnector.java
index a3a03b597b..a3a03b597b 100644
--- a/client/src/com/vaadin/client/ui/JavaScriptComponentConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/JavaScriptComponentConnector.java
diff --git a/client/src/com/vaadin/client/ui/JavaScriptWidget.java b/client/src/main/java/com/vaadin/client/ui/JavaScriptWidget.java
index da9192dace..da9192dace 100644
--- a/client/src/com/vaadin/client/ui/JavaScriptWidget.java
+++ b/client/src/main/java/com/vaadin/client/ui/JavaScriptWidget.java
diff --git a/client/src/com/vaadin/client/ui/JsniMousewheelHandler.java b/client/src/main/java/com/vaadin/client/ui/JsniMousewheelHandler.java
index 82ea768871..82ea768871 100644
--- a/client/src/com/vaadin/client/ui/JsniMousewheelHandler.java
+++ b/client/src/main/java/com/vaadin/client/ui/JsniMousewheelHandler.java
diff --git a/client/src/com/vaadin/client/ui/LayoutClickEventHandler.java b/client/src/main/java/com/vaadin/client/ui/LayoutClickEventHandler.java
index 6eccb9cb3b..6eccb9cb3b 100644
--- a/client/src/com/vaadin/client/ui/LayoutClickEventHandler.java
+++ b/client/src/main/java/com/vaadin/client/ui/LayoutClickEventHandler.java
diff --git a/client/src/com/vaadin/client/ui/LegacyConnector.java b/client/src/main/java/com/vaadin/client/ui/LegacyConnector.java
index 35a82cff53..35a82cff53 100644
--- a/client/src/com/vaadin/client/ui/LegacyConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/LegacyConnector.java
diff --git a/client/src/com/vaadin/client/ui/ManagedLayout.java b/client/src/main/java/com/vaadin/client/ui/ManagedLayout.java
index e7266d99b5..e7266d99b5 100644
--- a/client/src/com/vaadin/client/ui/ManagedLayout.java
+++ b/client/src/main/java/com/vaadin/client/ui/ManagedLayout.java
diff --git a/client/src/com/vaadin/client/ui/MediaBaseConnector.java b/client/src/main/java/com/vaadin/client/ui/MediaBaseConnector.java
index fdd9610517..fdd9610517 100644
--- a/client/src/com/vaadin/client/ui/MediaBaseConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/MediaBaseConnector.java
diff --git a/client/src/com/vaadin/client/ui/PostLayoutListener.java b/client/src/main/java/com/vaadin/client/ui/PostLayoutListener.java
index bbeb6f1255..bbeb6f1255 100644
--- a/client/src/com/vaadin/client/ui/PostLayoutListener.java
+++ b/client/src/main/java/com/vaadin/client/ui/PostLayoutListener.java
diff --git a/client/src/com/vaadin/client/ui/ShortcutActionHandler.java b/client/src/main/java/com/vaadin/client/ui/ShortcutActionHandler.java
index a9d5f0731a..a9d5f0731a 100644
--- a/client/src/com/vaadin/client/ui/ShortcutActionHandler.java
+++ b/client/src/main/java/com/vaadin/client/ui/ShortcutActionHandler.java
diff --git a/client/src/com/vaadin/client/ui/SimpleFocusablePanel.java b/client/src/main/java/com/vaadin/client/ui/SimpleFocusablePanel.java
index f938b2e74f..f938b2e74f 100644
--- a/client/src/com/vaadin/client/ui/SimpleFocusablePanel.java
+++ b/client/src/main/java/com/vaadin/client/ui/SimpleFocusablePanel.java
diff --git a/client/src/com/vaadin/client/ui/SimpleManagedLayout.java b/client/src/main/java/com/vaadin/client/ui/SimpleManagedLayout.java
index e61e2799c4..e61e2799c4 100644
--- a/client/src/com/vaadin/client/ui/SimpleManagedLayout.java
+++ b/client/src/main/java/com/vaadin/client/ui/SimpleManagedLayout.java
diff --git a/client/src/com/vaadin/client/ui/SubPartAware.java b/client/src/main/java/com/vaadin/client/ui/SubPartAware.java
index 7a40eea20e..7a40eea20e 100644
--- a/client/src/com/vaadin/client/ui/SubPartAware.java
+++ b/client/src/main/java/com/vaadin/client/ui/SubPartAware.java
diff --git a/client/src/com/vaadin/client/ui/TouchScrollDelegate.java b/client/src/main/java/com/vaadin/client/ui/TouchScrollDelegate.java
index f53b32b4e1..f53b32b4e1 100644
--- a/client/src/com/vaadin/client/ui/TouchScrollDelegate.java
+++ b/client/src/main/java/com/vaadin/client/ui/TouchScrollDelegate.java
diff --git a/client/src/com/vaadin/client/ui/TreeAction.java b/client/src/main/java/com/vaadin/client/ui/TreeAction.java
index f190ab62d2..f190ab62d2 100644
--- a/client/src/com/vaadin/client/ui/TreeAction.java
+++ b/client/src/main/java/com/vaadin/client/ui/TreeAction.java
diff --git a/client/src/com/vaadin/client/ui/UnknownComponentConnector.java b/client/src/main/java/com/vaadin/client/ui/UnknownComponentConnector.java
index 50ded0aeba..50ded0aeba 100644
--- a/client/src/com/vaadin/client/ui/UnknownComponentConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/UnknownComponentConnector.java
diff --git a/client/src/com/vaadin/client/ui/VAbsoluteLayout.java b/client/src/main/java/com/vaadin/client/ui/VAbsoluteLayout.java
index 44230288a7..44230288a7 100644
--- a/client/src/com/vaadin/client/ui/VAbsoluteLayout.java
+++ b/client/src/main/java/com/vaadin/client/ui/VAbsoluteLayout.java
diff --git a/client/src/com/vaadin/client/ui/VAbstractSplitPanel.java b/client/src/main/java/com/vaadin/client/ui/VAbstractSplitPanel.java
index 6c11783d34..6c11783d34 100644
--- a/client/src/com/vaadin/client/ui/VAbstractSplitPanel.java
+++ b/client/src/main/java/com/vaadin/client/ui/VAbstractSplitPanel.java
diff --git a/client/src/com/vaadin/client/ui/VAccordion.java b/client/src/main/java/com/vaadin/client/ui/VAccordion.java
index afc66d0f7b..afc66d0f7b 100644
--- a/client/src/com/vaadin/client/ui/VAccordion.java
+++ b/client/src/main/java/com/vaadin/client/ui/VAccordion.java
diff --git a/client/src/com/vaadin/client/ui/VAudio.java b/client/src/main/java/com/vaadin/client/ui/VAudio.java
index 109e4d65b0..109e4d65b0 100644
--- a/client/src/com/vaadin/client/ui/VAudio.java
+++ b/client/src/main/java/com/vaadin/client/ui/VAudio.java
diff --git a/client/src/com/vaadin/client/ui/VBrowserFrame.java b/client/src/main/java/com/vaadin/client/ui/VBrowserFrame.java
index 2c4011e87d..2c4011e87d 100644
--- a/client/src/com/vaadin/client/ui/VBrowserFrame.java
+++ b/client/src/main/java/com/vaadin/client/ui/VBrowserFrame.java
diff --git a/client/src/com/vaadin/client/ui/VButton.java b/client/src/main/java/com/vaadin/client/ui/VButton.java
index 2eb967c4fa..2eb967c4fa 100644
--- a/client/src/com/vaadin/client/ui/VButton.java
+++ b/client/src/main/java/com/vaadin/client/ui/VButton.java
diff --git a/client/src/com/vaadin/client/ui/VCalendar.java b/client/src/main/java/com/vaadin/client/ui/VCalendar.java
index 08d4351931..08d4351931 100644
--- a/client/src/com/vaadin/client/ui/VCalendar.java
+++ b/client/src/main/java/com/vaadin/client/ui/VCalendar.java
diff --git a/client/src/com/vaadin/client/ui/VCalendarPanel.java b/client/src/main/java/com/vaadin/client/ui/VCalendarPanel.java
index e1b906b6e4..e1b906b6e4 100644
--- a/client/src/com/vaadin/client/ui/VCalendarPanel.java
+++ b/client/src/main/java/com/vaadin/client/ui/VCalendarPanel.java
diff --git a/client/src/com/vaadin/client/ui/VCheckBox.java b/client/src/main/java/com/vaadin/client/ui/VCheckBox.java
index 887dba262a..887dba262a 100644
--- a/client/src/com/vaadin/client/ui/VCheckBox.java
+++ b/client/src/main/java/com/vaadin/client/ui/VCheckBox.java
diff --git a/client/src/com/vaadin/client/ui/VColorPicker.java b/client/src/main/java/com/vaadin/client/ui/VColorPicker.java
index b55c125418..b55c125418 100644
--- a/client/src/com/vaadin/client/ui/VColorPicker.java
+++ b/client/src/main/java/com/vaadin/client/ui/VColorPicker.java
diff --git a/client/src/com/vaadin/client/ui/VColorPickerArea.java b/client/src/main/java/com/vaadin/client/ui/VColorPickerArea.java
index 23a9379c80..23a9379c80 100644
--- a/client/src/com/vaadin/client/ui/VColorPickerArea.java
+++ b/client/src/main/java/com/vaadin/client/ui/VColorPickerArea.java
diff --git a/client/src/com/vaadin/client/ui/VContextMenu.java b/client/src/main/java/com/vaadin/client/ui/VContextMenu.java
index 6028eea52c..6028eea52c 100644
--- a/client/src/com/vaadin/client/ui/VContextMenu.java
+++ b/client/src/main/java/com/vaadin/client/ui/VContextMenu.java
diff --git a/client/src/com/vaadin/client/ui/VCssLayout.java b/client/src/main/java/com/vaadin/client/ui/VCssLayout.java
index d7d9eefef9..d7d9eefef9 100644
--- a/client/src/com/vaadin/client/ui/VCssLayout.java
+++ b/client/src/main/java/com/vaadin/client/ui/VCssLayout.java
diff --git a/client/src/com/vaadin/client/ui/VCustomComponent.java b/client/src/main/java/com/vaadin/client/ui/VCustomComponent.java
index 6aa21b08d2..6aa21b08d2 100644
--- a/client/src/com/vaadin/client/ui/VCustomComponent.java
+++ b/client/src/main/java/com/vaadin/client/ui/VCustomComponent.java
diff --git a/client/src/com/vaadin/client/ui/VCustomLayout.java b/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java
index 0ee50fe0dd..0ee50fe0dd 100644
--- a/client/src/com/vaadin/client/ui/VCustomLayout.java
+++ b/client/src/main/java/com/vaadin/client/ui/VCustomLayout.java
diff --git a/client/src/com/vaadin/client/ui/VDateField.java b/client/src/main/java/com/vaadin/client/ui/VDateField.java
index b4084847dd..b4084847dd 100644
--- a/client/src/com/vaadin/client/ui/VDateField.java
+++ b/client/src/main/java/com/vaadin/client/ui/VDateField.java
diff --git a/client/src/com/vaadin/client/ui/VDateFieldCalendar.java b/client/src/main/java/com/vaadin/client/ui/VDateFieldCalendar.java
index 759ebef102..759ebef102 100644
--- a/client/src/com/vaadin/client/ui/VDateFieldCalendar.java
+++ b/client/src/main/java/com/vaadin/client/ui/VDateFieldCalendar.java
diff --git a/client/src/com/vaadin/client/ui/VDragAndDropWrapper.java b/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapper.java
index 15ab9a6ce0..15ab9a6ce0 100644
--- a/client/src/com/vaadin/client/ui/VDragAndDropWrapper.java
+++ b/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapper.java
diff --git a/client/src/com/vaadin/client/ui/VDragAndDropWrapperIE.java b/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapperIE.java
index b32b36d13b..b32b36d13b 100644
--- a/client/src/com/vaadin/client/ui/VDragAndDropWrapperIE.java
+++ b/client/src/main/java/com/vaadin/client/ui/VDragAndDropWrapperIE.java
diff --git a/client/src/com/vaadin/client/ui/VEmbedded.java b/client/src/main/java/com/vaadin/client/ui/VEmbedded.java
index f3970f9ac7..f3970f9ac7 100644
--- a/client/src/com/vaadin/client/ui/VEmbedded.java
+++ b/client/src/main/java/com/vaadin/client/ui/VEmbedded.java
diff --git a/client/src/com/vaadin/client/ui/VFilterSelect.java b/client/src/main/java/com/vaadin/client/ui/VFilterSelect.java
index 8a6b442fb8..8a6b442fb8 100644
--- a/client/src/com/vaadin/client/ui/VFilterSelect.java
+++ b/client/src/main/java/com/vaadin/client/ui/VFilterSelect.java
diff --git a/client/src/com/vaadin/client/ui/VFlash.java b/client/src/main/java/com/vaadin/client/ui/VFlash.java
index eaf53836ee..eaf53836ee 100644
--- a/client/src/com/vaadin/client/ui/VFlash.java
+++ b/client/src/main/java/com/vaadin/client/ui/VFlash.java
diff --git a/client/src/com/vaadin/client/ui/VForm.java b/client/src/main/java/com/vaadin/client/ui/VForm.java
index ca38ea070b..ca38ea070b 100644
--- a/client/src/com/vaadin/client/ui/VForm.java
+++ b/client/src/main/java/com/vaadin/client/ui/VForm.java
diff --git a/client/src/com/vaadin/client/ui/VFormLayout.java b/client/src/main/java/com/vaadin/client/ui/VFormLayout.java
index 3719688f2b..3719688f2b 100644
--- a/client/src/com/vaadin/client/ui/VFormLayout.java
+++ b/client/src/main/java/com/vaadin/client/ui/VFormLayout.java
diff --git a/client/src/com/vaadin/client/ui/VGridLayout.java b/client/src/main/java/com/vaadin/client/ui/VGridLayout.java
index 42bcb5060a..42bcb5060a 100644
--- a/client/src/com/vaadin/client/ui/VGridLayout.java
+++ b/client/src/main/java/com/vaadin/client/ui/VGridLayout.java
diff --git a/client/src/com/vaadin/client/ui/VHorizontalLayout.java b/client/src/main/java/com/vaadin/client/ui/VHorizontalLayout.java
index b890aefe3d..b890aefe3d 100644
--- a/client/src/com/vaadin/client/ui/VHorizontalLayout.java
+++ b/client/src/main/java/com/vaadin/client/ui/VHorizontalLayout.java
diff --git a/client/src/com/vaadin/client/ui/VImage.java b/client/src/main/java/com/vaadin/client/ui/VImage.java
index 2742182179..2742182179 100644
--- a/client/src/com/vaadin/client/ui/VImage.java
+++ b/client/src/main/java/com/vaadin/client/ui/VImage.java
diff --git a/client/src/com/vaadin/client/ui/VLabel.java b/client/src/main/java/com/vaadin/client/ui/VLabel.java
index a3572759c4..a3572759c4 100644
--- a/client/src/com/vaadin/client/ui/VLabel.java
+++ b/client/src/main/java/com/vaadin/client/ui/VLabel.java
diff --git a/client/src/com/vaadin/client/ui/VLazyExecutor.java b/client/src/main/java/com/vaadin/client/ui/VLazyExecutor.java
index dfa4f574c6..dfa4f574c6 100644
--- a/client/src/com/vaadin/client/ui/VLazyExecutor.java
+++ b/client/src/main/java/com/vaadin/client/ui/VLazyExecutor.java
diff --git a/client/src/com/vaadin/client/ui/VLink.java b/client/src/main/java/com/vaadin/client/ui/VLink.java
index de99a8617f..de99a8617f 100644
--- a/client/src/com/vaadin/client/ui/VLink.java
+++ b/client/src/main/java/com/vaadin/client/ui/VLink.java
diff --git a/client/src/com/vaadin/client/ui/VListSelect.java b/client/src/main/java/com/vaadin/client/ui/VListSelect.java
index b6f4f0c722..b6f4f0c722 100644
--- a/client/src/com/vaadin/client/ui/VListSelect.java
+++ b/client/src/main/java/com/vaadin/client/ui/VListSelect.java
diff --git a/client/src/com/vaadin/client/ui/VMediaBase.java b/client/src/main/java/com/vaadin/client/ui/VMediaBase.java
index 53d7cef02d..53d7cef02d 100644
--- a/client/src/com/vaadin/client/ui/VMediaBase.java
+++ b/client/src/main/java/com/vaadin/client/ui/VMediaBase.java
diff --git a/client/src/com/vaadin/client/ui/VMenuBar.java b/client/src/main/java/com/vaadin/client/ui/VMenuBar.java
index b2b40c12f7..b2b40c12f7 100644
--- a/client/src/com/vaadin/client/ui/VMenuBar.java
+++ b/client/src/main/java/com/vaadin/client/ui/VMenuBar.java
diff --git a/client/src/com/vaadin/client/ui/VNativeButton.java b/client/src/main/java/com/vaadin/client/ui/VNativeButton.java
index 77b2515f45..77b2515f45 100644
--- a/client/src/com/vaadin/client/ui/VNativeButton.java
+++ b/client/src/main/java/com/vaadin/client/ui/VNativeButton.java
diff --git a/client/src/com/vaadin/client/ui/VNativeSelect.java b/client/src/main/java/com/vaadin/client/ui/VNativeSelect.java
index 330442b550..330442b550 100644
--- a/client/src/com/vaadin/client/ui/VNativeSelect.java
+++ b/client/src/main/java/com/vaadin/client/ui/VNativeSelect.java
diff --git a/client/src/com/vaadin/client/ui/VNotification.java b/client/src/main/java/com/vaadin/client/ui/VNotification.java
index 1ff51df8d0..1ff51df8d0 100644
--- a/client/src/com/vaadin/client/ui/VNotification.java
+++ b/client/src/main/java/com/vaadin/client/ui/VNotification.java
diff --git a/client/src/com/vaadin/client/ui/VOptionGroup.java b/client/src/main/java/com/vaadin/client/ui/VOptionGroup.java
index 9a28111dc5..9a28111dc5 100644
--- a/client/src/com/vaadin/client/ui/VOptionGroup.java
+++ b/client/src/main/java/com/vaadin/client/ui/VOptionGroup.java
diff --git a/client/src/com/vaadin/client/ui/VOptionGroupBase.java b/client/src/main/java/com/vaadin/client/ui/VOptionGroupBase.java
index ce75043d89..ce75043d89 100644
--- a/client/src/com/vaadin/client/ui/VOptionGroupBase.java
+++ b/client/src/main/java/com/vaadin/client/ui/VOptionGroupBase.java
diff --git a/client/src/com/vaadin/client/ui/VOverlay.java b/client/src/main/java/com/vaadin/client/ui/VOverlay.java
index 5dc29f5a42..5dc29f5a42 100644
--- a/client/src/com/vaadin/client/ui/VOverlay.java
+++ b/client/src/main/java/com/vaadin/client/ui/VOverlay.java
diff --git a/client/src/com/vaadin/client/ui/VPanel.java b/client/src/main/java/com/vaadin/client/ui/VPanel.java
index 946ff83180..946ff83180 100644
--- a/client/src/com/vaadin/client/ui/VPanel.java
+++ b/client/src/main/java/com/vaadin/client/ui/VPanel.java
diff --git a/client/src/com/vaadin/client/ui/VPasswordField.java b/client/src/main/java/com/vaadin/client/ui/VPasswordField.java
index dcbb60364c..dcbb60364c 100644
--- a/client/src/com/vaadin/client/ui/VPasswordField.java
+++ b/client/src/main/java/com/vaadin/client/ui/VPasswordField.java
diff --git a/client/src/com/vaadin/client/ui/VPopupCalendar.java b/client/src/main/java/com/vaadin/client/ui/VPopupCalendar.java
index 47f11b09b1..47f11b09b1 100644
--- a/client/src/com/vaadin/client/ui/VPopupCalendar.java
+++ b/client/src/main/java/com/vaadin/client/ui/VPopupCalendar.java
diff --git a/client/src/com/vaadin/client/ui/VPopupView.java b/client/src/main/java/com/vaadin/client/ui/VPopupView.java
index 0f4e68acab..0f4e68acab 100644
--- a/client/src/com/vaadin/client/ui/VPopupView.java
+++ b/client/src/main/java/com/vaadin/client/ui/VPopupView.java
diff --git a/client/src/com/vaadin/client/ui/VProgressBar.java b/client/src/main/java/com/vaadin/client/ui/VProgressBar.java
index 348791728f..348791728f 100644
--- a/client/src/com/vaadin/client/ui/VProgressBar.java
+++ b/client/src/main/java/com/vaadin/client/ui/VProgressBar.java
diff --git a/client/src/com/vaadin/client/ui/VProgressIndicator.java b/client/src/main/java/com/vaadin/client/ui/VProgressIndicator.java
index f93fa37af6..f93fa37af6 100644
--- a/client/src/com/vaadin/client/ui/VProgressIndicator.java
+++ b/client/src/main/java/com/vaadin/client/ui/VProgressIndicator.java
diff --git a/client/src/com/vaadin/client/ui/VRichTextArea.java b/client/src/main/java/com/vaadin/client/ui/VRichTextArea.java
index cb4482f7cb..cb4482f7cb 100644
--- a/client/src/com/vaadin/client/ui/VRichTextArea.java
+++ b/client/src/main/java/com/vaadin/client/ui/VRichTextArea.java
diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/main/java/com/vaadin/client/ui/VScrollTable.java
index 5e5ae8a259..5e5ae8a259 100644
--- a/client/src/com/vaadin/client/ui/VScrollTable.java
+++ b/client/src/main/java/com/vaadin/client/ui/VScrollTable.java
diff --git a/client/src/com/vaadin/client/ui/VSlider.java b/client/src/main/java/com/vaadin/client/ui/VSlider.java
index 952c387539..952c387539 100644
--- a/client/src/com/vaadin/client/ui/VSlider.java
+++ b/client/src/main/java/com/vaadin/client/ui/VSlider.java
diff --git a/client/src/com/vaadin/client/ui/VSplitPanelHorizontal.java b/client/src/main/java/com/vaadin/client/ui/VSplitPanelHorizontal.java
index 1a3e699b20..1a3e699b20 100644
--- a/client/src/com/vaadin/client/ui/VSplitPanelHorizontal.java
+++ b/client/src/main/java/com/vaadin/client/ui/VSplitPanelHorizontal.java
diff --git a/client/src/com/vaadin/client/ui/VSplitPanelVertical.java b/client/src/main/java/com/vaadin/client/ui/VSplitPanelVertical.java
index 7baed03ca3..7baed03ca3 100644
--- a/client/src/com/vaadin/client/ui/VSplitPanelVertical.java
+++ b/client/src/main/java/com/vaadin/client/ui/VSplitPanelVertical.java
diff --git a/client/src/com/vaadin/client/ui/VTabsheet.java b/client/src/main/java/com/vaadin/client/ui/VTabsheet.java
index e196870348..e196870348 100644
--- a/client/src/com/vaadin/client/ui/VTabsheet.java
+++ b/client/src/main/java/com/vaadin/client/ui/VTabsheet.java
diff --git a/client/src/com/vaadin/client/ui/VTabsheetBase.java b/client/src/main/java/com/vaadin/client/ui/VTabsheetBase.java
index e96aa035ed..e96aa035ed 100644
--- a/client/src/com/vaadin/client/ui/VTabsheetBase.java
+++ b/client/src/main/java/com/vaadin/client/ui/VTabsheetBase.java
diff --git a/client/src/com/vaadin/client/ui/VTabsheetPanel.java b/client/src/main/java/com/vaadin/client/ui/VTabsheetPanel.java
index 240f493907..240f493907 100644
--- a/client/src/com/vaadin/client/ui/VTabsheetPanel.java
+++ b/client/src/main/java/com/vaadin/client/ui/VTabsheetPanel.java
diff --git a/client/src/com/vaadin/client/ui/VTextArea.java b/client/src/main/java/com/vaadin/client/ui/VTextArea.java
index bb3d3a476b..bb3d3a476b 100644
--- a/client/src/com/vaadin/client/ui/VTextArea.java
+++ b/client/src/main/java/com/vaadin/client/ui/VTextArea.java
diff --git a/client/src/com/vaadin/client/ui/VTextField.java b/client/src/main/java/com/vaadin/client/ui/VTextField.java
index 1554bd1a22..1554bd1a22 100644
--- a/client/src/com/vaadin/client/ui/VTextField.java
+++ b/client/src/main/java/com/vaadin/client/ui/VTextField.java
diff --git a/client/src/com/vaadin/client/ui/VTextualDate.java b/client/src/main/java/com/vaadin/client/ui/VTextualDate.java
index 4d80b30f4f..4d80b30f4f 100644
--- a/client/src/com/vaadin/client/ui/VTextualDate.java
+++ b/client/src/main/java/com/vaadin/client/ui/VTextualDate.java
diff --git a/client/src/com/vaadin/client/ui/VTree.java b/client/src/main/java/com/vaadin/client/ui/VTree.java
index efbafd0cb7..efbafd0cb7 100644
--- a/client/src/com/vaadin/client/ui/VTree.java
+++ b/client/src/main/java/com/vaadin/client/ui/VTree.java
diff --git a/client/src/com/vaadin/client/ui/VTreeTable.java b/client/src/main/java/com/vaadin/client/ui/VTreeTable.java
index 0ba84af4bb..0ba84af4bb 100644
--- a/client/src/com/vaadin/client/ui/VTreeTable.java
+++ b/client/src/main/java/com/vaadin/client/ui/VTreeTable.java
diff --git a/client/src/com/vaadin/client/ui/VTwinColSelect.java b/client/src/main/java/com/vaadin/client/ui/VTwinColSelect.java
index 853bd8d456..853bd8d456 100644
--- a/client/src/com/vaadin/client/ui/VTwinColSelect.java
+++ b/client/src/main/java/com/vaadin/client/ui/VTwinColSelect.java
diff --git a/client/src/com/vaadin/client/ui/VUI.java b/client/src/main/java/com/vaadin/client/ui/VUI.java
index 08641ad6ba..08641ad6ba 100644
--- a/client/src/com/vaadin/client/ui/VUI.java
+++ b/client/src/main/java/com/vaadin/client/ui/VUI.java
diff --git a/client/src/com/vaadin/client/ui/VUnknownComponent.java b/client/src/main/java/com/vaadin/client/ui/VUnknownComponent.java
index 89907854de..89907854de 100644
--- a/client/src/com/vaadin/client/ui/VUnknownComponent.java
+++ b/client/src/main/java/com/vaadin/client/ui/VUnknownComponent.java
diff --git a/client/src/com/vaadin/client/ui/VUpload.java b/client/src/main/java/com/vaadin/client/ui/VUpload.java
index 2800acccf9..2800acccf9 100644
--- a/client/src/com/vaadin/client/ui/VUpload.java
+++ b/client/src/main/java/com/vaadin/client/ui/VUpload.java
diff --git a/client/src/com/vaadin/client/ui/VVerticalLayout.java b/client/src/main/java/com/vaadin/client/ui/VVerticalLayout.java
index 00ef0fc719..00ef0fc719 100644
--- a/client/src/com/vaadin/client/ui/VVerticalLayout.java
+++ b/client/src/main/java/com/vaadin/client/ui/VVerticalLayout.java
diff --git a/client/src/com/vaadin/client/ui/VVideo.java b/client/src/main/java/com/vaadin/client/ui/VVideo.java
index 023a7f9ee0..023a7f9ee0 100644
--- a/client/src/com/vaadin/client/ui/VVideo.java
+++ b/client/src/main/java/com/vaadin/client/ui/VVideo.java
diff --git a/client/src/com/vaadin/client/ui/VWindow.java b/client/src/main/java/com/vaadin/client/ui/VWindow.java
index 2d2d6ecee1..2d2d6ecee1 100644
--- a/client/src/com/vaadin/client/ui/VWindow.java
+++ b/client/src/main/java/com/vaadin/client/ui/VWindow.java
diff --git a/client/src/com/vaadin/client/ui/absolutelayout/AbsoluteLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/absolutelayout/AbsoluteLayoutConnector.java
index 19b66fb72f..19b66fb72f 100644
--- a/client/src/com/vaadin/client/ui/absolutelayout/AbsoluteLayoutConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/absolutelayout/AbsoluteLayoutConnector.java
diff --git a/client/src/com/vaadin/client/ui/accordion/AccordionConnector.java b/client/src/main/java/com/vaadin/client/ui/accordion/AccordionConnector.java
index 949e19071c..949e19071c 100644
--- a/client/src/com/vaadin/client/ui/accordion/AccordionConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/accordion/AccordionConnector.java
diff --git a/client/src/com/vaadin/client/ui/aria/AriaHelper.java b/client/src/main/java/com/vaadin/client/ui/aria/AriaHelper.java
index bf93901a33..bf93901a33 100644
--- a/client/src/com/vaadin/client/ui/aria/AriaHelper.java
+++ b/client/src/main/java/com/vaadin/client/ui/aria/AriaHelper.java
diff --git a/client/src/com/vaadin/client/ui/aria/HandlesAriaCaption.java b/client/src/main/java/com/vaadin/client/ui/aria/HandlesAriaCaption.java
index 369edb7d69..369edb7d69 100644
--- a/client/src/com/vaadin/client/ui/aria/HandlesAriaCaption.java
+++ b/client/src/main/java/com/vaadin/client/ui/aria/HandlesAriaCaption.java
diff --git a/client/src/com/vaadin/client/ui/aria/HandlesAriaInvalid.java b/client/src/main/java/com/vaadin/client/ui/aria/HandlesAriaInvalid.java
index 296e455dcd..296e455dcd 100644
--- a/client/src/com/vaadin/client/ui/aria/HandlesAriaInvalid.java
+++ b/client/src/main/java/com/vaadin/client/ui/aria/HandlesAriaInvalid.java
diff --git a/client/src/com/vaadin/client/ui/aria/HandlesAriaRequired.java b/client/src/main/java/com/vaadin/client/ui/aria/HandlesAriaRequired.java
index 95ebd7fb9a..95ebd7fb9a 100644
--- a/client/src/com/vaadin/client/ui/aria/HandlesAriaRequired.java
+++ b/client/src/main/java/com/vaadin/client/ui/aria/HandlesAriaRequired.java
diff --git a/client/src/com/vaadin/client/ui/audio/AudioConnector.java b/client/src/main/java/com/vaadin/client/ui/audio/AudioConnector.java
index a451d117f2..a451d117f2 100644
--- a/client/src/com/vaadin/client/ui/audio/AudioConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/audio/AudioConnector.java
diff --git a/client/src/com/vaadin/client/ui/browserframe/BrowserFrameConnector.java b/client/src/main/java/com/vaadin/client/ui/browserframe/BrowserFrameConnector.java
index 95d64b61d0..95d64b61d0 100644
--- a/client/src/com/vaadin/client/ui/browserframe/BrowserFrameConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/browserframe/BrowserFrameConnector.java
diff --git a/client/src/com/vaadin/client/ui/button/ButtonConnector.java b/client/src/main/java/com/vaadin/client/ui/button/ButtonConnector.java
index 2c2006e19b..2c2006e19b 100644
--- a/client/src/com/vaadin/client/ui/button/ButtonConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/button/ButtonConnector.java
diff --git a/client/src/com/vaadin/client/ui/calendar/CalendarConnector.java b/client/src/main/java/com/vaadin/client/ui/calendar/CalendarConnector.java
index 58cc31a580..58cc31a580 100644
--- a/client/src/com/vaadin/client/ui/calendar/CalendarConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/CalendarConnector.java
diff --git a/client/src/com/vaadin/client/ui/calendar/VCalendarAction.java b/client/src/main/java/com/vaadin/client/ui/calendar/VCalendarAction.java
index 470ee3cf1a..470ee3cf1a 100644
--- a/client/src/com/vaadin/client/ui/calendar/VCalendarAction.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/VCalendarAction.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/CalendarDay.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/CalendarDay.java
index 0fceb6b6f9..0fceb6b6f9 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/CalendarDay.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/CalendarDay.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/CalendarEvent.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/CalendarEvent.java
index 5630db2415..5630db2415 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/CalendarEvent.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/CalendarEvent.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/DateCell.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCell.java
index 39d516b694..39d516b694 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/DateCell.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCell.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/DateCellContainer.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellContainer.java
index 26f5951987..26f5951987 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/DateCellContainer.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellContainer.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/DateCellDayEvent.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellDayEvent.java
index 55834397d3..55834397d3 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/DateCellDayEvent.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellDayEvent.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/DateCellGroup.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellGroup.java
index f4ef22f4ca..f4ef22f4ca 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/DateCellGroup.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellGroup.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/DateUtil.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateUtil.java
index 165bbefefc..165bbefefc 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/DateUtil.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateUtil.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/DayToolbar.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DayToolbar.java
index 10ed5bb3f9..10ed5bb3f9 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/DayToolbar.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DayToolbar.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/FocusableComplexPanel.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableComplexPanel.java
index cdad83744e..cdad83744e 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/FocusableComplexPanel.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableComplexPanel.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/FocusableGrid.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableGrid.java
index 1369392656..1369392656 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/FocusableGrid.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableGrid.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/FocusableHTML.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableHTML.java
index 0c6ddb3697..0c6ddb3697 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/FocusableHTML.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableHTML.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/HasTooltipKey.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/HasTooltipKey.java
index d04ec39527..d04ec39527 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/HasTooltipKey.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/HasTooltipKey.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/MonthEventLabel.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/MonthEventLabel.java
index 31e600c8f9..31e600c8f9 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/MonthEventLabel.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/MonthEventLabel.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/MonthGrid.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/MonthGrid.java
index 52a81d0eb9..52a81d0eb9 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/MonthGrid.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/MonthGrid.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/SimpleDayCell.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleDayCell.java
index 158241337b..158241337b 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/SimpleDayCell.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleDayCell.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/SimpleDayToolbar.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleDayToolbar.java
index 3133341542..3133341542 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/SimpleDayToolbar.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleDayToolbar.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/SimpleWeekToolbar.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleWeekToolbar.java
index fc79163d3e..fc79163d3e 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/SimpleWeekToolbar.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleWeekToolbar.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/WeekGrid.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekGrid.java
index aecaff1931..aecaff1931 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/WeekGrid.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekGrid.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/WeekGridMinuteTimeRange.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekGridMinuteTimeRange.java
index 07bcc1e887..07bcc1e887 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/WeekGridMinuteTimeRange.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekGridMinuteTimeRange.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/WeekLabel.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekLabel.java
index bb0cf5d1ea..bb0cf5d1ea 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/WeekLabel.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekLabel.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/WeeklyLongEvents.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeeklyLongEvents.java
index 9488c8835a..9488c8835a 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/WeeklyLongEvents.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeeklyLongEvents.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/WeeklyLongEventsDateCell.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeeklyLongEventsDateCell.java
index 7d3dc9b89a..7d3dc9b89a 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/WeeklyLongEventsDateCell.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeeklyLongEventsDateCell.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/dd/CalendarDropHandler.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarDropHandler.java
index 92046f96ec..92046f96ec 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/dd/CalendarDropHandler.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarDropHandler.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/dd/CalendarMonthDropHandler.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarMonthDropHandler.java
index 39e08e9d70..39e08e9d70 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/dd/CalendarMonthDropHandler.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarMonthDropHandler.java
diff --git a/client/src/com/vaadin/client/ui/calendar/schedule/dd/CalendarWeekDropHandler.java b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarWeekDropHandler.java
index e0edf21e89..e0edf21e89 100644
--- a/client/src/com/vaadin/client/ui/calendar/schedule/dd/CalendarWeekDropHandler.java
+++ b/client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarWeekDropHandler.java
diff --git a/client/src/com/vaadin/client/ui/checkbox/CheckBoxConnector.java b/client/src/main/java/com/vaadin/client/ui/checkbox/CheckBoxConnector.java
index 0dc9810c51..0dc9810c51 100644
--- a/client/src/com/vaadin/client/ui/checkbox/CheckBoxConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/checkbox/CheckBoxConnector.java
diff --git a/client/src/com/vaadin/client/ui/colorpicker/AbstractColorPickerConnector.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/AbstractColorPickerConnector.java
index cba2a667ca..cba2a667ca 100644
--- a/client/src/com/vaadin/client/ui/colorpicker/AbstractColorPickerConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/AbstractColorPickerConnector.java
diff --git a/client/src/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java
index 355e705581..355e705581 100644
--- a/client/src/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java
diff --git a/client/src/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java
index 2f0dbd5ce7..2f0dbd5ce7 100644
--- a/client/src/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java
diff --git a/client/src/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java
index 223675f660..223675f660 100644
--- a/client/src/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java
diff --git a/client/src/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java
index dc3c3ca790..dc3c3ca790 100644
--- a/client/src/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java
diff --git a/client/src/com/vaadin/client/ui/colorpicker/VColorPickerGradient.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGradient.java
index 70ced91da4..70ced91da4 100644
--- a/client/src/com/vaadin/client/ui/colorpicker/VColorPickerGradient.java
+++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGradient.java
diff --git a/client/src/com/vaadin/client/ui/colorpicker/VColorPickerGrid.java b/client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGrid.java
index c407bdc5ef..c407bdc5ef 100644
--- a/client/src/com/vaadin/client/ui/colorpicker/VColorPickerGrid.java
+++ b/client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGrid.java
diff --git a/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java b/client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java
index 1224a2eaf2..1224a2eaf2 100644
--- a/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java
diff --git a/client/src/com/vaadin/client/ui/csslayout/CssLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/csslayout/CssLayoutConnector.java
index 1ec395280d..1ec395280d 100644
--- a/client/src/com/vaadin/client/ui/csslayout/CssLayoutConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/csslayout/CssLayoutConnector.java
diff --git a/client/src/com/vaadin/client/ui/customcomponent/CustomComponentConnector.java b/client/src/main/java/com/vaadin/client/ui/customcomponent/CustomComponentConnector.java
index e981dc13fc..e981dc13fc 100644
--- a/client/src/com/vaadin/client/ui/customcomponent/CustomComponentConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/customcomponent/CustomComponentConnector.java
diff --git a/client/src/com/vaadin/client/ui/customfield/CustomFieldConnector.java b/client/src/main/java/com/vaadin/client/ui/customfield/CustomFieldConnector.java
index d18574d010..d18574d010 100644
--- a/client/src/com/vaadin/client/ui/customfield/CustomFieldConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/customfield/CustomFieldConnector.java
diff --git a/client/src/com/vaadin/client/ui/customlayout/CustomLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/customlayout/CustomLayoutConnector.java
index abbb0ef60b..abbb0ef60b 100644
--- a/client/src/com/vaadin/client/ui/customlayout/CustomLayoutConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/customlayout/CustomLayoutConnector.java
diff --git a/client/src/com/vaadin/client/ui/datefield/AbstractDateFieldConnector.java b/client/src/main/java/com/vaadin/client/ui/datefield/AbstractDateFieldConnector.java
index 6d1c9316f6..6d1c9316f6 100644
--- a/client/src/com/vaadin/client/ui/datefield/AbstractDateFieldConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/datefield/AbstractDateFieldConnector.java
diff --git a/client/src/com/vaadin/client/ui/datefield/DateFieldConnector.java b/client/src/main/java/com/vaadin/client/ui/datefield/DateFieldConnector.java
index c6b410fa74..c6b410fa74 100644
--- a/client/src/com/vaadin/client/ui/datefield/DateFieldConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/datefield/DateFieldConnector.java
diff --git a/client/src/com/vaadin/client/ui/datefield/InlineDateFieldConnector.java b/client/src/main/java/com/vaadin/client/ui/datefield/InlineDateFieldConnector.java
index 6321e1c092..6321e1c092 100644
--- a/client/src/com/vaadin/client/ui/datefield/InlineDateFieldConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/datefield/InlineDateFieldConnector.java
diff --git a/client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java b/client/src/main/java/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java
index 31232177d3..31232177d3 100644
--- a/client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java
diff --git a/client/src/com/vaadin/client/ui/datefield/TextualDateConnector.java b/client/src/main/java/com/vaadin/client/ui/datefield/TextualDateConnector.java
index 8545c20d7d..8545c20d7d 100644
--- a/client/src/com/vaadin/client/ui/datefield/TextualDateConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/datefield/TextualDateConnector.java
diff --git a/client/src/com/vaadin/client/ui/dd/DDEventHandleStrategy.java b/client/src/main/java/com/vaadin/client/ui/dd/DDEventHandleStrategy.java
index 7b3203f330..7b3203f330 100644
--- a/client/src/com/vaadin/client/ui/dd/DDEventHandleStrategy.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/DDEventHandleStrategy.java
diff --git a/client/src/com/vaadin/client/ui/dd/DDUtil.java b/client/src/main/java/com/vaadin/client/ui/dd/DDUtil.java
index fdccd61767..fdccd61767 100644
--- a/client/src/com/vaadin/client/ui/dd/DDUtil.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/DDUtil.java
diff --git a/client/src/com/vaadin/client/ui/dd/DragAndDropHandler.java b/client/src/main/java/com/vaadin/client/ui/dd/DragAndDropHandler.java
index 63c44f1fd5..63c44f1fd5 100644
--- a/client/src/com/vaadin/client/ui/dd/DragAndDropHandler.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/DragAndDropHandler.java
diff --git a/client/src/com/vaadin/client/ui/dd/DragHandle.java b/client/src/main/java/com/vaadin/client/ui/dd/DragHandle.java
index 77184e14af..77184e14af 100644
--- a/client/src/com/vaadin/client/ui/dd/DragHandle.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/DragHandle.java
diff --git a/client/src/com/vaadin/client/ui/dd/DragImageModifier.java b/client/src/main/java/com/vaadin/client/ui/dd/DragImageModifier.java
index 45ab5d9bb3..45ab5d9bb3 100644
--- a/client/src/com/vaadin/client/ui/dd/DragImageModifier.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/DragImageModifier.java
diff --git a/client/src/com/vaadin/client/ui/dd/VAbstractDropHandler.java b/client/src/main/java/com/vaadin/client/ui/dd/VAbstractDropHandler.java
index 61708260a1..61708260a1 100644
--- a/client/src/com/vaadin/client/ui/dd/VAbstractDropHandler.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VAbstractDropHandler.java
diff --git a/client/src/com/vaadin/client/ui/dd/VAcceptAll.java b/client/src/main/java/com/vaadin/client/ui/dd/VAcceptAll.java
index bb6170da45..bb6170da45 100644
--- a/client/src/com/vaadin/client/ui/dd/VAcceptAll.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VAcceptAll.java
diff --git a/client/src/com/vaadin/client/ui/dd/VAcceptCallback.java b/client/src/main/java/com/vaadin/client/ui/dd/VAcceptCallback.java
index 706abb0e05..706abb0e05 100644
--- a/client/src/com/vaadin/client/ui/dd/VAcceptCallback.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VAcceptCallback.java
diff --git a/client/src/com/vaadin/client/ui/dd/VAcceptCriteria.java b/client/src/main/java/com/vaadin/client/ui/dd/VAcceptCriteria.java
index 4bf23cbe7f..4bf23cbe7f 100644
--- a/client/src/com/vaadin/client/ui/dd/VAcceptCriteria.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VAcceptCriteria.java
diff --git a/client/src/com/vaadin/client/ui/dd/VAcceptCriterion.java b/client/src/main/java/com/vaadin/client/ui/dd/VAcceptCriterion.java
index 5205b9182b..5205b9182b 100644
--- a/client/src/com/vaadin/client/ui/dd/VAcceptCriterion.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VAcceptCriterion.java
diff --git a/client/src/com/vaadin/client/ui/dd/VAcceptCriterionFactory.java b/client/src/main/java/com/vaadin/client/ui/dd/VAcceptCriterionFactory.java
index 1503b1f84d..1503b1f84d 100644
--- a/client/src/com/vaadin/client/ui/dd/VAcceptCriterionFactory.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VAcceptCriterionFactory.java
diff --git a/client/src/com/vaadin/client/ui/dd/VAnd.java b/client/src/main/java/com/vaadin/client/ui/dd/VAnd.java
index ee4bc94f9e..ee4bc94f9e 100644
--- a/client/src/com/vaadin/client/ui/dd/VAnd.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VAnd.java
diff --git a/client/src/com/vaadin/client/ui/dd/VContainsDataFlavor.java b/client/src/main/java/com/vaadin/client/ui/dd/VContainsDataFlavor.java
index 2ad375fd77..2ad375fd77 100644
--- a/client/src/com/vaadin/client/ui/dd/VContainsDataFlavor.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VContainsDataFlavor.java
diff --git a/client/src/com/vaadin/client/ui/dd/VDragAndDropManager.java b/client/src/main/java/com/vaadin/client/ui/dd/VDragAndDropManager.java
index 109b69f0c4..109b69f0c4 100644
--- a/client/src/com/vaadin/client/ui/dd/VDragAndDropManager.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VDragAndDropManager.java
diff --git a/client/src/com/vaadin/client/ui/dd/VDragEvent.java b/client/src/main/java/com/vaadin/client/ui/dd/VDragEvent.java
index c889dbf34e..c889dbf34e 100644
--- a/client/src/com/vaadin/client/ui/dd/VDragEvent.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VDragEvent.java
diff --git a/client/src/com/vaadin/client/ui/dd/VDragEventServerCallback.java b/client/src/main/java/com/vaadin/client/ui/dd/VDragEventServerCallback.java
index ba2d0f789b..ba2d0f789b 100644
--- a/client/src/com/vaadin/client/ui/dd/VDragEventServerCallback.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VDragEventServerCallback.java
diff --git a/client/src/com/vaadin/client/ui/dd/VDragSourceIs.java b/client/src/main/java/com/vaadin/client/ui/dd/VDragSourceIs.java
index 8a8d1d7bb9..8a8d1d7bb9 100644
--- a/client/src/com/vaadin/client/ui/dd/VDragSourceIs.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VDragSourceIs.java
diff --git a/client/src/com/vaadin/client/ui/dd/VDropHandler.java b/client/src/main/java/com/vaadin/client/ui/dd/VDropHandler.java
index 96059883e7..96059883e7 100644
--- a/client/src/com/vaadin/client/ui/dd/VDropHandler.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VDropHandler.java
diff --git a/client/src/com/vaadin/client/ui/dd/VHasDropHandler.java b/client/src/main/java/com/vaadin/client/ui/dd/VHasDropHandler.java
index 4d82c5c9cf..4d82c5c9cf 100644
--- a/client/src/com/vaadin/client/ui/dd/VHasDropHandler.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VHasDropHandler.java
diff --git a/client/src/com/vaadin/client/ui/dd/VHtml5DragEvent.java b/client/src/main/java/com/vaadin/client/ui/dd/VHtml5DragEvent.java
index 68987e565f..68987e565f 100644
--- a/client/src/com/vaadin/client/ui/dd/VHtml5DragEvent.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VHtml5DragEvent.java
diff --git a/client/src/com/vaadin/client/ui/dd/VHtml5File.java b/client/src/main/java/com/vaadin/client/ui/dd/VHtml5File.java
index 6022835343..6022835343 100644
--- a/client/src/com/vaadin/client/ui/dd/VHtml5File.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VHtml5File.java
diff --git a/client/src/com/vaadin/client/ui/dd/VIsOverId.java b/client/src/main/java/com/vaadin/client/ui/dd/VIsOverId.java
index 8e8abf1a97..8e8abf1a97 100644
--- a/client/src/com/vaadin/client/ui/dd/VIsOverId.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VIsOverId.java
diff --git a/client/src/com/vaadin/client/ui/dd/VItemIdIs.java b/client/src/main/java/com/vaadin/client/ui/dd/VItemIdIs.java
index 4bfc71ab14..4bfc71ab14 100644
--- a/client/src/com/vaadin/client/ui/dd/VItemIdIs.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VItemIdIs.java
diff --git a/client/src/com/vaadin/client/ui/dd/VLazyInitItemIdentifiers.java b/client/src/main/java/com/vaadin/client/ui/dd/VLazyInitItemIdentifiers.java
index f67174c1c1..f67174c1c1 100644
--- a/client/src/com/vaadin/client/ui/dd/VLazyInitItemIdentifiers.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VLazyInitItemIdentifiers.java
diff --git a/client/src/com/vaadin/client/ui/dd/VNot.java b/client/src/main/java/com/vaadin/client/ui/dd/VNot.java
index 3e931f9580..3e931f9580 100644
--- a/client/src/com/vaadin/client/ui/dd/VNot.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VNot.java
diff --git a/client/src/com/vaadin/client/ui/dd/VOr.java b/client/src/main/java/com/vaadin/client/ui/dd/VOr.java
index e189e22b45..e189e22b45 100644
--- a/client/src/com/vaadin/client/ui/dd/VOr.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VOr.java
diff --git a/client/src/com/vaadin/client/ui/dd/VOverTreeNode.java b/client/src/main/java/com/vaadin/client/ui/dd/VOverTreeNode.java
index c7c00a6bee..c7c00a6bee 100644
--- a/client/src/com/vaadin/client/ui/dd/VOverTreeNode.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VOverTreeNode.java
diff --git a/client/src/com/vaadin/client/ui/dd/VServerAccept.java b/client/src/main/java/com/vaadin/client/ui/dd/VServerAccept.java
index 9ead6298b0..9ead6298b0 100644
--- a/client/src/com/vaadin/client/ui/dd/VServerAccept.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VServerAccept.java
diff --git a/client/src/com/vaadin/client/ui/dd/VSourceIsTarget.java b/client/src/main/java/com/vaadin/client/ui/dd/VSourceIsTarget.java
index 3e453b4105..3e453b4105 100644
--- a/client/src/com/vaadin/client/ui/dd/VSourceIsTarget.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VSourceIsTarget.java
diff --git a/client/src/com/vaadin/client/ui/dd/VTargetDetailIs.java b/client/src/main/java/com/vaadin/client/ui/dd/VTargetDetailIs.java
index 9084d7df89..9084d7df89 100644
--- a/client/src/com/vaadin/client/ui/dd/VTargetDetailIs.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VTargetDetailIs.java
diff --git a/client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java b/client/src/main/java/com/vaadin/client/ui/dd/VTargetInSubtree.java
index 1641eb30f1..1641eb30f1 100644
--- a/client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VTargetInSubtree.java
diff --git a/client/src/com/vaadin/client/ui/dd/VTransferable.java b/client/src/main/java/com/vaadin/client/ui/dd/VTransferable.java
index b03dcbcb35..b03dcbcb35 100644
--- a/client/src/com/vaadin/client/ui/dd/VTransferable.java
+++ b/client/src/main/java/com/vaadin/client/ui/dd/VTransferable.java
diff --git a/client/src/com/vaadin/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java b/client/src/main/java/com/vaadin/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java
index 7ea9596809..7ea9596809 100644
--- a/client/src/com/vaadin/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java
diff --git a/client/src/com/vaadin/client/ui/embedded/EmbeddedConnector.java b/client/src/main/java/com/vaadin/client/ui/embedded/EmbeddedConnector.java
index 7b837726a7..7b837726a7 100644
--- a/client/src/com/vaadin/client/ui/embedded/EmbeddedConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/embedded/EmbeddedConnector.java
diff --git a/client/src/com/vaadin/client/ui/flash/FlashConnector.java b/client/src/main/java/com/vaadin/client/ui/flash/FlashConnector.java
index e859e9cbf1..e859e9cbf1 100644
--- a/client/src/com/vaadin/client/ui/flash/FlashConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/flash/FlashConnector.java
diff --git a/client/src/com/vaadin/client/ui/form/FormConnector.java b/client/src/main/java/com/vaadin/client/ui/form/FormConnector.java
index 857c2bd40e..857c2bd40e 100644
--- a/client/src/com/vaadin/client/ui/form/FormConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/form/FormConnector.java
diff --git a/client/src/com/vaadin/client/ui/formlayout/FormLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/formlayout/FormLayoutConnector.java
index 3f0b4345c4..3f0b4345c4 100644
--- a/client/src/com/vaadin/client/ui/formlayout/FormLayoutConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/formlayout/FormLayoutConnector.java
diff --git a/client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java
index 4d1ce692ad..4d1ce692ad 100644
--- a/client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java
diff --git a/client/src/com/vaadin/client/ui/image/ImageConnector.java b/client/src/main/java/com/vaadin/client/ui/image/ImageConnector.java
index e4ba4af070..e4ba4af070 100644
--- a/client/src/com/vaadin/client/ui/image/ImageConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/image/ImageConnector.java
diff --git a/client/src/com/vaadin/client/ui/label/LabelConnector.java b/client/src/main/java/com/vaadin/client/ui/label/LabelConnector.java
index fc94f27cf0..fc94f27cf0 100644
--- a/client/src/com/vaadin/client/ui/label/LabelConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/label/LabelConnector.java
diff --git a/client/src/com/vaadin/client/ui/layout/ComponentConnectorLayoutSlot.java b/client/src/main/java/com/vaadin/client/ui/layout/ComponentConnectorLayoutSlot.java
index b323fde1db..b323fde1db 100644
--- a/client/src/com/vaadin/client/ui/layout/ComponentConnectorLayoutSlot.java
+++ b/client/src/main/java/com/vaadin/client/ui/layout/ComponentConnectorLayoutSlot.java
diff --git a/client/src/com/vaadin/client/ui/layout/ElementResizeEvent.java b/client/src/main/java/com/vaadin/client/ui/layout/ElementResizeEvent.java
index a1f75baff4..a1f75baff4 100644
--- a/client/src/com/vaadin/client/ui/layout/ElementResizeEvent.java
+++ b/client/src/main/java/com/vaadin/client/ui/layout/ElementResizeEvent.java
diff --git a/client/src/com/vaadin/client/ui/layout/ElementResizeListener.java b/client/src/main/java/com/vaadin/client/ui/layout/ElementResizeListener.java
index 97ca34a8a4..97ca34a8a4 100644
--- a/client/src/com/vaadin/client/ui/layout/ElementResizeListener.java
+++ b/client/src/main/java/com/vaadin/client/ui/layout/ElementResizeListener.java
diff --git a/client/src/com/vaadin/client/ui/layout/LayoutDependencyTree.java b/client/src/main/java/com/vaadin/client/ui/layout/LayoutDependencyTree.java
index 27733bfbe3..27733bfbe3 100644
--- a/client/src/com/vaadin/client/ui/layout/LayoutDependencyTree.java
+++ b/client/src/main/java/com/vaadin/client/ui/layout/LayoutDependencyTree.java
diff --git a/client/src/com/vaadin/client/ui/layout/Margins.java b/client/src/main/java/com/vaadin/client/ui/layout/Margins.java
index 75839c9ce8..75839c9ce8 100644
--- a/client/src/com/vaadin/client/ui/layout/Margins.java
+++ b/client/src/main/java/com/vaadin/client/ui/layout/Margins.java
diff --git a/client/src/com/vaadin/client/ui/layout/MayScrollChildren.java b/client/src/main/java/com/vaadin/client/ui/layout/MayScrollChildren.java
index 2a0b821646..2a0b821646 100644
--- a/client/src/com/vaadin/client/ui/layout/MayScrollChildren.java
+++ b/client/src/main/java/com/vaadin/client/ui/layout/MayScrollChildren.java
diff --git a/client/src/com/vaadin/client/ui/layout/VLayoutSlot.java b/client/src/main/java/com/vaadin/client/ui/layout/VLayoutSlot.java
index bc0c6739bb..bc0c6739bb 100644
--- a/client/src/com/vaadin/client/ui/layout/VLayoutSlot.java
+++ b/client/src/main/java/com/vaadin/client/ui/layout/VLayoutSlot.java
diff --git a/client/src/com/vaadin/client/ui/link/LinkConnector.java b/client/src/main/java/com/vaadin/client/ui/link/LinkConnector.java
index 1e77fb51b4..1e77fb51b4 100644
--- a/client/src/com/vaadin/client/ui/link/LinkConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/link/LinkConnector.java
diff --git a/client/src/com/vaadin/client/ui/listselect/ListSelectConnector.java b/client/src/main/java/com/vaadin/client/ui/listselect/ListSelectConnector.java
index b867a3358c..b867a3358c 100644
--- a/client/src/com/vaadin/client/ui/listselect/ListSelectConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/listselect/ListSelectConnector.java
diff --git a/client/src/com/vaadin/client/ui/menubar/MenuBar.java b/client/src/main/java/com/vaadin/client/ui/menubar/MenuBar.java
index 833fb5a38a..833fb5a38a 100644
--- a/client/src/com/vaadin/client/ui/menubar/MenuBar.java
+++ b/client/src/main/java/com/vaadin/client/ui/menubar/MenuBar.java
diff --git a/client/src/com/vaadin/client/ui/menubar/MenuBarConnector.java b/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java
index 03eeb85165..03eeb85165 100644
--- a/client/src/com/vaadin/client/ui/menubar/MenuBarConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/menubar/MenuBarConnector.java
diff --git a/client/src/com/vaadin/client/ui/menubar/MenuItem.java b/client/src/main/java/com/vaadin/client/ui/menubar/MenuItem.java
index bf2fbf8feb..bf2fbf8feb 100644
--- a/client/src/com/vaadin/client/ui/menubar/MenuItem.java
+++ b/client/src/main/java/com/vaadin/client/ui/menubar/MenuItem.java
diff --git a/client/src/com/vaadin/client/ui/nativebutton/NativeButtonConnector.java b/client/src/main/java/com/vaadin/client/ui/nativebutton/NativeButtonConnector.java
index 65d4a1eb9b..65d4a1eb9b 100644
--- a/client/src/com/vaadin/client/ui/nativebutton/NativeButtonConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/nativebutton/NativeButtonConnector.java
diff --git a/client/src/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java b/client/src/main/java/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java
index d6ff2015b4..d6ff2015b4 100644
--- a/client/src/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java
diff --git a/client/src/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java b/client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java
index 0757bc395b..0757bc395b 100644
--- a/client/src/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java
diff --git a/client/src/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java b/client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java
index f9bdf455f6..f9bdf455f6 100644
--- a/client/src/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java
diff --git a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
index dbd530dde1..dbd530dde1 100644
--- a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
diff --git a/client/src/com/vaadin/client/ui/orderedlayout/CaptionPosition.java b/client/src/main/java/com/vaadin/client/ui/orderedlayout/CaptionPosition.java
index 885dc1ecd7..885dc1ecd7 100644
--- a/client/src/com/vaadin/client/ui/orderedlayout/CaptionPosition.java
+++ b/client/src/main/java/com/vaadin/client/ui/orderedlayout/CaptionPosition.java
diff --git a/client/src/com/vaadin/client/ui/orderedlayout/HorizontalLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/orderedlayout/HorizontalLayoutConnector.java
index 2cd1acd78b..2cd1acd78b 100644
--- a/client/src/com/vaadin/client/ui/orderedlayout/HorizontalLayoutConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/orderedlayout/HorizontalLayoutConnector.java
diff --git a/client/src/com/vaadin/client/ui/orderedlayout/Slot.java b/client/src/main/java/com/vaadin/client/ui/orderedlayout/Slot.java
index 564c15472f..564c15472f 100644
--- a/client/src/com/vaadin/client/ui/orderedlayout/Slot.java
+++ b/client/src/main/java/com/vaadin/client/ui/orderedlayout/Slot.java
diff --git a/client/src/com/vaadin/client/ui/orderedlayout/VAbstractOrderedLayout.java b/client/src/main/java/com/vaadin/client/ui/orderedlayout/VAbstractOrderedLayout.java
index 1a36ba9c93..1a36ba9c93 100644
--- a/client/src/com/vaadin/client/ui/orderedlayout/VAbstractOrderedLayout.java
+++ b/client/src/main/java/com/vaadin/client/ui/orderedlayout/VAbstractOrderedLayout.java
diff --git a/client/src/com/vaadin/client/ui/orderedlayout/VerticalLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/orderedlayout/VerticalLayoutConnector.java
index 33ff020e89..33ff020e89 100644
--- a/client/src/com/vaadin/client/ui/orderedlayout/VerticalLayoutConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/orderedlayout/VerticalLayoutConnector.java
diff --git a/client/src/com/vaadin/client/ui/panel/PanelConnector.java b/client/src/main/java/com/vaadin/client/ui/panel/PanelConnector.java
index 11111df602..11111df602 100644
--- a/client/src/com/vaadin/client/ui/panel/PanelConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/panel/PanelConnector.java
diff --git a/client/src/com/vaadin/client/ui/passwordfield/PasswordFieldConnector.java b/client/src/main/java/com/vaadin/client/ui/passwordfield/PasswordFieldConnector.java
index 61576fac04..61576fac04 100644
--- a/client/src/com/vaadin/client/ui/passwordfield/PasswordFieldConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/passwordfield/PasswordFieldConnector.java
diff --git a/client/src/com/vaadin/client/ui/popupview/PopupViewConnector.java b/client/src/main/java/com/vaadin/client/ui/popupview/PopupViewConnector.java
index 6afceb75de..6afceb75de 100644
--- a/client/src/com/vaadin/client/ui/popupview/PopupViewConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/popupview/PopupViewConnector.java
diff --git a/client/src/com/vaadin/client/ui/popupview/VisibilityChangeEvent.java b/client/src/main/java/com/vaadin/client/ui/popupview/VisibilityChangeEvent.java
index 8db2d1cb85..8db2d1cb85 100644
--- a/client/src/com/vaadin/client/ui/popupview/VisibilityChangeEvent.java
+++ b/client/src/main/java/com/vaadin/client/ui/popupview/VisibilityChangeEvent.java
diff --git a/client/src/com/vaadin/client/ui/popupview/VisibilityChangeHandler.java b/client/src/main/java/com/vaadin/client/ui/popupview/VisibilityChangeHandler.java
index 3c5e09d1fc..3c5e09d1fc 100644
--- a/client/src/com/vaadin/client/ui/popupview/VisibilityChangeHandler.java
+++ b/client/src/main/java/com/vaadin/client/ui/popupview/VisibilityChangeHandler.java
diff --git a/client/src/com/vaadin/client/ui/progressindicator/ProgressBarConnector.java b/client/src/main/java/com/vaadin/client/ui/progressindicator/ProgressBarConnector.java
index 3a83430f7a..3a83430f7a 100644
--- a/client/src/com/vaadin/client/ui/progressindicator/ProgressBarConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/progressindicator/ProgressBarConnector.java
diff --git a/client/src/com/vaadin/client/ui/progressindicator/ProgressIndicatorConnector.java b/client/src/main/java/com/vaadin/client/ui/progressindicator/ProgressIndicatorConnector.java
index 36bb1dd6b2..36bb1dd6b2 100644
--- a/client/src/com/vaadin/client/ui/progressindicator/ProgressIndicatorConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/progressindicator/ProgressIndicatorConnector.java
diff --git a/client/src/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java b/client/src/main/java/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java
index bcf61a9338..bcf61a9338 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java
diff --git a/client/src/com/vaadin/client/ui/richtextarea/VRichTextToolbar.java b/client/src/main/java/com/vaadin/client/ui/richtextarea/VRichTextToolbar.java
index 2e0554c499..2e0554c499 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/VRichTextToolbar.java
+++ b/client/src/main/java/com/vaadin/client/ui/richtextarea/VRichTextToolbar.java
diff --git a/client/src/com/vaadin/client/ui/slider/SliderConnector.java b/client/src/main/java/com/vaadin/client/ui/slider/SliderConnector.java
index 8c3c0254d3..8c3c0254d3 100644
--- a/client/src/com/vaadin/client/ui/slider/SliderConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/slider/SliderConnector.java
diff --git a/client/src/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java b/client/src/main/java/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java
index 6bf03ad880..6bf03ad880 100644
--- a/client/src/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java
diff --git a/client/src/com/vaadin/client/ui/splitpanel/HorizontalSplitPanelConnector.java b/client/src/main/java/com/vaadin/client/ui/splitpanel/HorizontalSplitPanelConnector.java
index 75389b6cc4..75389b6cc4 100644
--- a/client/src/com/vaadin/client/ui/splitpanel/HorizontalSplitPanelConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/splitpanel/HorizontalSplitPanelConnector.java
diff --git a/client/src/com/vaadin/client/ui/splitpanel/VerticalSplitPanelConnector.java b/client/src/main/java/com/vaadin/client/ui/splitpanel/VerticalSplitPanelConnector.java
index e95f7143ba..e95f7143ba 100644
--- a/client/src/com/vaadin/client/ui/splitpanel/VerticalSplitPanelConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/splitpanel/VerticalSplitPanelConnector.java
diff --git a/client/src/com/vaadin/client/ui/table/TableConnector.java b/client/src/main/java/com/vaadin/client/ui/table/TableConnector.java
index cfe93b6641..cfe93b6641 100644
--- a/client/src/com/vaadin/client/ui/table/TableConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/table/TableConnector.java
diff --git a/client/src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java b/client/src/main/java/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java
index 9de415e74e..9de415e74e 100644
--- a/client/src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java
diff --git a/client/src/com/vaadin/client/ui/tabsheet/TabsheetConnector.java b/client/src/main/java/com/vaadin/client/ui/tabsheet/TabsheetConnector.java
index 1b043c8a51..1b043c8a51 100644
--- a/client/src/com/vaadin/client/ui/tabsheet/TabsheetConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/tabsheet/TabsheetConnector.java
diff --git a/client/src/com/vaadin/client/ui/textarea/TextAreaConnector.java b/client/src/main/java/com/vaadin/client/ui/textarea/TextAreaConnector.java
index 3bc0a86df4..3bc0a86df4 100644
--- a/client/src/com/vaadin/client/ui/textarea/TextAreaConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/textarea/TextAreaConnector.java
diff --git a/client/src/com/vaadin/client/ui/textfield/TextFieldConnector.java b/client/src/main/java/com/vaadin/client/ui/textfield/TextFieldConnector.java
index 0d85e98ee3..0d85e98ee3 100644
--- a/client/src/com/vaadin/client/ui/textfield/TextFieldConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/textfield/TextFieldConnector.java
diff --git a/client/src/com/vaadin/client/ui/tree/TreeConnector.java b/client/src/main/java/com/vaadin/client/ui/tree/TreeConnector.java
index f49f44e802..f49f44e802 100644
--- a/client/src/com/vaadin/client/ui/tree/TreeConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/tree/TreeConnector.java
diff --git a/client/src/com/vaadin/client/ui/treetable/TreeTableConnector.java b/client/src/main/java/com/vaadin/client/ui/treetable/TreeTableConnector.java
index 0e0c190c11..0e0c190c11 100644
--- a/client/src/com/vaadin/client/ui/treetable/TreeTableConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/treetable/TreeTableConnector.java
diff --git a/client/src/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java b/client/src/main/java/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java
index 0994ac15c3..0994ac15c3 100644
--- a/client/src/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java
diff --git a/client/src/com/vaadin/client/ui/ui/UIConnector.java b/client/src/main/java/com/vaadin/client/ui/ui/UIConnector.java
index 6f4872729d..6f4872729d 100644
--- a/client/src/com/vaadin/client/ui/ui/UIConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/ui/UIConnector.java
diff --git a/client/src/com/vaadin/client/ui/upload/UploadConnector.java b/client/src/main/java/com/vaadin/client/ui/upload/UploadConnector.java
index 9e25770a17..9e25770a17 100644
--- a/client/src/com/vaadin/client/ui/upload/UploadConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/upload/UploadConnector.java
diff --git a/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategy.java b/client/src/main/java/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategy.java
index 2c2e10594d..2c2e10594d 100644
--- a/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategy.java
+++ b/client/src/main/java/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategy.java
diff --git a/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategyIE.java b/client/src/main/java/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategyIE.java
index 0c114e2ee7..0c114e2ee7 100644
--- a/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategyIE.java
+++ b/client/src/main/java/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategyIE.java
diff --git a/client/src/com/vaadin/client/ui/video/VideoConnector.java b/client/src/main/java/com/vaadin/client/ui/video/VideoConnector.java
index de53368d6a..de53368d6a 100644
--- a/client/src/com/vaadin/client/ui/video/VideoConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/video/VideoConnector.java
diff --git a/client/src/com/vaadin/client/ui/window/WindowConnector.java b/client/src/main/java/com/vaadin/client/ui/window/WindowConnector.java
index 9ea3c8bb68..9ea3c8bb68 100644
--- a/client/src/com/vaadin/client/ui/window/WindowConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/window/WindowConnector.java
diff --git a/client/src/com/vaadin/client/ui/window/WindowMoveEvent.java b/client/src/main/java/com/vaadin/client/ui/window/WindowMoveEvent.java
index add7ee740f..add7ee740f 100644
--- a/client/src/com/vaadin/client/ui/window/WindowMoveEvent.java
+++ b/client/src/main/java/com/vaadin/client/ui/window/WindowMoveEvent.java
diff --git a/client/src/com/vaadin/client/ui/window/WindowMoveHandler.java b/client/src/main/java/com/vaadin/client/ui/window/WindowMoveHandler.java
index 0ac348af68..0ac348af68 100644
--- a/client/src/com/vaadin/client/ui/window/WindowMoveHandler.java
+++ b/client/src/main/java/com/vaadin/client/ui/window/WindowMoveHandler.java
diff --git a/client/src/com/vaadin/client/widget/escalator/Cell.java b/client/src/main/java/com/vaadin/client/widget/escalator/Cell.java
index 08dbcf6955..08dbcf6955 100644
--- a/client/src/com/vaadin/client/widget/escalator/Cell.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/Cell.java
diff --git a/client/src/com/vaadin/client/widget/escalator/ColumnConfiguration.java b/client/src/main/java/com/vaadin/client/widget/escalator/ColumnConfiguration.java
index 76f6a55b8a..76f6a55b8a 100644
--- a/client/src/com/vaadin/client/widget/escalator/ColumnConfiguration.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/ColumnConfiguration.java
diff --git a/client/src/com/vaadin/client/widget/escalator/EscalatorUpdater.java b/client/src/main/java/com/vaadin/client/widget/escalator/EscalatorUpdater.java
index 54507a7650..54507a7650 100644
--- a/client/src/com/vaadin/client/widget/escalator/EscalatorUpdater.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/EscalatorUpdater.java
diff --git a/client/src/com/vaadin/client/widget/escalator/FlyweightCell.java b/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightCell.java
index b77b752327..b77b752327 100644
--- a/client/src/com/vaadin/client/widget/escalator/FlyweightCell.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightCell.java
diff --git a/client/src/com/vaadin/client/widget/escalator/FlyweightRow.java b/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightRow.java
index 8628adb05f..8628adb05f 100644
--- a/client/src/com/vaadin/client/widget/escalator/FlyweightRow.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightRow.java
diff --git a/client/src/com/vaadin/client/widget/escalator/PositionFunction.java b/client/src/main/java/com/vaadin/client/widget/escalator/PositionFunction.java
index 929f27df37..929f27df37 100644
--- a/client/src/com/vaadin/client/widget/escalator/PositionFunction.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/PositionFunction.java
diff --git a/client/src/com/vaadin/client/widget/escalator/Row.java b/client/src/main/java/com/vaadin/client/widget/escalator/Row.java
index fa89853120..fa89853120 100644
--- a/client/src/com/vaadin/client/widget/escalator/Row.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/Row.java
diff --git a/client/src/com/vaadin/client/widget/escalator/RowContainer.java b/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java
index abab25046c..abab25046c 100644
--- a/client/src/com/vaadin/client/widget/escalator/RowContainer.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java
diff --git a/client/src/com/vaadin/client/widget/escalator/RowVisibilityChangeEvent.java b/client/src/main/java/com/vaadin/client/widget/escalator/RowVisibilityChangeEvent.java
index 5f1531e378..5f1531e378 100644
--- a/client/src/com/vaadin/client/widget/escalator/RowVisibilityChangeEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/RowVisibilityChangeEvent.java
diff --git a/client/src/com/vaadin/client/widget/escalator/RowVisibilityChangeHandler.java b/client/src/main/java/com/vaadin/client/widget/escalator/RowVisibilityChangeHandler.java
index 80a30184c0..80a30184c0 100644
--- a/client/src/com/vaadin/client/widget/escalator/RowVisibilityChangeHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/RowVisibilityChangeHandler.java
diff --git a/client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java b/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java
index 151deb87d1..151deb87d1 100644
--- a/client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java
diff --git a/client/src/com/vaadin/client/widget/escalator/Spacer.java b/client/src/main/java/com/vaadin/client/widget/escalator/Spacer.java
index 789a64a21e..789a64a21e 100644
--- a/client/src/com/vaadin/client/widget/escalator/Spacer.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/Spacer.java
diff --git a/client/src/com/vaadin/client/widget/escalator/SpacerUpdater.java b/client/src/main/java/com/vaadin/client/widget/escalator/SpacerUpdater.java
index 49adefd536..49adefd536 100644
--- a/client/src/com/vaadin/client/widget/escalator/SpacerUpdater.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/SpacerUpdater.java
diff --git a/client/src/com/vaadin/client/widget/grid/AutoScroller.java b/client/src/main/java/com/vaadin/client/widget/grid/AutoScroller.java
index 9cc238ac15..9cc238ac15 100644
--- a/client/src/com/vaadin/client/widget/grid/AutoScroller.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/AutoScroller.java
diff --git a/client/src/com/vaadin/client/widget/grid/CellReference.java b/client/src/main/java/com/vaadin/client/widget/grid/CellReference.java
index e783cb92ae..e783cb92ae 100644
--- a/client/src/com/vaadin/client/widget/grid/CellReference.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/CellReference.java
diff --git a/client/src/com/vaadin/client/widget/grid/CellStyleGenerator.java b/client/src/main/java/com/vaadin/client/widget/grid/CellStyleGenerator.java
index bbc540de64..bbc540de64 100644
--- a/client/src/com/vaadin/client/widget/grid/CellStyleGenerator.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/CellStyleGenerator.java
diff --git a/client/src/com/vaadin/client/widget/grid/DataAvailableEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/DataAvailableEvent.java
index d88fce4e11..d88fce4e11 100644
--- a/client/src/com/vaadin/client/widget/grid/DataAvailableEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/DataAvailableEvent.java
diff --git a/client/src/com/vaadin/client/widget/grid/DataAvailableHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/DataAvailableHandler.java
index 5e0650bc41..5e0650bc41 100644
--- a/client/src/com/vaadin/client/widget/grid/DataAvailableHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/DataAvailableHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/DefaultEditorEventHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/DefaultEditorEventHandler.java
index e4a8783f54..e4a8783f54 100644
--- a/client/src/com/vaadin/client/widget/grid/DefaultEditorEventHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/DefaultEditorEventHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/DetailsGenerator.java b/client/src/main/java/com/vaadin/client/widget/grid/DetailsGenerator.java
index b9427091a7..b9427091a7 100644
--- a/client/src/com/vaadin/client/widget/grid/DetailsGenerator.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/DetailsGenerator.java
diff --git a/client/src/com/vaadin/client/widget/grid/EditorHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/EditorHandler.java
index 91198700ca..91198700ca 100644
--- a/client/src/com/vaadin/client/widget/grid/EditorHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/EditorHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/EventCellReference.java b/client/src/main/java/com/vaadin/client/widget/grid/EventCellReference.java
index 4d37be2cc1..4d37be2cc1 100644
--- a/client/src/com/vaadin/client/widget/grid/EventCellReference.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/EventCellReference.java
diff --git a/client/src/com/vaadin/client/widget/grid/HeightAwareDetailsGenerator.java b/client/src/main/java/com/vaadin/client/widget/grid/HeightAwareDetailsGenerator.java
index 5364de3411..5364de3411 100644
--- a/client/src/com/vaadin/client/widget/grid/HeightAwareDetailsGenerator.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/HeightAwareDetailsGenerator.java
diff --git a/client/src/com/vaadin/client/widget/grid/RendererCellReference.java b/client/src/main/java/com/vaadin/client/widget/grid/RendererCellReference.java
index 994db50aa0..994db50aa0 100644
--- a/client/src/com/vaadin/client/widget/grid/RendererCellReference.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/RendererCellReference.java
diff --git a/client/src/com/vaadin/client/widget/grid/RowReference.java b/client/src/main/java/com/vaadin/client/widget/grid/RowReference.java
index 8874fcc5cc..8874fcc5cc 100644
--- a/client/src/com/vaadin/client/widget/grid/RowReference.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/RowReference.java
diff --git a/client/src/com/vaadin/client/widget/grid/RowStyleGenerator.java b/client/src/main/java/com/vaadin/client/widget/grid/RowStyleGenerator.java
index a12a9ff47d..a12a9ff47d 100644
--- a/client/src/com/vaadin/client/widget/grid/RowStyleGenerator.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/RowStyleGenerator.java
diff --git a/client/src/com/vaadin/client/widget/grid/datasources/ListDataSource.java b/client/src/main/java/com/vaadin/client/widget/grid/datasources/ListDataSource.java
index cf7ec53e68..cf7ec53e68 100644
--- a/client/src/com/vaadin/client/widget/grid/datasources/ListDataSource.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/datasources/ListDataSource.java
diff --git a/client/src/com/vaadin/client/widget/grid/datasources/ListSorter.java b/client/src/main/java/com/vaadin/client/widget/grid/datasources/ListSorter.java
index 69bea629b0..69bea629b0 100644
--- a/client/src/com/vaadin/client/widget/grid/datasources/ListSorter.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/datasources/ListSorter.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/AbstractGridKeyEventHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/AbstractGridKeyEventHandler.java
index 120c32d380..120c32d380 100644
--- a/client/src/com/vaadin/client/widget/grid/events/AbstractGridKeyEventHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/AbstractGridKeyEventHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/AbstractGridMouseEventHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/AbstractGridMouseEventHandler.java
index 15e22a6d57..15e22a6d57 100644
--- a/client/src/com/vaadin/client/widget/grid/events/AbstractGridMouseEventHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/AbstractGridMouseEventHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/BodyClickHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/BodyClickHandler.java
index a66e170524..a66e170524 100644
--- a/client/src/com/vaadin/client/widget/grid/events/BodyClickHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/BodyClickHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/BodyDoubleClickHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/BodyDoubleClickHandler.java
index 7be29920e7..7be29920e7 100644
--- a/client/src/com/vaadin/client/widget/grid/events/BodyDoubleClickHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/BodyDoubleClickHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/BodyKeyDownHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/BodyKeyDownHandler.java
index ff1ae82d2e..ff1ae82d2e 100644
--- a/client/src/com/vaadin/client/widget/grid/events/BodyKeyDownHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/BodyKeyDownHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/BodyKeyPressHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/BodyKeyPressHandler.java
index 245250d4c0..245250d4c0 100644
--- a/client/src/com/vaadin/client/widget/grid/events/BodyKeyPressHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/BodyKeyPressHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/BodyKeyUpHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/BodyKeyUpHandler.java
index 2c0951ea40..2c0951ea40 100644
--- a/client/src/com/vaadin/client/widget/grid/events/BodyKeyUpHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/BodyKeyUpHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/ColumnReorderEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnReorderEvent.java
index 1712871089..1712871089 100644
--- a/client/src/com/vaadin/client/widget/grid/events/ColumnReorderEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnReorderEvent.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/ColumnReorderHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnReorderHandler.java
index 29c476058e..29c476058e 100644
--- a/client/src/com/vaadin/client/widget/grid/events/ColumnReorderHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnReorderHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/ColumnResizeEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnResizeEvent.java
index f5c8c0fa83..f5c8c0fa83 100644
--- a/client/src/com/vaadin/client/widget/grid/events/ColumnResizeEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnResizeEvent.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/ColumnResizeHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnResizeHandler.java
index a66dbf7bd2..a66dbf7bd2 100644
--- a/client/src/com/vaadin/client/widget/grid/events/ColumnResizeHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnResizeHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeEvent.java
index 63b788bcf2..63b788bcf2 100644
--- a/client/src/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeEvent.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeHandler.java
index 542fe4e3c1..542fe4e3c1 100644
--- a/client/src/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/ColumnVisibilityChangeHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/FooterClickHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/FooterClickHandler.java
index 51fa38c948..51fa38c948 100644
--- a/client/src/com/vaadin/client/widget/grid/events/FooterClickHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/FooterClickHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/FooterDoubleClickHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/FooterDoubleClickHandler.java
index 2f5ba21787..2f5ba21787 100644
--- a/client/src/com/vaadin/client/widget/grid/events/FooterDoubleClickHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/FooterDoubleClickHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/FooterKeyDownHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/FooterKeyDownHandler.java
index 85f83970f2..85f83970f2 100644
--- a/client/src/com/vaadin/client/widget/grid/events/FooterKeyDownHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/FooterKeyDownHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/FooterKeyPressHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/FooterKeyPressHandler.java
index 09778f6873..09778f6873 100644
--- a/client/src/com/vaadin/client/widget/grid/events/FooterKeyPressHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/FooterKeyPressHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/FooterKeyUpHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/FooterKeyUpHandler.java
index 688f89880f..688f89880f 100644
--- a/client/src/com/vaadin/client/widget/grid/events/FooterKeyUpHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/FooterKeyUpHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/GridClickEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/GridClickEvent.java
index 33a4c923b7..33a4c923b7 100644
--- a/client/src/com/vaadin/client/widget/grid/events/GridClickEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/GridClickEvent.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/GridDoubleClickEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/GridDoubleClickEvent.java
index 64a1a88b42..64a1a88b42 100644
--- a/client/src/com/vaadin/client/widget/grid/events/GridDoubleClickEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/GridDoubleClickEvent.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/GridKeyDownEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/GridKeyDownEvent.java
index 9849137982..9849137982 100644
--- a/client/src/com/vaadin/client/widget/grid/events/GridKeyDownEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/GridKeyDownEvent.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/GridKeyPressEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/GridKeyPressEvent.java
index 35a3af0c2e..35a3af0c2e 100644
--- a/client/src/com/vaadin/client/widget/grid/events/GridKeyPressEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/GridKeyPressEvent.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/GridKeyUpEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/GridKeyUpEvent.java
index d273835233..d273835233 100644
--- a/client/src/com/vaadin/client/widget/grid/events/GridKeyUpEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/GridKeyUpEvent.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/HeaderClickHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/HeaderClickHandler.java
index da20e80905..da20e80905 100644
--- a/client/src/com/vaadin/client/widget/grid/events/HeaderClickHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/HeaderClickHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/HeaderDoubleClickHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/HeaderDoubleClickHandler.java
index 16a4cfe1f5..16a4cfe1f5 100644
--- a/client/src/com/vaadin/client/widget/grid/events/HeaderDoubleClickHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/HeaderDoubleClickHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/HeaderKeyDownHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/HeaderKeyDownHandler.java
index 555eb936af..555eb936af 100644
--- a/client/src/com/vaadin/client/widget/grid/events/HeaderKeyDownHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/HeaderKeyDownHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/HeaderKeyPressHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/HeaderKeyPressHandler.java
index c4dd312f93..c4dd312f93 100644
--- a/client/src/com/vaadin/client/widget/grid/events/HeaderKeyPressHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/HeaderKeyPressHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/HeaderKeyUpHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/HeaderKeyUpHandler.java
index 4dbe1c681e..4dbe1c681e 100644
--- a/client/src/com/vaadin/client/widget/grid/events/HeaderKeyUpHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/HeaderKeyUpHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/ScrollEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/ScrollEvent.java
index 08e1e07eab..08e1e07eab 100644
--- a/client/src/com/vaadin/client/widget/grid/events/ScrollEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/ScrollEvent.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/ScrollHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/ScrollHandler.java
index 1ce901e707..1ce901e707 100644
--- a/client/src/com/vaadin/client/widget/grid/events/ScrollHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/ScrollHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/SelectAllEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/events/SelectAllEvent.java
index 43c2055e95..43c2055e95 100644
--- a/client/src/com/vaadin/client/widget/grid/events/SelectAllEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/SelectAllEvent.java
diff --git a/client/src/com/vaadin/client/widget/grid/events/SelectAllHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/events/SelectAllHandler.java
index 2cdee8d1b3..2cdee8d1b3 100644
--- a/client/src/com/vaadin/client/widget/grid/events/SelectAllHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/events/SelectAllHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/selection/AbstractRowHandleSelectionModel.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/AbstractRowHandleSelectionModel.java
index 6b7bbb6294..6b7bbb6294 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/AbstractRowHandleSelectionModel.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/AbstractRowHandleSelectionModel.java
diff --git a/client/src/com/vaadin/client/widget/grid/selection/ClickSelectHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/ClickSelectHandler.java
index c6bc52dd1c..c6bc52dd1c 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/ClickSelectHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/ClickSelectHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/selection/HasSelectionHandlers.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/HasSelectionHandlers.java
index ffcad4c903..ffcad4c903 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/HasSelectionHandlers.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/HasSelectionHandlers.java
diff --git a/client/src/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java
index c64908f24c..c64908f24c 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java
diff --git a/client/src/com/vaadin/client/widget/grid/selection/SelectionEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionEvent.java
index 528beb5809..528beb5809 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/SelectionEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionEvent.java
diff --git a/client/src/com/vaadin/client/widget/grid/selection/SelectionHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionHandler.java
index 4f939fa798..4f939fa798 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/SelectionHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/selection/SelectionModel.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModel.java
index ec36ab52e8..ec36ab52e8 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/SelectionModel.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModel.java
diff --git a/client/src/com/vaadin/client/widget/grid/selection/SelectionModelMulti.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModelMulti.java
index d654a28b7d..d654a28b7d 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/SelectionModelMulti.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModelMulti.java
diff --git a/client/src/com/vaadin/client/widget/grid/selection/SelectionModelNone.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModelNone.java
index 4a8b203a94..4a8b203a94 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/SelectionModelNone.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModelNone.java
diff --git a/client/src/com/vaadin/client/widget/grid/selection/SelectionModelSingle.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModelSingle.java
index 38605db12c..38605db12c 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/SelectionModelSingle.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/SelectionModelSingle.java
diff --git a/client/src/com/vaadin/client/widget/grid/selection/SpaceSelectHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/selection/SpaceSelectHandler.java
index 3e04a6dfac..3e04a6dfac 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/SpaceSelectHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/selection/SpaceSelectHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/sort/Sort.java b/client/src/main/java/com/vaadin/client/widget/grid/sort/Sort.java
index b1f3c6e39a..b1f3c6e39a 100644
--- a/client/src/com/vaadin/client/widget/grid/sort/Sort.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/sort/Sort.java
diff --git a/client/src/com/vaadin/client/widget/grid/sort/SortEvent.java b/client/src/main/java/com/vaadin/client/widget/grid/sort/SortEvent.java
index 2aad6e4f95..2aad6e4f95 100644
--- a/client/src/com/vaadin/client/widget/grid/sort/SortEvent.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/sort/SortEvent.java
diff --git a/client/src/com/vaadin/client/widget/grid/sort/SortHandler.java b/client/src/main/java/com/vaadin/client/widget/grid/sort/SortHandler.java
index 330cbe9d58..330cbe9d58 100644
--- a/client/src/com/vaadin/client/widget/grid/sort/SortHandler.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/sort/SortHandler.java
diff --git a/client/src/com/vaadin/client/widget/grid/sort/SortOrder.java b/client/src/main/java/com/vaadin/client/widget/grid/sort/SortOrder.java
index 8166f1e6ed..8166f1e6ed 100644
--- a/client/src/com/vaadin/client/widget/grid/sort/SortOrder.java
+++ b/client/src/main/java/com/vaadin/client/widget/grid/sort/SortOrder.java
diff --git a/client/src/com/vaadin/client/widgets/Escalator.java b/client/src/main/java/com/vaadin/client/widgets/Escalator.java
index 29b7eb6d53..29b7eb6d53 100644
--- a/client/src/com/vaadin/client/widgets/Escalator.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Escalator.java
diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java
index cf9456d8a8..cf9456d8a8 100644
--- a/client/src/com/vaadin/client/widgets/Grid.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java
diff --git a/client/src/com/vaadin/client/widgets/Overlay.java b/client/src/main/java/com/vaadin/client/widgets/Overlay.java
index a5e29c6774..a5e29c6774 100644
--- a/client/src/com/vaadin/client/widgets/Overlay.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Overlay.java
diff --git a/client/src/com/vaadin/DefaultWidgetSet.gwt.xml b/client/src/main/resources/com/vaadin/DefaultWidgetSet.gwt.xml
index ad345e44e2..ad345e44e2 100755
--- a/client/src/com/vaadin/DefaultWidgetSet.gwt.xml
+++ b/client/src/main/resources/com/vaadin/DefaultWidgetSet.gwt.xml
diff --git a/client/src/com/vaadin/Vaadin.gwt.xml b/client/src/main/resources/com/vaadin/Vaadin.gwt.xml
index 35b225560e..35b225560e 100644
--- a/client/src/com/vaadin/Vaadin.gwt.xml
+++ b/client/src/main/resources/com/vaadin/Vaadin.gwt.xml
diff --git a/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml b/client/src/main/resources/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml
index ceedde50a6..ceedde50a6 100644
--- a/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml
+++ b/client/src/main/resources/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml
diff --git a/client/src/com/vaadin/client/debug/internal/theme/debugwindow.css b/client/src/main/resources/com/vaadin/client/debug/internal/theme/debugwindow.css
index 78e537140e..78e537140e 100644
--- a/client/src/com/vaadin/client/debug/internal/theme/debugwindow.css
+++ b/client/src/main/resources/com/vaadin/client/debug/internal/theme/debugwindow.css
diff --git a/client/src/com/vaadin/client/debug/internal/theme/font.eot b/client/src/main/resources/com/vaadin/client/debug/internal/theme/font.eot
index 0244d9afcc..0244d9afcc 100755
--- a/client/src/com/vaadin/client/debug/internal/theme/font.eot
+++ b/client/src/main/resources/com/vaadin/client/debug/internal/theme/font.eot
diff --git a/client/src/com/vaadin/client/debug/internal/theme/font.svg b/client/src/main/resources/com/vaadin/client/debug/internal/theme/font.svg
index 313645c78f..313645c78f 100755
--- a/client/src/com/vaadin/client/debug/internal/theme/font.svg
+++ b/client/src/main/resources/com/vaadin/client/debug/internal/theme/font.svg
diff --git a/client/src/com/vaadin/client/debug/internal/theme/font.ttf b/client/src/main/resources/com/vaadin/client/debug/internal/theme/font.ttf
index 56ed0cfbff..56ed0cfbff 100755
--- a/client/src/com/vaadin/client/debug/internal/theme/font.ttf
+++ b/client/src/main/resources/com/vaadin/client/debug/internal/theme/font.ttf
diff --git a/client/src/com/vaadin/client/debug/internal/theme/font.woff b/client/src/main/resources/com/vaadin/client/debug/internal/theme/font.woff
index 9f5ed668ec..9f5ed668ec 100755
--- a/client/src/com/vaadin/client/debug/internal/theme/font.woff
+++ b/client/src/main/resources/com/vaadin/client/debug/internal/theme/font.woff
diff --git a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_alignment.png b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_alignment.png
index 49b918ec0c..49b918ec0c 100644
--- a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_alignment.png
+++ b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_alignment.png
diff --git a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_component_handles_the_caption.png b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_component_handles_the_caption.png
index 9fd6635765..9fd6635765 100644
--- a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_component_handles_the_caption.png
+++ b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_component_handles_the_caption.png
diff --git a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_h150.png b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_h150.png
index 7cd07369dc..7cd07369dc 100644
--- a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_h150.png
+++ b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_h150.png
diff --git a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_horizontal.png b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_horizontal.png
index c2e1f49efe..c2e1f49efe 100644
--- a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_horizontal.png
+++ b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_horizontal.png
diff --git a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_horizontal_spacing.png b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_horizontal_spacing.png
index 417c9aecfd..417c9aecfd 100644
--- a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_horizontal_spacing.png
+++ b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_horizontal_spacing.png
diff --git a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_margin.png b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_margin.png
index 2f1e461b0a..2f1e461b0a 100644
--- a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_margin.png
+++ b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_margin.png
diff --git a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_no_caption.png b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_no_caption.png
index 63984cdee7..63984cdee7 100644
--- a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_no_caption.png
+++ b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_no_caption.png
diff --git a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_normal_caption.png b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_normal_caption.png
index 1e730c072b..1e730c072b 100644
--- a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_normal_caption.png
+++ b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_normal_caption.png
diff --git a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_special-margin.png b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_special-margin.png
index 34e47d1551..34e47d1551 100644
--- a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_special-margin.png
+++ b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_special-margin.png
diff --git a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_vertical.png b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_vertical.png
index 99e3709acc..99e3709acc 100644
--- a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_vertical.png
+++ b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_vertical.png
diff --git a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_vertical_spacing.png b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_vertical_spacing.png
index be9a4cd8c5..be9a4cd8c5 100644
--- a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_vertical_spacing.png
+++ b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_vertical_spacing.png
diff --git a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_w300.png b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_w300.png
index 0b555ad1e7..0b555ad1e7 100644
--- a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_w300.png
+++ b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_w300.png
diff --git a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_w300_h150.png b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_w300_h150.png
index 8ff42ed0f4..8ff42ed0f4 100644
--- a/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_w300_h150.png
+++ b/client/src/main/resources/com/vaadin/client/ui/doc-files/IOrderedLayout_w300_h150.png
diff --git a/client/src/com/vaadin/client/ui/richtextarea/VRichTextToolbar$Strings.properties b/client/src/main/resources/com/vaadin/client/ui/richtextarea/VRichTextToolbar$Strings.properties
index 363b704584..363b704584 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/VRichTextToolbar$Strings.properties
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/VRichTextToolbar$Strings.properties
diff --git a/client/src/com/vaadin/client/ui/richtextarea/backColors.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/backColors.gif
index ddfc1cea2c..ddfc1cea2c 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/backColors.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/backColors.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/bold.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/bold.gif
index 7c22eaac68..7c22eaac68 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/bold.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/bold.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/createLink.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/createLink.gif
index 1a1412fe0e..1a1412fe0e 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/createLink.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/createLink.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/fontSizes.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/fontSizes.gif
index c2f4c8cb21..c2f4c8cb21 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/fontSizes.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/fontSizes.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/fonts.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/fonts.gif
index 1629cabb78..1629cabb78 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/fonts.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/fonts.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/foreColors.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/foreColors.gif
index 2bb89ef189..2bb89ef189 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/foreColors.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/foreColors.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/gwtLogo.png b/client/src/main/resources/com/vaadin/client/ui/richtextarea/gwtLogo.png
index 80728186d8..80728186d8 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/gwtLogo.png
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/gwtLogo.png
diff --git a/client/src/com/vaadin/client/ui/richtextarea/hr.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/hr.gif
index d507082cf1..d507082cf1 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/hr.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/hr.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/indent.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/indent.gif
index 905421ed76..905421ed76 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/indent.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/indent.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/insertImage.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/insertImage.gif
index 394ec432a5..394ec432a5 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/insertImage.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/insertImage.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/italic.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/italic.gif
index ffe0e97284..ffe0e97284 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/italic.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/italic.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/justifyCenter.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/justifyCenter.gif
index f7d4c4693d..f7d4c4693d 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/justifyCenter.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/justifyCenter.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/justifyLeft.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/justifyLeft.gif
index bc37a3ed5a..bc37a3ed5a 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/justifyLeft.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/justifyLeft.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/justifyRight.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/justifyRight.gif
index 892d569384..892d569384 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/justifyRight.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/justifyRight.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/ol.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/ol.gif
index 54f8e4f551..54f8e4f551 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/ol.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/ol.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/outdent.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/outdent.gif
index 78fd1b5722..78fd1b5722 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/outdent.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/outdent.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/removeFormat.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/removeFormat.gif
index cf92c9774f..cf92c9774f 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/removeFormat.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/removeFormat.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/removeLink.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/removeLink.gif
index 40721a7bca..40721a7bca 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/removeLink.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/removeLink.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/strikeThrough.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/strikeThrough.gif
index a7a233c023..a7a233c023 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/strikeThrough.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/strikeThrough.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/subscript.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/subscript.gif
index 58b6fbb816..58b6fbb816 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/subscript.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/subscript.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/superscript.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/superscript.gif
index a6270f6e21..a6270f6e21 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/superscript.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/superscript.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/ul.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/ul.gif
index 83f1562bcb..83f1562bcb 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/ul.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/ul.gif
diff --git a/client/src/com/vaadin/client/ui/richtextarea/underline.gif b/client/src/main/resources/com/vaadin/client/ui/richtextarea/underline.gif
index 06f0200fdd..06f0200fdd 100644
--- a/client/src/com/vaadin/client/ui/richtextarea/underline.gif
+++ b/client/src/main/resources/com/vaadin/client/ui/richtextarea/underline.gif
diff --git a/client/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml b/client/src/main/resources/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
index f3cc2bca1c..f3cc2bca1c 100644
--- a/client/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
+++ b/client/src/main/resources/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
diff --git a/client/tests/src/com/vaadin/client/ApplicationConnectionURLGenerationTest.java b/client/src/test/java/com/vaadin/client/ApplicationConnectionURLGenerationTest.java
index 4dd2ddbaa4..4dd2ddbaa4 100644
--- a/client/tests/src/com/vaadin/client/ApplicationConnectionURLGenerationTest.java
+++ b/client/src/test/java/com/vaadin/client/ApplicationConnectionURLGenerationTest.java
diff --git a/client/tests/src/com/vaadin/client/DateTimeServiceTest.java b/client/src/test/java/com/vaadin/client/DateTimeServiceTest.java
index f9351d1cc0..e5e6cbd7db 100755
--- a/client/tests/src/com/vaadin/client/DateTimeServiceTest.java
+++ b/client/src/test/java/com/vaadin/client/DateTimeServiceTest.java
@@ -5,9 +5,10 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class DateTimeServiceTest extends TestCase {
+public class DateTimeServiceTest {
 
     final long MILLISECONDS_PER_DAY = 24 * 3600 * 1000;
 
@@ -66,6 +67,7 @@ public class DateTimeServiceTest extends TestCase {
      * calculates the ISO week number like we do.
      * 
      */
+    @Test
     public void testISOWeekNumbers() {
         Calendar c = Calendar.getInstance();
         c.set(1990, 1, 1);
@@ -75,7 +77,7 @@ public class DateTimeServiceTest extends TestCase {
             Date d = new Date(start + i * MILLISECONDS_PER_DAY);
             int expected = getCalendarISOWeekNr(d);
             int calculated = DateTimeService.getISOWeekNumber(d);
-            assertEquals(d + " should be week " + expected, expected,
+            Assert.assertEquals(d + " should be week " + expected, expected,
                     calculated);
 
         }
@@ -86,15 +88,16 @@ public class DateTimeServiceTest extends TestCase {
      * {@link Calendar}).
      * 
      */
+    @Test
     public void testSampleISOWeekNumbers() {
         for (Date d : isoWeekNumbers.keySet()) {
             // System.out.println("Sample: " + d);
             int expected = isoWeekNumbers.get(d);
             int calculated = DateTimeService.getISOWeekNumber(d);
-            assertEquals(d + " should be week " + expected
+            Assert.assertEquals(d + " should be week " + expected
                     + " (Java Calendar is wrong?)", expected,
                     getCalendarISOWeekNr(d));
-            assertEquals(d + " should be week " + expected, expected,
+            Assert.assertEquals(d + " should be week " + expected, expected,
                     calculated);
 
         }
diff --git a/client/tests/src/com/vaadin/client/LocatorUtilTest.java b/client/src/test/java/com/vaadin/client/LocatorUtilTest.java
index 15536ac6fc..971688e1c5 100644
--- a/client/tests/src/com/vaadin/client/LocatorUtilTest.java
+++ b/client/src/test/java/com/vaadin/client/LocatorUtilTest.java
@@ -15,56 +15,63 @@
  */
 package com.vaadin.client;
 
-import junit.framework.TestCase;
-
 import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.client.componentlocator.LocatorUtil;
 
 /*
  * Test LocatorUtil.isUIElement() & isNotificaitonElement methods
  */
-public class LocatorUtilTest extends TestCase {
+public class LocatorUtilTest {
 
+    @Test
     public void testIsUI1() {
         boolean isUI = LocatorUtil.isUIElement("com.vaadin.ui.UI");
         Assert.assertTrue(isUI);
     }
 
+    @Test
     public void testIsUI2() {
         boolean isUI = LocatorUtil.isUIElement("/com.vaadin.ui.UI");
         Assert.assertTrue(isUI);
     }
 
+    @Test
     public void testIsUI3() {
         boolean isUI = LocatorUtil
                 .isUIElement("//com.vaadin.ui.UI[RandomString");
         Assert.assertTrue(isUI);
     }
 
+    @Test
     public void testIsUI4() {
         boolean isUI = LocatorUtil.isUIElement("//com.vaadin.ui.UI[0]");
         Assert.assertTrue(isUI);
     }
 
+    @Test
     public void testIsNotification1() {
         boolean isUI = LocatorUtil
                 .isNotificationElement("com.vaadin.ui.VNotification");
         Assert.assertTrue(isUI);
     }
 
+    @Test
     public void testIsNotification2() {
         boolean isUI = LocatorUtil
                 .isNotificationElement("com.vaadin.ui.Notification");
         Assert.assertTrue(isUI);
     }
 
+    @Test
     public void testIsNotification3() {
         boolean isUI = LocatorUtil
                 .isNotificationElement("/com.vaadin.ui.VNotification[");
         Assert.assertTrue(isUI);
     }
 
+    @Test
     public void testIsNotification4() {
         boolean isUI = LocatorUtil
                 .isNotificationElement("//com.vaadin.ui.VNotification[0]");
diff --git a/client/tests/src/com/vaadin/client/VBrowserDetailsUserAgentParserTest.java b/client/src/test/java/com/vaadin/client/VBrowserDetailsUserAgentParserTest.java
index 24bf9b6558..5522b8e2bc 100644
--- a/client/tests/src/com/vaadin/client/VBrowserDetailsUserAgentParserTest.java
+++ b/client/src/test/java/com/vaadin/client/VBrowserDetailsUserAgentParserTest.java
@@ -1,12 +1,15 @@
 package com.vaadin.client;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.shared.VBrowserDetails;
 
-public class VBrowserDetailsUserAgentParserTest extends TestCase {
+public class VBrowserDetailsUserAgentParserTest {
 
     private static final String FIREFOX30_WINDOWS = "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-GB; rv:1.9.0.6) Gecko/2009011913 Firefox/3.0.6";
     private static final String FIREFOX30_LINUX = "Mozilla/5.0 (X11; U; Linux x86_64; es-ES; rv:1.9.0.12) Gecko/2009070811 Ubuntu/9.04 (jaunty) Firefox/3.0.12";
@@ -58,6 +61,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
 
     private static final String EDGE_WINDOWS_10 = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.10240";
 
+    @Test
     public void testSafari3() {
         VBrowserDetails bd = new VBrowserDetails(SAFARI3_WINDOWS);
         assertWebKit(bd);
@@ -68,6 +72,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertWindows(bd);
     }
 
+    @Test
     public void testSafari4() {
         VBrowserDetails bd = new VBrowserDetails(SAFARI4_MAC);
         assertWebKit(bd);
@@ -78,6 +83,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertMacOSX(bd);
     }
 
+    @Test
     public void testIPhoneIOS6Homescreen() {
         VBrowserDetails bd = new VBrowserDetails(
                 IPHONE_IOS_6_1_HOMESCREEN_SIMULATOR);
@@ -91,6 +97,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertIPhone(bd);
     }
 
+    @Test
     public void testIPhoneIOS5() {
         VBrowserDetails bd = new VBrowserDetails(IPHONE_IOS_5_1);
         assertWebKit(bd);
@@ -102,6 +109,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertIPhone(bd);
     }
 
+    @Test
     public void testIPhoneIOS4() {
         VBrowserDetails bd = new VBrowserDetails(IPHONE_IOS_4_0);
         assertWebKit(bd);
@@ -113,6 +121,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertIPhone(bd);
     }
 
+    @Test
     public void testIPadIOS4() {
         VBrowserDetails bd = new VBrowserDetails(IPAD_IOS_4_3_1);
         assertWebKit(bd);
@@ -124,6 +133,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertIPad(bd);
     }
 
+    @Test
     public void testAndroid21() {
         VBrowserDetails bd = new VBrowserDetails(ANDROID_HTC_2_1);
         assertWebKit(bd);
@@ -135,6 +145,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
 
     }
 
+    @Test
     public void testAndroid22() {
         VBrowserDetails bd = new VBrowserDetails(ANDROID_GOOGLE_NEXUS_2_2);
         assertWebKit(bd);
@@ -145,6 +156,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertAndroid(bd, 2, 2);
     }
 
+    @Test
     public void testAndroid30() {
         VBrowserDetails bd = new VBrowserDetails(ANDROID_MOTOROLA_3_0);
         assertWebKit(bd);
@@ -155,6 +167,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertAndroid(bd, 3, 0);
     }
 
+    @Test
     public void testAndroid40Chrome() {
         VBrowserDetails bd = new VBrowserDetails(
                 ANDROID_GALAXY_NEXUS_4_0_4_CHROME);
@@ -174,6 +187,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertEquals(i, bd.getOperatingSystemMinorVersion());
     }
 
+    @Test
     public void testChrome3() {
         VBrowserDetails bd = new VBrowserDetails(CHROME3_MAC);
         assertWebKit(bd);
@@ -184,6 +198,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertMacOSX(bd);
     }
 
+    @Test
     public void testChrome4() {
         VBrowserDetails bd = new VBrowserDetails(CHROME4_WINDOWS);
         assertWebKit(bd);
@@ -194,6 +209,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertWindows(bd);
     }
 
+    @Test
     public void testFirefox3() {
         VBrowserDetails bd = new VBrowserDetails(FIREFOX30_WINDOWS);
         assertGecko(bd);
@@ -212,6 +228,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertLinux(bd);
     }
 
+    @Test
     public void testFirefox33Android() {
         VBrowserDetails bd = new VBrowserDetails(FIREFOX33_ANDROID);
         assertGecko(bd);
@@ -221,6 +238,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertAndroid(bd, -1, -1);
     }
 
+    @Test
     public void testFirefox35() {
         VBrowserDetails bd = new VBrowserDetails(FIREFOX35_WINDOWS);
         assertGecko(bd);
@@ -231,6 +249,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertWindows(bd);
     }
 
+    @Test
     public void testFirefox36() {
         VBrowserDetails bd = new VBrowserDetails(FIREFOX36_WINDOWS);
         assertGecko(bd);
@@ -241,6 +260,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertWindows(bd);
     }
 
+    @Test
     public void testFirefox30b5() {
         VBrowserDetails bd = new VBrowserDetails(FIREFOX_30B5_MAC);
         assertGecko(bd);
@@ -251,6 +271,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertMacOSX(bd);
     }
 
+    @Test
     public void testFirefox40b11() {
         VBrowserDetails bd = new VBrowserDetails(FIREFOX_40B11_WIN);
         assertGecko(bd);
@@ -261,6 +282,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertWindows(bd);
     }
 
+    @Test
     public void testFirefox40b7() {
         VBrowserDetails bd = new VBrowserDetails(FIREFOX_40B7_WIN);
         assertGecko(bd);
@@ -271,12 +293,14 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertWindows(bd);
     }
 
+    @Test
     public void testKonquerorLinux() {
         // Just ensure detection does not crash
         VBrowserDetails bd = new VBrowserDetails(KONQUEROR_LINUX);
         assertLinux(bd);
     }
 
+    @Test
     public void testFirefox36b() {
         VBrowserDetails bd = new VBrowserDetails(FIREFOX36B_MAC);
         assertGecko(bd);
@@ -287,6 +311,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertMacOSX(bd);
     }
 
+    @Test
     public void testOpera964() {
         VBrowserDetails bd = new VBrowserDetails(OPERA964_WINDOWS);
         assertPresto(bd);
@@ -296,6 +321,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertWindows(bd);
     }
 
+    @Test
     public void testOpera1010() {
         VBrowserDetails bd = new VBrowserDetails(OPERA1010_WINDOWS);
         assertPresto(bd);
@@ -305,6 +331,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertWindows(bd);
     }
 
+    @Test
     public void testOpera1050() {
         VBrowserDetails bd = new VBrowserDetails(OPERA1050_WINDOWS);
         assertPresto(bd);
@@ -314,6 +341,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertWindows(bd);
     }
 
+    @Test
     public void testIE6() {
         VBrowserDetails bd = new VBrowserDetails(IE6_WINDOWS);
         assertEngineVersion(bd, -1);
@@ -323,6 +351,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertWindows(bd);
     }
 
+    @Test
     public void testIE7() {
         VBrowserDetails bd = new VBrowserDetails(IE7_WINDOWS);
         assertEngineVersion(bd, -1);
@@ -332,6 +361,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertWindows(bd);
     }
 
+    @Test
     public void testIE8() {
         VBrowserDetails bd = new VBrowserDetails(IE8_WINDOWS);
         assertTrident(bd);
@@ -342,6 +372,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertWindows(bd);
     }
 
+    @Test
     public void testIE8CompatibilityMode() {
         VBrowserDetails bd = new VBrowserDetails(IE8_IN_IE7_MODE_WINDOWS);
         bd.setIEMode(7);
@@ -355,6 +386,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertWindows(bd);
     }
 
+    @Test
     public void testIE9() {
         VBrowserDetails bd = new VBrowserDetails(IE9_BETA_WINDOWS_7);
         assertTrident(bd);
@@ -365,6 +397,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertWindows(bd);
     }
 
+    @Test
     public void testIE9InIE7CompatibilityMode() {
         VBrowserDetails bd = new VBrowserDetails(IE9_IN_IE7_MODE_WINDOWS_7);
         // bd.setIE8InCompatibilityMode();
@@ -378,6 +411,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertWindows(bd);
     }
 
+    @Test
     public void testIE9InIE8CompatibilityMode() {
         VBrowserDetails bd = new VBrowserDetails(IE9_BETA_IN_IE8_MODE_WINDOWS_7);
         // bd.setIE8InCompatibilityMode();
@@ -395,6 +429,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertWindows(bd);
     }
 
+    @Test
     public void testIE10() {
         VBrowserDetails bd = new VBrowserDetails(IE10_WINDOWS_8);
         assertTrident(bd);
@@ -405,6 +440,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertWindows(bd);
     }
 
+    @Test
     public void testIE11() {
         VBrowserDetails bd = new VBrowserDetails(IE11_WINDOWS_7);
         assertTrident(bd);
@@ -415,6 +451,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertWindows(bd);
     }
 
+    @Test
     public void testIE11WindowsPhone81Update() {
         VBrowserDetails bd = new VBrowserDetails(IE11_WINDOWS_PHONE_8_1_UPDATE);
         assertTrident(bd);
@@ -425,6 +462,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
         assertWindows(bd, true);
     }
 
+    @Test
     public void testEdgeWindows10() {
         VBrowserDetails bd = new VBrowserDetails(EDGE_WINDOWS_10);
         assertEdge(bd);
@@ -439,7 +477,7 @@ public class VBrowserDetailsUserAgentParserTest extends TestCase {
 
     private void assertEngineVersion(VBrowserDetails browserDetails,
             float version) {
-        assertEquals(version, browserDetails.getBrowserEngineVersion());
+        assertEquals(version, browserDetails.getBrowserEngineVersion(), 0.01d);
 
     }
 
diff --git a/client/tests/src/com/vaadin/client/communication/ServerMessageHandlerTest.java b/client/src/test/java/com/vaadin/client/communication/ServerMessageHandlerTest.java
index 7b0d886c39..7b0d886c39 100644
--- a/client/tests/src/com/vaadin/client/communication/ServerMessageHandlerTest.java
+++ b/client/src/test/java/com/vaadin/client/communication/ServerMessageHandlerTest.java
diff --git a/client/tests/src/com/vaadin/client/ui/grid/ListDataSourceTest.java b/client/src/test/java/com/vaadin/client/ui/grid/ListDataSourceTest.java
index 24ccd6c57e..24ccd6c57e 100644
--- a/client/tests/src/com/vaadin/client/ui/grid/ListDataSourceTest.java
+++ b/client/src/test/java/com/vaadin/client/ui/grid/ListDataSourceTest.java
diff --git a/client/tests/src/com/vaadin/client/ui/grid/PartitioningTest.java b/client/src/test/java/com/vaadin/client/ui/grid/PartitioningTest.java
index e97bb339e4..e97bb339e4 100644
--- a/client/tests/src/com/vaadin/client/ui/grid/PartitioningTest.java
+++ b/client/src/test/java/com/vaadin/client/ui/grid/PartitioningTest.java
diff --git a/common.xml b/common.xml
index 075044bb5b..0c817afa1c 100644
--- a/common.xml
+++ b/common.xml
@@ -6,375 +6,12 @@
     </tstamp>
 
     <dirname property="vaadin.basedir" file="${ant.file.common}" />
-    <property name="gwt.basedir" location="${vaadin.basedir}/../gwt" />
     <property file="${vaadin.basedir}/build.properties" />
 
-    <property name="modules.producing.jar" value="shared,server,client,client-compiler,client-compiled,themes,push,widgets" />
-    <property name="modules.to.publish.to.maven" value="${modules.producing.jar},bom" />
-    <property name="modules.to.publish.to.download" value="${modules.to.publish.to.maven},all" />
-
     <ivy:settings file="${vaadin.basedir}/ivysettings.xml" />
     <ivy:settings file="${vaadin.basedir}/ivysettings.xml" id="ivysettings" />
     <ivy:resolve log="download-only" file="${vaadin.basedir}/ivy-taskdefs.xml" conf="taskdefs" />
     <ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" />
     <taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml" classpathref="taskdefs.classpath" />
-    <!-- ant contrib for Maven integration -->
-    <taskdef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" />
-
-    <!-- FIXME These are not available in other files -->
-    <antcontrib:propertyregex property="vaadin.version.major" input="${vaadin.version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\1" />
-    <antcontrib:propertyregex property="vaadin.version.minor" input="${vaadin.version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\2" />
-    <antcontrib:propertyregex property="vaadin.version.revision" input="${vaadin.version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\3" />
-    <filterset begintoken="@" endtoken="@" id="filter-vaadin.version">
-        <filter token="version" value="${vaadin.version}" />
-    </filterset>
-
-    <union id="empty.reference" />
-
-    <target name="pom.xml" description="Generates a pom.xml based on the Ivy configuration. Either for a snapshot or a release version" depends="pom.xml.release,pom.xml.snapshot">
-    </target>
-
-    <property name="common.jarfiles.dir" location="${vaadin.basedir}/buildhelpers/result/WebContent" />
-
-    <target name="pom.xml.release" if="build.release">
-        <fail unless="result.dir" message="No result.dir parameter given" />
-        <property name="ivy.xml" location="${result.dir}/../ivy.xml" />
-        <property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" />
-        <property name="conf" value="build, build-provided" />
-        <property name="vaadin.maven.version" value="${vaadin.version}" />
-
-        <ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" ivyfile="${ivy.xml}" pomfile="${pom.xml}" conf="${conf}">
-            <mapping conf="build" scope="compile" />
-            <mapping conf="build-provided" scope="provided" />
-        </ivy:makepom>
-    </target>
-
-    <target name="pom.xml.snapshot" unless="build.release">
-        <fail unless="result.dir" message="No result.dir parameter given" />
-        <property name="ivy.xml" location="${result.dir}/../ivy.xml" />
-        <property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" />
-        <property name="temp.pom.xml" location="${pom.xml}.temp" />
-        <property name="conf" value="build, build-provided" />
-        <property name="vaadin.maven.version" value="${vaadin.version.major}.${vaadin.version.minor}-SNAPSHOT" />
-
-        <ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" ivyfile="${ivy.xml}" pomfile="${temp.pom.xml}" conf="${conf}">
-            <mapping conf="build" scope="compile" />
-            <mapping conf="build-provided" scope="provided" />
-        </ivy:makepom>
-        <copy file="${temp.pom.xml}" tofile="${pom.xml}">
-            <filterchain>
-                <replacestring from="${vaadin.version}" to="${vaadin.maven.version}" />
-            </filterchain>
-        </copy>
-        <delete file="${temp.pom.xml}" />
-    </target>
-
-
-    <target name="sources.jar" depends="compile">
-        <fail unless="result.dir" message="No result.dir parameter given" />
-        <fail unless="module.name" message="No module.name parameter given" />
-        <fail unless="src" message="No src directory parameter given" />
-
-        <property name="sources.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}-sources.jar" />
-
-        <jar file="${sources.jar}" compress="true">
-            <fileset dir="${src}">
-                <patternset>
-                    <include name="**/*.java" />
-                    <include name="**/*.properties" />
-                </patternset>
-            </fileset>
-            <fileset dir="${common.jarfiles.dir}" />
-            <restrict>
-                <union refid="extra.jar.includes" />
-                <name name="*.java" />
-            </restrict>
-        </jar>
-
-    </target>
-
-    <target name="javadoc.jar" depends="dependencies">
-        <fail unless="result.dir" message="No result.dir parameter given" />
-        <fail unless="module.name" message="No module.name parameter given" />
-        <property name="src" location="{$result.dir}/../src" />
-        <property name="javadoc.dir" value="${result.dir}/javadoc" />
-        <property name="javadoc.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}-javadoc.jar" />
-
-        <antcontrib:if>
-            <!--
-              Most straight forward way to skip javadocs is to provide
-              an empty javadoc.jar. Ivy publish won't allow leaving the file
-              out without using conf attribute. Using conf would make internal
-              dependency resolution unnecessary complicated.
-             -->
-            <isset property="nojavadoc" />
-            <then>
-                <jar file="${javadoc.jar}" compress="true">
-                    <fileset dir="${common.jarfiles.dir}" />
-                </jar>
-            </then>
-            <else>
-                <javadoc destdir="${javadoc.dir}" author="true" version="true" use="true" windowtitle="${module.name}">
-                    <packageset dir="${src}" excludes="${classes.exclude}" />
-
-                    <doctitle>&lt;h1>${module.name}&lt;/h1></doctitle>
-                    <!-- <header><![CDATA[<script type="text/javascript" src=".html-style/style.js"></script>]]></header> -->
-                    <bottom>${javadoc.bottom}</bottom>
-                    <link offline="true" href="http://docs.oracle.com/javase/6/docs/api/" packagelistLoc="build/javadoc/j2se-1.6.0" />
-                    <link offline="true" href="http://java.sun.com/j2ee/1.4/docs/api/" packagelistLoc="build/javadoc/j2ee-1.4" />
-                    <classpath refid="classpath.compile.dependencies" />
-                </javadoc>
-
-                <!-- Create a javadoc jar -->
-                <jar file="${javadoc.jar}" compress="true">
-                    <fileset dir="${javadoc.dir}" />
-                    <fileset dir="${common.jarfiles.dir}" />
-                </jar>
-            </else>
-        </antcontrib:if>
-    </target>
-
-    <target name="jar" depends="compile, pom.xml">
-        <fail unless="result.dir" message="No result.dir parameter given" />
-        <fail unless="module.name" message="No module.name parameter given" />
-
-        <property name="result.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
-        <property name="classes" location="{$result.dir}/classes" />
-        <property name="src" location="{$result.dir}/../src" />
-
-        <union id="jar.files">
-            <fileset dir="${classes}" excludes="${classes.exclude}" erroronmissingdir="false" />
-            <fileset dir="${src}" excludes="${jar.exclude}" erroronmissingdir="false" />
-            <fileset dir="${common.jarfiles.dir}" />
-            <union refid="extra.jar.includes" />
-        </union>
-
-        <jar destfile="${result.jar}" duplicate="fail" index="true">
-            <manifest>
-                <attribute name="Implementation-Vendor" value="${vaadin.vendor}" />
-                <attribute name="Implementation-URL" value="${vaadin.url}" />
-                <attribute name="Implementation-Version" value="${vaadin.version}" />
-            </manifest>
-            <union refid="jar.files" />
-        </jar>
-
-        <antcall target="common.make-osgi-bundle">
-            <param name="jar" value="${result.jar}" />
-            <param name="bundle-version" value="${vaadin.version}" />
-            <param name="bundle-name" value="${module.name}" />
-            <param name="bundle-symbolic" value="${module.symbolic}" />
-            <param name="bundle-vendor" value="${vaadin.vendor}" />
-            <param name="includeNumberPackages" value="${osgi.includeNumberPackages}" />
-        </antcall>
-
-    </target>
-
-    <!-- Add OSGi attributes to the manifest of the given jar -->
-    <target name="make-osgi-bundle">
-        <fail unless="jar" message="No jar parameter given" />
-        <fail unless="bundle-name" message="No bundle-name parameter given" />
-        <fail unless="bundle-symbolic" message="No bundle-symbolic parameter given" />
-        <fail unless="bundle-version" message="No bundle-version parameter given" />
-        <fail unless="bundle-vendor" message="No bundle-vendor parameter given" />
-        <fail unless="includeNumberPackages" message="No includeNumberPackages parameter given" />
-        <property name="bundle-manifestversion" value="2" />
-
-        <jar file="${jar}" update="true">
-            <manifest>
-                <attribute name="Bundle-Version" value="${bundle-version}" />
-                <attribute name="Bundle-ManifestVersion" value="${bundle-manifestversion}" />
-                <attribute name="Bundle-Name" value="${bundle-name}" />
-                <attribute name="Bundle-SymbolicName" value="${bundle-symbolic}" />
-                <attribute name="Bundle-Vendor" value="${bundle-vendor}" />
-                <attribute name="Bundle-RequiredExecutionEnvironment" value="JavaSE-${vaadin.java.version}" />
-            </manifest>
-        </jar>
-
-        <antcontrib:if>
-            <isset property="import-package" />
-            <then>
-                <jar file="${result.jar}" update="true">
-                    <manifest>
-                        <attribute name="Import-Package" value="${import-package}" />
-                    </manifest>
-                </jar>
-            </then>
-        </antcontrib:if>
-        <antcontrib:if>
-            <isset property="require-bundle" />
-            <then>
-                <jar file="${result.jar}" update="true">
-                    <manifest>
-                        <attribute name="Require-Bundle" value="${require-bundle}" />
-                    </manifest>
-                </jar>
-            </then>
-        </antcontrib:if>
-        <antcontrib:if>
-            <isset property="export-package" />
-            <then>
-                <jar file="${result.jar}" update="true">
-                    <manifest>
-                        <attribute name="Export-Package" value="${export-package}" />
-                    </manifest>
-                </jar>
-            </then>
-        </antcontrib:if>
-
-        <ivy:resolve inline="true" organisation="com.vaadin" module="vaadin-buildhelpers" revision="${vaadin.version}" keep="true" />
-        <ivy:cachepath pathid="buildhelpers.classpath" />
-
-        <!-- Generate the Export-Package attribute in the manifest -->
-        <java classname="com.vaadin.buildhelpers.GeneratePackageExports" failonerror="true" fork="yes">
-            <arg value="${jar}" />
-            <arg line="com/vaadin com/google ${osgi.extra.package.prefixes}" />
-            <classpath refid="buildhelpers.classpath" />
-            <jvmarg value="-Dvaadin.version=${vaadin.version}" />
-            <jvmarg value="-DincludeNumberPackages=${includeNumberPackages}" />
-        </java>
-    </target>
-
-    <target name="compile" description="Compiles the module" depends="dependencies, directories" if="src-exists">
-        <fail unless="module.name" message="No module name given" />
-
-        <javac srcdir="${src}" destdir="${classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false">
-            <classpath refid="classpath.compile.dependencies" />
-            <classpath refid="classpath.compile.custom" />
-        </javac>
-        <copy todir="${classes}">
-            <fileset dir="${src}" includes="${extra.classes}" />
-        </copy>
-    </target>
-
-    <target name="directories">
-        <property name="result.dir" location="result" />
-        <property name="src" location="${result.dir}/../src" />
-        <property name="classes" location="${result.dir}/classes" />
-        <available file="${src}" type="dir" property="src-exists" />
-        <mkdir dir="${classes}" />
-    </target>
-
-    <target name="test.run" depends="test.compile">
-        <fail unless="module.name" message="No module name given" />
-
-        <property name="result.dir" location="result" />
-        <property name="classes" location="${result.dir}/classes" />
-        <property name="test.src" location="${result.dir}/../tests/src" />
-        <property name="test.classes" location="${result.dir}/tests/classes" />
-
-        <!-- Ensure report dir is empty before running tests -->
-        <property name="report.dir" location="${result.dir}/reports" />
-        <delete dir="${report.dir}" />
-        <mkdir dir="${report.dir}" />
-
-        <junit showoutput="no" printsummary="no" fork="yes">
-            <formatter type="xml" />
-            <jvmarg value="-ea" />
-            <classpath location="${test.classes}" />
-            <classpath location="${classes}" />
-            <classpath refid="classpath.compile.custom" />
-            <classpath refid="classpath.test.dependencies" />
-
-            <batchtest fork="yes" todir="${report.dir}">
-                <fileset dir="${test.src}">
-                    <include name="**/*Test.java" />
-                    <include name="**/*Tests.java" />
-                </fileset>
-            </batchtest>
-        </junit>
-    </target>
-
-    <target name="test.compile" description="Compiles tests" depends="compile, dependencies.test">
-        <fail unless="module.name" message="No module name given" />
-        <property name="result.dir" location="result" />
-        <property name="base.dir" location="${result.dir}/.." />
-        <property name="test.src" location="${base.dir}/tests/src" />
-        <property name="test.resources" location="${base.dir}/tests/resources" />
-        <property name="test.classes" location="${result.dir}/tests/classes" />
-        <property name="classes" location="${result.dir}/classes" />
-
-        <mkdir dir="${test.classes}" />
-
-        <javac srcdir="${test.src}" destdir="${test.classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false">
-            <classpath refid="classpath.test.dependencies" />
-            <classpath location="${classes}" />
-            <classpath refid="classpath.test.custom" />
-        </javac>
-
-        <!-- Copy resources -->
-        <copy todir="${test.classes}" failonerror="false">
-            <fileset dir="${test.resources}" />
-            <!-- include html templates used in declarative tests -->
-            <fileset dir="${test.src}">
-                <include name="**/*.html" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="dependencies" description="Resolves dependencies needed by this module">
-        <property name='conf' value="build, build-provided" />
-        <ivy:resolve log="download-only" resolveid="common" conf="${conf}" />
-        <ivy:cachepath pathid="classpath.compile.dependencies" conf="${conf}" />
-    </target>
-
-    <target name="dependencies.test" description="Resolves dependencies needed by test">
-        <ivy:resolve log="download-only" resolveid="common" conf="test" />
-        <ivy:cachepath pathid="classpath.test.dependencies" conf="test" />
-    </target>
-
-    <target name="remove-test-reports">
-        <fail unless="result.dir" message="No result.dir parameter given" />
-        <delete dir="${result.dir}/reports" />
-    </target>
-
-    <target name="clean" depends="remove-test-reports">
-        <fail unless="result.dir" message="No result.dir parameter given" />
-        <delete dir="${result.dir}" />
-    </target>
-
-    <target name="publish-local" description="Publishes the given module to the local repository">
-        <fail unless="result.dir" message="No result.dir parameter given" />
-        <property name="conf" value="*(public)" />
-
-        <ivy:resolve log="download-only" conf="${conf}" />
-        <ivy:publish settingsref="ivysettings" conf="${conf}" resolver="build-temp" overwrite="true" forcedeliver="true">
-            <!-- <artifacts pattern="${result.dir}/[artifact]-[revision].[ext]" 
-                /> -->
-            <artifacts pattern="${result.dir}/lib/[artifact]-[revision](-[classifier]).[ext]" />
-
-        </ivy:publish>
-    </target>
-
-    <target name="publish.to.local.maven">
-        <property name="conf" value="*(public)" />
-
-        <ivy:resolve log="download-only" conf="${conf}" />
-        <ivy:publish conf="${conf}" resolver="local-maven" overwrite="true">
-        </ivy:publish>
-    </target>
-
-    <!-- Checkstyle conf -->
-    <property name="cs.dir" location="${vaadin.basedir}/checkstyle" />
-    <property name="cs.xml" location="${cs.dir}/vaadin-checkstyle.xml" />
-    <property name="cs.header-file" location="${cs.dir}/header" />
-    <property name="cs.import-control-file" location="${cs.dir}/import-control.xml" />
-    <taskdef resource="checkstyletask.properties" uri="antlib:com.puppycrawl.tools.checkstyle" classpathref="taskdefs.classpath" />
 
-    <target name="checkstyle">
-        <fail unless="result.dir" message="No result.dir parameter given" />
-        <fail unless="cs.src" message="No cs.src parameter given" />
-        <property name="result.dir.full" location="${result.dir}" />
-        <mkdir dir="${result.dir}" />
-        <echo>##teamcity[importData type='checkstyle' path='${result.dir.full}/checkstyle-errors.xml']</echo>
-        <cs:checkstyle config="${cs.xml}" failOnViolation="false">
-            <fileset dir="${cs.src}" includes="**/*.java">
-                <exclude name="com/vaadin/sass/internal/parser/Parser.java" />
-                <exclude name="com/vaadin/sass/internal/parser/ParserConstants.java" />
-                <exclude name="com/vaadin/sass/internal/parser/ParserTokenManager.java" />
-            </fileset>
-            <formatter type="xml" toFile="${result.dir}/checkstyle-errors.xml" />
-            <property key="checkstyle.header.file" file="${cs.header-file}" />
-            <property key="checkstyle.importControl.file" file="${cs.import-control-file}" />
-        </cs:checkstyle>
-    </target>
 </project>
diff --git a/eclipse/Development Mode (vaadin).launch b/eclipse/Development Mode (vaadin).launch
deleted file mode 100644
index 072b9a57c4..0000000000
--- a/eclipse/Development Mode (vaadin).launch
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<stringAttribute key="bad_container_name" value="\eclipse"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/vaadin"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/vaadin/shared/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/vaadin/client/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/vaadin/uitest/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;vaadin&quot; type=&quot;1&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;amp;ivyXmlPath=client%2Fivy.xml&amp;amp;confs=ide&amp;amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;amp;loadSettingsOnDemand=false&amp;amp;propertyFiles=&quot; javaProject=&quot;vaadin&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;amp;ivyXmlPath=shared%2Fivy.xml&amp;amp;confs=ide&amp;amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;amp;loadSettingsOnDemand=false&amp;amp;propertyFiles=&quot; javaProject=&quot;vaadin&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;amp;ivyXmlPath=push%2Fivy.xml&amp;amp;confs=ide&amp;amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;amp;loadSettingsOnDemand=false&amp;amp;propertyFiles=&quot; javaProject=&quot;vaadin&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;amp;ivyXmlPath=gwt%2Fivy.xml&amp;amp;confs=ide&amp;amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;amp;loadSettingsOnDemand=false&amp;amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D&quot; javaProject=&quot;vaadin&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;amp;ivyXmlPath=uitest%2Fivy.xml&amp;amp;confs=ide&amp;amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;amp;loadSettingsOnDemand=false&amp;amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D&quot; javaProject=&quot;vaadin&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#10;"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -war WebContent/VAADIN/widgetsets com.vaadin.terminal.gwt.DefaultWidgetSet -startupUrl http://localhost:8888 -bindAddress 0.0.0.0"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="vaadin"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512M -XX:MaxPermSize=256M"/>
-</launchConfiguration>
diff --git a/eclipse/Development Server (vaadin).launch b/eclipse/Development Server (vaadin).launch
deleted file mode 100644
index 197344cce0..0000000000
--- a/eclipse/Development Server (vaadin).launch
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/vaadin/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6&quot; javaProject=&quot;vaadin&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;amp;ivyXmlPath=uitest%2Fivy.xml&amp;amp;confs=jetty-run&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;vaadin&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.vaadin.launcher.DevelopmentServerLauncher"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--autoreload=build/classes --scaninterval=3"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="vaadin"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
-</launchConfiguration>
diff --git a/eclipse/Super Development Mode (vaadin).launch b/eclipse/Super Development Mode (vaadin).launch
deleted file mode 100644
index b03337e5ff..0000000000
--- a/eclipse/Super Development Mode (vaadin).launch
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<stringAttribute key="bad_container_name" value="\eclipse"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/vaadin"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/vaadin/shared/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/vaadin/client/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/vaadin/uitest/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;vaadin&quot; type=&quot;1&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;amp;ivyXmlPath=client%2Fivy.xml&amp;amp;confs=ide&amp;amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;amp;loadSettingsOnDemand=false&amp;amp;propertyFiles=&quot; javaProject=&quot;vaadin&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;amp;ivyXmlPath=shared%2Fivy.xml&amp;amp;confs=ide&amp;amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;amp;loadSettingsOnDemand=false&amp;amp;propertyFiles=&quot; javaProject=&quot;vaadin&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;amp;ivyXmlPath=push%2Fivy.xml&amp;amp;confs=ide&amp;amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;amp;loadSettingsOnDemand=false&amp;amp;propertyFiles=&quot; javaProject=&quot;vaadin&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;amp;ivyXmlPath=gwt%2Fivy.xml&amp;amp;confs=ide&amp;amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;amp;loadSettingsOnDemand=false&amp;amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D&quot; javaProject=&quot;vaadin&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=vaadin&amp;amp;ivyXmlPath=uitest%2Fivy.xml&amp;amp;confs=ide&amp;amp;ivySettingsPath=%24%7Bworkspace_loc%3Avaadin%2Fivysettings.xml%7D&amp;amp;loadSettingsOnDemand=false&amp;amp;propertyFiles=%24%7Bworkspace_loc%3Avaadin%2Fbuild.properties%7D&quot; javaProject=&quot;vaadin&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#10;"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.codeserver.CodeServer"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noprecompile -strict -bindAddress 0.0.0.0 com.vaadin.DefaultWidgetSet  com.vaadin.tests.widgetset.TestingWidgetSet"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="vaadin"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1G -XX:MaxPermSize=256M"/>
-</launchConfiguration>
diff --git a/gwt-files.xml b/gwt-files.xml
deleted file mode 100644
index fd31482bdc..0000000000
--- a/gwt-files.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="GWT files for Vaadin" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
-    <include file="common.xml" as="common" />
-
-    <ivy:resolve log="download-only" file="${vaadin.basedir}/gwt/ivy.xml" transitive="false" />
-    <ivy:cachepath pathid="gwt-dev.classpath" conf="gwt-dev" />
-    <ivy:cachepath pathid="gwt-user.classpath" conf="gwt-user" />
-    <ivy:cachepath pathid="gwt-elemental.classpath" conf="gwt-elemental" />
-
-    <property name="gwt.eclipse.basedir" location="${gwt.basedir}/eclipse" />
-
-    <property name="gwt.user.jar" refid="gwt-user.classpath" />
-    <property name="gwt.dev.jar" refid="gwt-dev.classpath" />
-    <property name="gwt.elemental.jar" refid="gwt-elemental.classpath" />
-
-    <available file="${gwt.dev.jar}" property="gwt.dev.jar.found" />
-    <available file="${gwt.user.jar}" property="gwt.user.jar.found" />
-    <available file="${gwt.elemental.jar}" property="gwt.elemental.jar.found" />
-
-    <property name="gwt.unpack.dir" location="${vaadin.basedir}/build/gwt" />
-
-    <property name="gwt.user.jar.files" location="${gwt.unpack.dir}/gwt-user.jar" />
-    <property name="gwt.dev.jar.files" location="${gwt.unpack.dir}/gwt-dev.jar" />
-    <property name="gwt.elemental.jar.files" location="${gwt.unpack.dir}/gwt-elemental.jar" />
-
-    <target name="unpack.gwt">
-        <fail unless="gwt.dev.jar.found" message="Could not find gwt-dev.jar at ${gwt.dev.jar}" />
-        <fail unless="gwt.user.jar.found" message="Could not find gwt-user.jar at ${gwt.user.jar}" />
-        <fail unless="gwt.elemental.jar.found" message="Could not find gwt-elemental.jar at ${gwt.elemental.jar}" />
-
-        <delete dir="${gwt.unpack.dir}" />
-
-        <mkdir dir="${gwt.user.jar.files}" />
-        <mkdir dir="${gwt.dev.jar.files}" />
-        <mkdir dir="${gwt.elemental.jar.files}" />
-
-        <unzip dest="${gwt.user.jar.files}" src="${gwt.user.jar}" />
-        <unzip dest="${gwt.dev.jar.files}" src="${gwt.dev.jar}" />
-        <unzip dest="${gwt.elemental.jar.files}" src="${gwt.elemental.jar}" />
-    </target>
-
-    <union id="client-compiler.gwt.includes">
-        <!-- GWT development JAR contents including many external dependencies 
-            (for now) -->
-        <fileset dir="${gwt.dev.jar.files}">
-            <exclude name="META-INF/**" />
-            <exclude name="license*" />
-            <exclude name="LICENSE*" />
-
-            <!-- Packages in vaadin-shared-deps.jar or declared as dependencies -->
-            <exclude name="com/google/gwt/thirdparty/guava/**" />
-            <exclude name="javax/servlet/**" />
-            <exclude name="javax/xml/**" />
-            <!-- cssparser -->
-            <exclude name="com/steadystate/css/**" />
-            <!-- Ant & AntLauncher -->
-            <exclude name="org/apache/tools/**" />
-            <!-- Jetty & jetty-util -->
-            <exclude name="org/mortbay/**" />
-            <!-- Swing Worker -->
-            <exclude name="org/jdesktop/swingworker/**" />
-            <!-- Apache commons codec & io & lang & collections & logging -->
-            <exclude name="org/apache/commons/codec/**" />
-            <exclude name="org/apache/commons/io/**" />
-            <exclude name="org/apache/commons/lang/**" />
-            <exclude name="org/apache/commons/collections/**" />
-            <exclude name="org/apache/commons/logging/**" />
-            <!-- apache mime4j -->
-            <exclude name="org/apache/james/mime4j/**" />
-
-            <!-- client-compiler-deps -->
-            <exclude name="com/gargoylesoftware/" />
-            <exclude name="com/google/common/" />
-            <exclude name="com/google/debugging/" />
-            <exclude name="com/google/gwt/dev/protobuf/" />
-            <exclude name="com/google/gwt/thirdparty/debugging/" />
-            <exclude name="com/google/gwt/thirdparty/javascript/" />
-            <exclude name="com/google/gwt/thirdparty/mozilla/" />
-            <exclude name="com/ibm/" />
-            <exclude name="externs.zip" />
-            <exclude name="java_cup/" />
-            <exclude name="javax/annotation/" />
-            <exclude name="net/sourceforge/htmlunit/" />
-            <exclude name="org/apache/bcel/" />
-            <exclude name="org/apache/html/" />
-            <exclude name="org/apache/http/" />
-            <exclude name="org/apache/NOTICE" />
-            <exclude name="org/apache/regexp/" />
-            <exclude name="org/apache/tapestry/" />
-            <exclude name="org/apache/wml/" />
-            <exclude name="org/apache/xalan/" />
-            <exclude name="org/apache/xerces/" />
-            <exclude name="org/apache/xml/" />
-            <exclude name="org/apache/xmlcommons/" />
-            <exclude name="org/apache/xpath/" />
-            <exclude name="org/cyberneko/" />
-            <exclude name="org/eclipse/" />
-            <exclude name="org/kohsuke/" />
-            <exclude name="org/w3c/" />
-            <exclude name="org/xml/" />
-            <exclude name="rhino_ast/" />
-            <exclude name="rhinoDiff.txt" />
-            <exclude name="trax/" />
-            <exclude name="unicode-license.txt" />
-            <exclude name="org/json" />
-
-            <exclude name="license/NOTICE" />
-            <exclude name="license/LICENSE.dom-documentation.txt" />
-            <exclude name="license/LICENSE.dom-software.txt" />
-            <exclude name="license/LICENSE" />
-            <exclude name="license/README.dom.txt" />
-            <exclude name="license/README.sax.txt" />
-
-            <!-- Overridden in Vaadin -->
-            <exclude name="com/google/gwt/dev/About.properties" />
-
-        </fileset>
-
-    </union>
-
-    <union id="client-compiled-cache.gwt.includes">
-        <!-- Precompiled GWT modules (.gwtar file) -->
-        <fileset dir="${gwt.user.jar.files}">
-            <exclude name="META-INF/**" />
-
-            <!-- precompiled GWT modules (.gwtar) -->
-            <include name="**/*.gwtar" />
-            <!-- external dependencies -->
-            <exclude name="javax/servlet/**" />
-            <exclude name="org/w3c/css/sac/**" />
-
-        </fileset>
-    </union>
-
-    <union id="client.gwt.includes">
-        <fileset dir="${gwt.user.jar.files}">
-            <exclude name="META-INF/**" />
-            <!-- precompiled GWT modules (.gwtar) goes into client-compiled -->
-            <exclude name="**/*.gwtar" />
-            <!-- These go into server -->
-            <exclude name="com/google/gwt/*/server/**" />
-            <!-- These go into shared -->
-            <exclude name="com/google/gwt/*/shared/**" />
-            <exclude name="com/google/gwt/*/*/shared/**" />
-            <exclude name="com/google/web/bindery/*/shared/**" />
-
-            <!-- Used by the server, in wrong package in GWT -->
-            <exclude name="com/google/gwt/user/client/rpc/IsSerializable.*" />
-
-            <!-- These are in vaadin-shared-deps -->
-            <exclude name="com/google/gwt/thirdparty/streamhtmlparser/**" />
-            <exclude name="org/w3c/flute/**" />
-
-            <!-- external dependencies -->
-            <exclude name="javax/servlet/**" />
-            <exclude name="org/w3c/css/sac/**" />
-        </fileset>
-        <!-- GWT Elemental -->
-        <fileset dir="${gwt.elemental.jar.files}">
-            <exclude name="META-INF/**" />
-        </fileset>
-    </union>
-
-    <union id="shared.gwt.includes">
-        <fileset dir="${gwt.user.jar.files}">
-            <!-- Shared files from user -->
-            <include name="com/google/gwt/*/shared/**" />
-            <include name="com/google/gwt/*/*/shared/**" />
-            <include name="com/google/web/bindery/*/shared/**" />
-            <include name="com/google/gwt/user/client/rpc/IsSerializable.*" />
-
-        </fileset>
-        <!-- GWT Elemental -->
-        <fileset dir="${gwt.elemental.jar.files}">
-            <include name="elemental/util/Array*" />
-            <include name="elemental/util/Can*" />
-            <include name="elemental/util/Map*" />
-            <include name="elemental/json/**" />
-        </fileset>
-    </union>
-
-    <union id="server.gwt.includes">
-        <fileset dir="${gwt.user.jar.files}">
-            <!-- Server files from gwt-user -->
-            <include name="com/google/gwt/*/server/**" />
-        </fileset>
-    </union>
-</project>
diff --git a/gwt/ivy.xml b/gwt/ivy.xml
deleted file mode 100644
index d34b7ccfcc..0000000000
--- a/gwt/ivy.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
-    xmlns:m="http://ant.apache.org/ivy/maven">
-
-    <info organisation="com.vaadin" module="vaadin-gwt"
-        revision="${vaadin.version}" />
-
-    <configurations>
-        <conf name="build" />
-        <conf name="gwt-dev" />
-        <conf name="gwt-user" />
-        <conf name="gwt-codeserver" />
-        <conf name="gwt-elemental" />
-        <conf name="ide" visibility="private" />
-    </configurations>
-    <publications>
-        <artifact type="jar" ext="jar" />
-        <artifact type="source" ext="jar" m:classifier="sources" />
-        <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
-        <artifact type="pom" ext="pom" />
-    </publications>
-    <dependencies>
-      <dependency org="com.vaadin.external.gwt" name="gwt-dev" rev="${gwt.version}" conf="gwt-dev,ide->default" />
-      <dependency org="com.vaadin.external.gwt" name="gwt-user" rev="${gwt.version}" conf="gwt-user,ide->default" />
-      <dependency org="com.vaadin.external.gwt" name="gwt-codeserver" rev="${gwt.version}" conf="gwt-codeserver,ide->default" />
-      <dependency org="com.vaadin.external.gwt" name="gwt-elemental" rev="${gwt.version}" conf="gwt-elemental,ide->default" />
-    </dependencies>
-</ivy-module>
diff --git a/ivy-taskdefs.xml b/ivy-taskdefs.xml
index 3c04e5a051..95dca014dc 100644
--- a/ivy-taskdefs.xml
+++ b/ivy-taskdefs.xml
@@ -14,7 +14,7 @@
         <dependency org="ant-contrib" name="ant-contrib" rev="1.0b3"
             conf="taskdefs ->master" />
         <dependency org="org.apache.maven" name="maven-ant-tasks"
-            rev="2.0.10" conf="taskdefs ->master" />
+            rev="2.1.2" conf="taskdefs ->master" />
         <dependency org="com.googlecode.jarjar" name="jarjar"
             rev="1.3" conf="taskdefs ->master" />
         <dependency org="com.puppycrawl.tools" name="checkstyle"
diff --git a/ivysettings-publish.xml b/ivysettings-publish.xml
deleted file mode 100644
index aeb759d59b..0000000000
--- a/ivysettings-publish.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivysettings>
-    <!-- Customized stuff -->
-    <!-- <include url="ivysettings.xml"/> -->
-    <credentials host="oss.sonatype.org" realm="Sonatype Nexus Repository Manager"
-        username="${sonatype.username}" passwd="${sonatype.password}">
-    </credentials>
-    <signers>
-        <pgp name="gpg" password="${gpg.passphrase}" />
-    </signers>
-    <resolvers>
-        <!-- user="${publish.sftp.user}" host="${publish.sftp.host}" keyFile="${publish.sftp.keyfile}" 
-            keyFilePassword="${publish.sftp.keyfilepassword}" -->
-        <sftp name="sftp-publish" keyFile="${publish.sftp.keyfile}">
-            <ivy pattern="${publish.sftp.ivy.pattern}" />
-            <artifact pattern="${publish.sftp.artifact.pattern}" />
-        </sftp>
-        <ibiblio name="sonatype" signer="gpg"
-            root="https://oss.sonatype.org/content/repositories/vaadin-snapshots/"
-            m2compatible="true" />
-
-        <filesystem name="build-temp">
-            <ivy
-                pattern="${ivy.settings.dir}/result/artifacts/[revision]/[module]/ivy-[revision].xml" />
-            <artifact
-                pattern="${ivy.settings.dir}/result/artifacts/[revision]/[module]/[artifact]-[revision](-[classifier]).[ext]" />
-        </filesystem>
-    </resolvers>
-
-
-</ivysettings>
diff --git a/ivysettings.xml b/ivysettings.xml
index 5208b6bd54..3542a3e549 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -16,13 +16,15 @@
         <filesystem name="local-maven" m2compatible="true">
             <artifact
                 pattern="${user.home}/.m2/repository/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" />
-        </filesystem>
-        <filesystem name="build-temp">
             <ivy
-                pattern="${ivy.settings.dir}/result/artifacts/[revision]/[module]/ivy-[revision].xml" />
-            <artifact
-                pattern="${ivy.settings.dir}/result/artifacts/[revision]/[module]/[artifact]-[revision](-[classifier]).[ext]" />
+                pattern="${user.home}/.m2/repository/[organisation]/[module]/[revision]/[module]-[revision](-[classifier]).pom" />
         </filesystem>
+        <ibiblio name="vaadin-build" usepoms="true"
+            m2compatible="true" root="${vaadin.build.repository}" />
+        <chain name="vaadin-maven" returnFirst="true">
+            <resolver ref="local-maven" />
+            <resolver ref="vaadin-build" />
+        </chain>
     </resolvers>
     <modules>
         <module organisation="com.vaadin" name="vaadin-testbench"
@@ -34,27 +36,29 @@
         <module organisation="com.vaadin" name="vaadin-testbench-api"
             resolver="vaadin-addons" />
         <module organisation="com.vaadin" name="vaadin-buildhelpers"
-            resolver="build-temp" />
+            resolver="vaadin-maven" />
+        <module organisation="com.vaadin" name="vaadin-root"
+            resolver="vaadin-maven" />
         <module organisation="com.vaadin" name="vaadin-shared"
-            resolver="build-temp" />
+            resolver="vaadin-maven" />
         <module organisation="com.vaadin" name="vaadin-server"
-            resolver="build-temp" />
+            resolver="vaadin-maven" />
         <module organisation="com.vaadin" name="vaadin-client"
-            resolver="build-temp" />
+            resolver="vaadin-maven" />
         <module organisation="com.vaadin" name="vaadin-client-compiler"
-            resolver="build-temp" />
+            resolver="vaadin-maven" />
         <module organisation="com.vaadin" name="vaadin-client-compiled"
-            resolver="build-temp" />
+            resolver="vaadin-maven" />
         <module organisation="com.vaadin" name="vaadin-themes"
-            resolver="build-temp" />
+            resolver="vaadin-maven" />
         <module organisation="com.vaadin" name="vaadin-push"
-            resolver="build-temp" />
+            resolver="vaadin-maven" />
         <module organisation="com.vaadin" name="vaadin-widgets"
-            resolver="build-temp" />
+            resolver="vaadin-maven" />
         <module organisation="com.vaadin" name="vaadin-bom"
-            resolver="build-temp" />
+            resolver="vaadin-maven" />
         <module organisation="com.vaadin" name="vaadin-liferay"
-            resolver="build-temp" />
+            resolver="vaadin-maven" />
     </modules>
 
 
diff --git a/liferay/build.xml b/liferay/build.xml
deleted file mode 100644
index fc1d748e55..0000000000
--- a/liferay/build.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="liferay" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant">
-    <description>
-        Builds the Liferay ZIP archive
-    </description>
-
-    <include file="../common.xml" as="common" />
-    <include file="../build.xml" as="vaadin" />
-
-    <property name="module.name" value="vaadin-liferay" />
-    <property name="result.dir" value="result" />
-    <property name="lib.dir" value="${result.dir}/lib" />
-    <property name="work.dir" value="${result.dir}/work" />
-    <property name="liferay.zip" location="${result.dir}/lib/${module.name}-${vaadin.version}.zip" />
-
-    <target name="publish-local" depends="build-zip" if="build.release">
-        <antcall target="common.publish-local">
-            <param name="conf" value="deps" />
-        </antcall>
-    </target>
-
-    <target name="fetch-jars">
-        <echo>Retriving prebuilt jars</echo>
-        <!-- Retrieve pre-build jars -->
-        <ivy:resolve />
-        <mkdir dir="${lib.dir}" />
-        <ivy:retrieve pattern="${lib.dir}/[artifact].[type]" conf="deps" />
-    </target>
-
-    <target name="unpack" depends="fetch-jars">
-        <echo>Unpacking jars into working directory</echo>
-        <mkdir dir="${work.dir}" />
-        <unjar src="${lib.dir}/vaadin-client-compiled.jar" dest="${work.dir}">
-            <patternset>
-                <include name="VAADIN/widgetsets/**/*" />
-            </patternset>
-        </unjar>
-        <unjar src="${lib.dir}/vaadin-themes.jar" dest="${work.dir}">
-            <patternset>
-                <include name="VAADIN/themes/base/**/*" />
-                <include name="VAADIN/themes/chameleon/**/*" />
-                <include name="VAADIN/themes/liferay/**/*" />
-                <include name="VAADIN/themes/runo/**/*" />
-                <include name="VAADIN/themes/reindeer/**/*" />
-            </patternset>
-        </unjar>
-        <unjar src="${lib.dir}/vaadin-push.jar" dest="${work.dir}">
-            <patternset>
-                <include name="VAADIN/vaadinPush.js" />
-                <include name="VAADIN/vaadinPush.debug.js" />
-            </patternset>
-        </unjar>
-        <unjar src="${lib.dir}/vaadin-server.jar" dest="${work.dir}">
-            <patternset>
-                <include name="VAADIN/vaadinBootstrap.js" />
-            </patternset>
-        </unjar>
-    </target>
-
-    <target name="build-zip" depends="unpack">
-        <echo>Building Liferay zip</echo>
-        <zip zipfile="${liferay.zip}">
-            <zipfileset dir="${work.dir}" />
-        </zip>
-    </target>
-
-    <target name="clean">
-        <antcall target="common.clean" />
-    </target>
-
-    <target name="checkstyle" />
-
-    <target name="test" depends="checkstyle" />
-
-</project>
diff --git a/liferay/ivy.xml b/liferay/ivy.xml
deleted file mode 100644
index fb6d152e15..0000000000
--- a/liferay/ivy.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
-    xmlns:m="http://ant.apache.org/ivy/maven">
-
-    <info organisation="com.vaadin" module="vaadin-liferay" revision="${vaadin.version}" />
-
-    <configurations>
-        <conf name="build" />
-        <conf name="build-provided" />
-        <conf name="deps" visibility="private" />
-    </configurations>
-
-    <publications>
-        <artifact type="zip" ext="zip" />
-    </publications>
-
-    <dependencies>
-        <dependency org="com.vaadin" name="vaadin-client-compiled"
-            rev="${vaadin.version}" conf="deps -> build" transitive="false"/>
-        <dependency org="com.vaadin" name="vaadin-themes"
-            rev="${vaadin.version}" conf="deps -> build" transitive="false"/>
-        <dependency org="com.vaadin" name="vaadin-push"
-            rev="${vaadin.version}" conf="deps -> build" transitive="false" />
-        <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" conf="deps -> build" transitive="false" />
-    </dependencies>
-
-</ivy-module>
diff --git a/liferay/liferay-assembly-descriptor.xml b/liferay/liferay-assembly-descriptor.xml
new file mode 100644
index 0000000000..64766813cc
--- /dev/null
+++ b/liferay/liferay-assembly-descriptor.xml
@@ -0,0 +1,18 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+    <id>bin</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <outputDirectory/>
+            <directory>${dependency.unpack.directory}</directory>
+            <includes>
+                <include>**</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/liferay/pom.xml b/liferay/pom.xml
new file mode 100644
index 0000000000..df42599fda
--- /dev/null
+++ b/liferay/pom.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.vaadin</groupId>
+		<artifactId>vaadin-root</artifactId>
+		<version>7.7.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>vaadin-liferay</artifactId>
+	<name>vaadin-liferay</name>
+	<packaging>pom</packaging>
+
+	<url>https://vaadin.com/</url>
+	<description>Vaadin Liferay package</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-client-compiled</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-push</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-themes</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-server</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>unpack</id>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>com.vaadin</groupId>
+									<artifactId>vaadin-push</artifactId>
+									<includes>VAADIN/vaadinPush.js, VAADIN/vaadinPush.debug.js</includes>
+								</artifactItem>
+
+								<artifactItem>
+									<groupId>com.vaadin</groupId>
+									<artifactId>vaadin-client-compiled</artifactId>
+									<includes>VAADIN/widgetsets/**/*</includes>
+								</artifactItem>
+
+								<artifactItem>
+									<groupId>com.vaadin</groupId>
+									<artifactId>vaadin-themes</artifactId>
+									<includes>
+										VAADIN/themes/base/**,
+										VAADIN/themes/chameleon/**,
+										VAADIN/themes/liferay/**,
+										VAADIN/themes/runo/**,
+										VAADIN/themes/reindeer/**
+									</includes>
+								</artifactItem>
+								<artifactItem>
+									<groupId>com.vaadin</groupId>
+									<artifactId>vaadin-server</artifactId>
+									<includes>VAADIN/vaadinBootstrap.js</includes>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<archive>
+						<addMavenDescriptor>false</addMavenDescriptor>
+					</archive>
+					<appendAssemblyId>false</appendAssemblyId>
+					<descriptors>
+						<descriptor>liferay-assembly-descriptor.xml</descriptor>
+					</descriptors>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-install-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.sonatype.plugins</groupId>
+					<artifactId>nexus-staging-maven-plugin</artifactId>
+					<configuration>
+						<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+
+</project>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000000..73e9d186c2
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,339 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.vaadin</groupId>
+		<artifactId>vaadin-parent</artifactId>
+		<version>1.0.0</version>
+	</parent>
+	<groupId>com.vaadin</groupId>
+	<artifactId>vaadin-root</artifactId>
+	<name>vaadin-root</name>
+	<packaging>pom</packaging>
+	<version>7.7.0-SNAPSHOT</version>
+
+	<prerequisites>
+		<maven>3.0.5</maven>
+	</prerequisites>
+
+	<properties>
+		<maven.compiler.source>1.6</maven.compiler.source>
+		<maven.compiler.target>1.6</maven.compiler.target>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+		<!-- Used version numbers for dependencies -->
+		<commons-io.version>2.4</commons-io.version>
+		<google.appengine.version>1.7.7</google.appengine.version>
+		<guava.version>16.0.1.vaadin1</guava.version>
+		<jsoup.version>1.8.3</jsoup.version>
+		<liferay.portal.version>6.0.2</liferay.portal.version>
+
+		<vaadin.sass.version>0.9.13</vaadin.sass.version>
+		<vaadin.gwt.version>2.7.0.vaadin3</vaadin.gwt.version>
+		<vaadin.plugin.version>7.7.0.alpha1</vaadin.plugin.version>
+
+		<javax.portlet.version>2.0</javax.portlet.version>
+		<javax.servlet.version>3.0.1</javax.servlet.version>
+		<javax.validation.version>1.0.0.GA</javax.validation.version>
+
+		<!-- Test dependencies -->
+		<junit.version>4.11</junit.version>
+
+		<!-- Atmosphere versions -->
+		<atmosphere.runtime.version>2.2.7.vaadin1</atmosphere.runtime.version>
+		<atmosphere.js.version>2.2.6.vaadin4</atmosphere.js.version>
+
+		<!-- Dependency unpack directory -->
+		<dependency.unpack.directory>${project.build.directory}/dependency-unpack</dependency.unpack.directory>
+	</properties>
+
+	<!-- TODO: remove this after maven plugin has been released -->
+	<pluginRepositories>
+		<pluginRepository>
+			<id>vaadin-prereleases</id>
+			<url>http://maven.vaadin.com/vaadin-prereleases</url>
+		</pluginRepository>
+	</pluginRepositories>
+
+	<organization>
+		<name>Vaadin Ltd</name>
+	</organization>
+	<url>https://vaadin.com/</url>
+	<description>Vaadin Framework Root Pom</description>
+	<licenses>
+		<license>
+			<name>Apache License Version 2.0</name>
+			<distribution>repo</distribution>
+			<url>http://www.apache.org/licenses/LICENSE-2.0</url>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:https:https://github.com/vaadin/vaadin.git</connection>
+		<developerConnection>scm:https:https://github.com/vaadin/vaadin.git</developerConnection>
+		<url>https://github.com/vaadin/vaadin</url>
+	</scm>
+
+
+	<modules>
+		<module>buildhelpers</module>
+		<module>shared</module>
+		<module>push</module>
+		<module>server</module>
+		<module>client</module>
+		<module>client-compiler</module>
+		<module>client-compiled</module>
+		<module>themes</module>
+		<module>widgets</module>
+		<module>uitest</module>
+		<module>liferay</module>
+		<module>all</module>
+		<!-- Nexus staging bug needs the last module to be deployed. -->
+		<module>bom</module>
+	</modules>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<artifactId>maven-clean-plugin</artifactId>
+					<version>3.0.0</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.5.1</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>2.8.2</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-install-plugin</artifactId>
+					<version>2.5.2</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-resources-plugin</artifactId>
+					<!-- Downgraded due to filtering related bug -->
+					<version>2.6</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>3.5</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>2.6</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-assembly-plugin</artifactId>
+					<version>2.6</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.19.1</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-antrun-plugin</artifactId>
+					<version>1.8</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.felix</groupId>
+					<artifactId>maven-bundle-plugin</artifactId>
+					<version>3.0.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-dependency-plugin</artifactId>
+					<version>2.10</version>
+					<configuration>
+						<outputDirectory>${dependency.unpack.directory}</outputDirectory>
+						<overWriteReleases>false</overWriteReleases>
+						<overWriteSnapshots>true</overWriteSnapshots>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>exec-maven-plugin</artifactId>
+					<version>1.4.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>build-helper-maven-plugin</artifactId>
+					<version>1.10</version>
+				</plugin>
+				<plugin>
+					<artifactId>maven-source-plugin</artifactId>
+					<version>3.0.0</version>
+				</plugin>
+				<plugin>
+					<groupId>com.vaadin</groupId>
+					<artifactId>vaadin-maven-plugin</artifactId>
+					<version>${vaadin.plugin.version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-checkstyle-plugin</artifactId>
+					<version>2.17</version>
+					<dependencies>
+						<!-- Needed because of a JavadocMethodCheck bug in 6.11 -->
+						<dependency>
+							<groupId>com.puppycrawl.tools</groupId>
+							<artifactId>checkstyle</artifactId>
+							<version>6.17</version>
+						</dependency>
+					</dependencies>
+					<configuration>
+						<configLocation>../checkstyle/vaadin-checkstyle.xml</configLocation>
+						<headerLocation>../checkstyle/header</headerLocation>
+						<encoding>UTF-8</encoding>
+						<consoleOutput>false</consoleOutput>
+						<failsOnError>false</failsOnError>
+						<linkXRef>false</linkXRef>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>animal-sniffer-maven-plugin</artifactId>
+					<version>1.15</version>
+				</plugin>
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.apache.maven.plugins
+										</groupId>
+										<artifactId>
+											maven-antrun-plugin
+										</artifactId>
+										<versionRange>
+											[1.8,)
+										</versionRange>
+										<goals>
+											<goal>run</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>animal-sniffer-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>java6compatibility</id>
+						<phase>test</phase>
+						<goals>
+							<goal>check</goal>
+						</goals>
+						<configuration>
+							<signature>
+								<groupId>org.codehaus.mojo.signature</groupId>
+								<artifactId>java16</artifactId>
+								<version>1.0</version>
+							</signature>
+							<ignores>
+								<ignore>com.google.gwt.*</ignore>
+							</ignores>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- Unpacked Dependencies as resource -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+
+				<!-- Needs extra resource folder for unpacked dependencies -->
+				<executions>
+					<execution>
+						<id>add-dependency-resources</id>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>add-resource</goal>
+						</goals>
+						<configuration>
+							<resources>
+								<resource>
+									<directory>${dependency.unpack.directory}</directory>
+									<filtering>false</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<profiles>
+		<profile>
+			<id>release</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<properties>
+				<vaadin.plugin.version>${project.version}</vaadin.plugin.version>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-source-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>sources-jar</id>
+								<phase>package</phase>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+								<configuration>
+									<!-- Only include java files -->
+									<includes>
+										<include>**/*.java</include>
+									</includes>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>2.10.3</version>
+						<executions>
+							<execution>
+								<id>generate-javadoc</id>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+								<configuration>
+									<failOnError>false</failOnError>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.sonatype.plugins</groupId>
+						<artifactId>nexus-staging-maven-plugin</artifactId>
+						<version>1.6.7</version>
+						<extensions>true</extensions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
+</project>
diff --git a/publish.properties b/publish.properties
deleted file mode 100644
index 617a613e80..0000000000
--- a/publish.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-publish.sftp.ivy.pattern=
-publish.sftp.artifact.pattern=
-maven.snapshot.repository.url=https://oss.sonatype.org/content/repositories/vaadin-snapshots
-maven.snapshot.repository.id=vaadin-snapshots
\ No newline at end of file
diff --git a/publish.xml b/publish.xml
deleted file mode 100644
index 3c14e86774..0000000000
--- a/publish.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="publish" basedir="." default="" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-    <include file="common.xml" as="common" />
-    <include file="build.xml" as="vaadin" />
-
-    <!-- Dummy value as ivysettings-publish require a value -->
-    <property name="publish.sftp.keyfile" value="/dummy" />
-    <property name="publish.sftp.ivy.pattern" value="dummy" />
-
-    <ivy:settings file="ivysettings.xml" />
-    <ivy:settings file="ivysettings-publish.xml" id="publish.settings" />
-    <property file="publish.properties" />
-
-    <target name="nightly.publish" depends="nightly.download.publish, nightly.maven.publish">
-
-    </target>
-
-    <!-- Copies the nightly build artifacts to the download server. -->
-    <target name="nightly.tests.publish" if="nightly.tests.publish">
-        <property name="file.war" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${version}.war" />
-        <property name="target" value="${nightly.tests.publish}/${vaadin.version.major}.${vaadin.version.minor}-${build.tag}.war" />
-
-        <fail unless="ant-jsch.present" message="Please install ant-jsch.jar into ANT_HOME/lib" />
-        <fail unless="jsch.present" message="Please install jsch.jar into ANT_HOME/lib" />
-
-        <echo>Installing ${src} to ${target}</echo>
-
-        <scp todir="${nightly.tests.publish}" file="${file.war}">
-        </scp>
-    </target>
-
-    <target name="nightly.download.publish">
-        <antcontrib:foreach list="${modules.to.publish.to.download}" target="publish.module.to.download.site" param="module" />
-    </target>
-
-    <target name="nightly.maven.publish">
-        <antcontrib:foreach list="${modules.to.publish.to.maven}" target="publish.module.to.maven" param="module" />
-    </target>
-
-	<target name="publish.module.to.download.site">
-        <fail unless="module" message="No module to publish defined" />
-        <ivy:resolve log="download-only" file="${module}/ivy.xml" />
-        <ivy:publish publishivy="false" settingsref="publish.settings" conf="*(public)" resolver="sftp-publish">
-            <artifacts pattern="${ivy.settings.dir}/result/artifacts/[revision]/[module]/[artifact]-[revision](-[classifier]).[ext]" />
-        </ivy:publish>
-    </target>
-
-    <target name="publish.module.to.maven">
-        <fail unless="module" message="No module to publish defined" />
-        <property file="${gpg.passphrase.file}" />
-
-        <!-- Ivy should be able to handle this but this does not work at 
-            the moment <ivy:resolve log="download-only" file="${module}/ivy.xml" /> <ivy:publish pubrevision="7.0-SNAPSHOT" 
-            publishivy="false" settingsref="publish.settings" conf="*(public)" resolver="sonatype"> 
-            <artifacts pattern="${ivy.settings.dir}/result/artifacts/${vaadin.version}/[module]/[artifact]-${vaadin.version}(-[classifier]).[ext]" 
-            /> </ivy:publish> -->
-        <property name="jar.file" location="result/artifacts/${vaadin.version}/vaadin-${module}/vaadin-${module}-${vaadin.version}.jar" />
-        <property name="pom.file" location="result/artifacts/${vaadin.version}/vaadin-${module}/vaadin-${module}-${vaadin.version}.pom" />
-
-        <antcontrib:if>
-        	<available file="${jar.file}"/>
-            <then>
-                <artifact:mvn failonerror="true">
-                    <arg value="gpg:sign-and-deploy-file" />
-                    <sysproperty key="file" value="${jar.file}" />
-                    <sysproperty key="pomFile" value="${pom.file}" />
-                    <sysproperty key="repositoryId" value="${maven.snapshot.repository.id}" />
-                    <sysproperty key="url" value="${maven.snapshot.repository.url}" />
-                    <sysproperty key="gpg.passphrase" value="${gpg.passphrase}" />
-                    <sysproperty key="retryFailedDeploymentCount" value="10" />
-                </artifact:mvn>
-            </then>
-            <else>
-                <artifact:mvn failonerror="true">
-                    <arg value="gpg:sign-and-deploy-file" />
-                    <sysproperty key="file" value="${pom.file}" />
-                    <sysproperty key="pomFile" value="${pom.file}" />
-                    <sysproperty key="generatePom" value="false" />
-                    <sysproperty key="packaging" value="pom" />
-                    <sysproperty key="repositoryId" value="${maven.snapshot.repository.id}" />
-                    <sysproperty key="url" value="${maven.snapshot.repository.url}" />
-                    <sysproperty key="gpg.passphrase" value="${gpg.passphrase}" />
-                    <sysproperty key="retryFailedDeploymentCount" value="10" />
-                </artifact:mvn>
-            </else>
-        </antcontrib:if>
-    </target>
-
-	<!-- Use this to publish to local Maven repo                              -->
-	<!-- If you have compiled a snapshot build with:                          -->
-	<!--    ant -Dvaadin.version=7.x.x.zzz package                            -->
-	<!-- Publish with:                                                        -->
-	<!--    ant -f publish.xml -Dvaadin.version=7.x.x.zzz local.maven.publish -->
-	<!-- Note that if the build is a snapshot build, it will be installed as  -->
-	<!-- 7.x-SNAPSHOT.                                                        -->
-    <target name="local.maven.publish">
-        <antcontrib:foreach list="${modules.to.publish.to.maven}" target="publish.module.to.local.maven" param="module" />
-    </target>
-
-    <target name="publish.module.to.local.maven">
-        <fail unless="module" message="No module to publish defined" />
-
-        <property name="jar.file" location="result/artifacts/${vaadin.version}/vaadin-${module}/vaadin-${module}-${vaadin.version}.jar" />
-        <property name="javadoc.file" location="result/artifacts/${vaadin.version}/vaadin-${module}/vaadin-${module}-${vaadin.version}-javadoc.jar" />
-        <property name="sources.file" location="result/artifacts/${vaadin.version}/vaadin-${module}/vaadin-${module}-${vaadin.version}-sources.jar" />
-        <property name="pom.file" location="result/artifacts/${vaadin.version}/vaadin-${module}/vaadin-${module}-${vaadin.version}.pom" />
-
-        <antcontrib:if>
-        	<available file="${jar.file}"/>
-            <then>
-                <artifact:mvn failonerror="true">
-                    <arg value="install:install-file" />
-                    <sysproperty key="file" value="${jar.file}" />
-                    <sysproperty key="pomFile" value="${pom.file}" />
-                    <sysproperty key="javadoc" value="${javadoc.file}" />
-                    <sysproperty key="sources" value="${sources.file}" />
-                </artifact:mvn>
-            </then>
-            <else>
-                <artifact:mvn failonerror="true">
-                    <arg value="install:install-file" />
-                    <sysproperty key="file" value="${pom.file}" />
-                    <sysproperty key="pomFile" value="${pom.file}" />
-                    <sysproperty key="generatePom" value="false" />
-                    <sysproperty key="packaging" value="pom" />
-                </artifact:mvn>
-            </else>
-        </antcontrib:if>
-    </target>
-</project>
diff --git a/push/build.xml b/push/build.xml
deleted file mode 100644
index 3a3329c0fe..0000000000
--- a/push/build.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="vaadin-push" basedir="." default="publish-local"
-    xmlns:ivy="antlib:org.apache.ivy.ant">
-    <description>
-        Meta package which defines dependencies needed for push
-    </description>
-    <include file="../build.xml" as="vaadin" />
-    <include file="../common.xml" as="common" />
-
-    <property name="module.name" value="vaadin-push" />
-    <property name="module.symbolic" value="com.vaadin.push" />
-    <property name="result.dir" location="result" />
-    <property name="temp.dir" location="${result.dir}/temp" />
-    <property name="jquery.unpack" location="${temp.dir}/jquery" />
-    <property name="vaadinPush.js" location="${result.dir}/js/VAADIN/vaadinPush.js" />
-    <property name="vaadinPush.debug.js"
-        location="${result.dir}/js/VAADIN/vaadinPush.debug.js" />
-
-    <!-- Keep the version number in sync with ivy.xml, server/src/com/vaadin/server/Constants.java -->
-    <property name="atmosphere.runtime.version" value="2.2.7.vaadin1" />
-    <property name="jquery.js" location="lib/jquery/jquery-1.11.0.js" />
-
-    <path id="classpath.compile.custom" />
-
-    <union id="jar.includes">
-        <fileset dir="${result.dir}/js">
-            <include name="VAADIN/vaadinPush.js" />
-            <include name="VAADIN/vaadinPush.js.gz" />
-            <include name="VAADIN/vaadinPush.debug.js" />
-            <include name="VAADIN/vaadinPush.debug.js.gz" />
-        </fileset>
-    </union>
-
-    <target name="vaadinPush.js">
-        <mkdir dir="${result.dir}/js/VAADIN" />
-        <ivy:resolve log="download-only" file="ivy.xml"
-            conf="push.js" />
-        <ivy:cachepath pathid="atmosphere.jquery.deps"
-            conf="push.js" />
-
-        <delete dir="${temp.dir}" />
-        <copy flatten="true" tofile="${temp.dir}/jquery.war">
-            <path refid="atmosphere.jquery.deps" />
-        </copy>
-
-        <!-- Unzip to temp dir -->
-        <unzip src="${temp.dir}/jquery.war" dest="${jquery.unpack}">
-            <patternset>
-                <include name="**/jquery.atmosphere.js" />
-            </patternset>
-            <mapper type="flatten" />
-        </unzip>
-        <loadfile srcfile="${jquery.js}" property="jquery.js.contents" />
-        <loadfile srcfile="${jquery.unpack}/jquery.atmosphere.js"
-            property="jquery.atmosphere.js.contents" />
-
-        <loadfile
-            srcfile="${vaadin.basedir}/WebContent/VAADIN/vaadinPush.js.tpl"
-            property="vaadinPush.js.contents">
-            <filterchain>
-                <replacetokens begintoken="@" endtoken="@">
-                    <token key="jquery.js" value="${jquery.js.contents}" />
-                    <token key="jquery.atmosphere.js" value="${jquery.atmosphere.js.contents}" />
-                </replacetokens>
-            </filterchain>
-        </loadfile>
-
-        <!-- Non-obfuscated version for debugging -->
-        <echo file="${vaadinPush.debug.js}">${vaadinPush.js.contents}</echo>
-
-        <!-- Minify -->
-        <ivy:retrieve organisation="com.yahoo.platform.yui"
-            module="yuicompressor" revision="2.4.7" inline="true" type="jar"
-            pattern="${result.dir}/compressor.jar" />
-        <java jar="${result.dir}/compressor.jar" fork="true">
-            <arg value="-v" />
-            <arg value="-o" />
-            <arg file="${vaadinPush.js}" />
-            <arg file="${vaadinPush.debug.js}" />
-        </java>
-        
-        <!-- Gzipped versions -->
-        <gzip src="${vaadinPush.js}" destfile="${vaadinPush.js}.gz" />
-        <gzip src="${vaadinPush.debug.js}" destfile="${vaadinPush.debug.js}.gz" />
-    </target>
-
-    <target name="jar" depends="vaadinPush.js">
-        <antcall target="common.jar">
-            <param name="osgi.extra.package.prefixes" value="VAADIN" />
-            <param name="require-bundle"
-                value="com.vaadin.external.atmosphere.runtime;bundle-version=&quot;${atmosphere.runtime.version}&quot;;visibility:=reexport" />
-            <reference torefid="extra.jar.includes" refid="jar.includes" />
-        </antcall>
-    </target>
-
-    <target name="publish-local" depends="jar">
-        <antcall target="common.publish-local" />
-    </target>
-
-    <target name="clean">
-        <antcall target="common.clean" />
-    </target>
-    <target name="checkstyle">
-    </target>
-
-    <target name="test" depends="checkstyle">
-    </target>
-</project>
diff --git a/push/ivy.xml b/push/ivy.xml
deleted file mode 100644
index b5e34e616e..0000000000
--- a/push/ivy.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ivy-module [
-<!-- Keep the version number in sync with build.xml -->
-    <!ENTITY atmosphere.runtime.version "2.2.7.vaadin1">
-
-    <!ENTITY atmosphere.js.version "2.2.13.vaadin3">
-]>
-<ivy-module version="2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
-    xmlns:m="http://ant.apache.org/ivy/maven">
-
-    <info organisation="com.vaadin" module="vaadin-push" revision="${vaadin.version}" />
-
-    <configurations>
-        <conf name="build" />
-        <conf name="build-provided" />
-        <conf name="ide" visibility="private" />
-        <conf name="test" visibility="private" />
-        <!-- Used for building push.js only -->
-        <conf name="push.js" visibility="private" />
-    </configurations>
-    <publications>
-        <artifact type="jar" ext="jar" />
-        <!-- <artifact type="source" ext="jar" m:classifier="sources" /> 
-            <artifact type="javadoc" ext="jar" m:classifier="javadoc" /> -->
-        <artifact type="pom" ext="pom" />
-    </publications>
-    <dependencies>
-        <!-- API DEPENDENCIES -->
-
-	<!-- @WebListener is used for JSR356 websockets so we need to compile with servlet 3 API --> 
-        <dependency org="javax.servlet" name="javax.servlet-api"
-            rev="3.0.1" conf="build-provided,ide,test -> default" />
-
-        <!-- Atmosphere -->
-        <dependency org="com.vaadin.external.atmosphere"
-            name="atmosphere-runtime" rev="&atmosphere.runtime.version;"
-            conf="build,ide,test -> default" />
-        <dependency org="com.vaadin.external.atmosphere.client"
-            name="jquery" rev="&atmosphere.js.version;" conf="push.js -> default" />
-    </dependencies>
-
-</ivy-module>
diff --git a/push/pom.xml b/push/pom.xml
new file mode 100644
index 0000000000..31131653f8
--- /dev/null
+++ b/push/pom.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.vaadin</groupId>
+		<artifactId>vaadin-root</artifactId>
+		<version>7.7.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>vaadin-push</artifactId>
+	<name>vaadin-push</name>
+	<packaging>jar</packaging>
+	<properties>
+
+	</properties>
+
+	<url>https://vaadin.com/</url>
+	<description>Vaadin server push support</description>
+
+	<dependencies>
+		<!-- Atmosphere -->
+		<dependency>
+			<groupId>com.vaadin.external.atmosphere</groupId>
+			<artifactId>atmosphere-runtime</artifactId>
+			<version>${atmosphere.runtime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin.external.atmosphere.client</groupId>
+			<artifactId>jquery</artifactId>
+			<version>${atmosphere.js.version}</version>
+			<type>war</type>
+			<scope>provided</scope>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>default-cli</id>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<!-- <inherited>false</inherited> -->
+						<configuration>
+							<target>
+								<property name="jquery.unpack" location="${project.build.directory}/temp" />
+								<property name="vaadinPush.js"
+									location="${project.build.outputDirectory}/VAADIN/vaadinPush.debug.js" />
+								<property name="templates.dir"
+									location="${project.build.sourceDirectory}/../templates" />
+
+								<!-- Unzip to temp dir -->
+								<unzip
+									src="${maven.dependency.com.vaadin.external.atmosphere.client.jquery.war.path}"
+									dest="${jquery.unpack}">
+									<patternset>
+										<include name="**/jquery.atmosphere.js" />
+									</patternset>
+									<mapper type="flatten" />
+								</unzip>
+								<loadfile srcfile="${templates.dir}/jquery-1.11.0.js"
+									property="jquery.js.contents" />
+								<loadfile srcfile="${jquery.unpack}/jquery.atmosphere.js"
+									property="jquery.atmosphere.js.contents" />
+
+								<loadfile srcfile="${templates.dir}/vaadinPush.js.tpl"
+									property="vaadinPush.js.contents">
+									<filterchain>
+										<replacetokens begintoken="@" endtoken="@">
+											<token key="jquery.js" value="${jquery.js.contents}" />
+											<token key="jquery.atmosphere.js" value="${jquery.atmosphere.js.contents}" />
+										</replacetokens>
+									</filterchain>
+								</loadfile>
+								<!-- Non-obfuscated version for debugging -->
+								<echo file="${vaadinPush.js}">${vaadinPush.js.contents}</echo>
+
+							</target>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>compresspush</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<property name="vaadinPush.debug.js"
+									location="${project.build.outputDirectory}/VAADIN/vaadinPush.debug.js" />
+								<property name="vaadinPush-min.js"
+									location="${project.build.outputDirectory}/VAADIN/vaadinPush.debug-min.js" />
+								<property name="vaadinPush.js"
+									location="${project.build.outputDirectory}/VAADIN/vaadinPush.js" />
+
+								<move file="${vaadinPush-min.js}" tofile="${vaadinPush.js}" />
+
+								<!-- Gzipped versions -->
+								<gzip src="${vaadinPush.debug.js}" destfile="${vaadinPush.debug.js}.gz" />
+								<gzip src="${vaadinPush.js}" destfile="${vaadinPush.js}.gz" />
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>net.alchim31.maven</groupId>
+				<artifactId>yuicompressor-maven-plugin</artifactId>
+				<version>1.5.1</version>
+				<executions>
+					<execution>
+						<id>minifyjs</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>compress</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<sourceDirectory>${project.build.outputDirectory}/VAADIN</sourceDirectory>
+					<includes>
+						<include>vaadinPush.debug.js</include>
+					</includes>
+					<outputDirectory>${project.build.outputDirectory}/VAADIN</outputDirectory>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+						<Export-Package>VAADIN</Export-Package>
+						<Require-Bundle>com.vaadin.external.atmosphere.runtime;bundle-version="${atmosphere.runtime.version}";visibility:=reexport</Require-Bundle>
+					</instructions>
+				</configuration>
+				<executions>
+					<execution>
+						<id>bundle-manifest</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+						<index>false</index>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/push/lib/jquery/jquery-1.11.0.js b/push/src/main/templates/jquery-1.11.0.js
index 3c88fa8b7f..3c88fa8b7f 100644
--- a/push/lib/jquery/jquery-1.11.0.js
+++ b/push/src/main/templates/jquery-1.11.0.js
diff --git a/WebContent/VAADIN/vaadinPush.js.tpl b/push/src/main/templates/vaadinPush.js.tpl
index 3b2fb788f9..3b2fb788f9 100644
--- a/WebContent/VAADIN/vaadinPush.js.tpl
+++ b/push/src/main/templates/vaadinPush.js.tpl
diff --git a/scripts/BuildArchetypes.py b/scripts/BuildArchetypes.py
index 98fe787d77..802e97c78c 100644
--- a/scripts/BuildArchetypes.py
+++ b/scripts/BuildArchetypes.py
@@ -41,7 +41,7 @@ def generateArchetype(archetype, artifactId, repo):
 	cmd.append("-DarchetypeGroupId=%s" % (archetypeGroup))
 	cmd.append("-DarchetypeArtifactId=%s" % (archetype))
 	cmd.append("-DarchetypeVersion=%s" % (args.version))
-	if hasattr(args, "repo") and args.repo != None:
+	if repo is not None:
 		cmd.append("-DarchetypeRepository=%s" % repo)
 	cmd.append("-DgroupId=%s" % (group))
 	cmd.append("-DartifactId=%s" % (artifactId))
@@ -62,25 +62,22 @@ if __name__ == "__main__":
 	from BuildHelpers import mavenValidate, copyWarFiles, getLogFile, mavenCmd, updateRepositories, getArgs, removeDir, parser, resultPath
 	from DeployHelpers import deployWar
 
-	# Add command line arguments for staging repos
-	parser.add_argument("--repo", type=str, help="Staging repository URL", required=True)
-
 	archetypesFailed = False
 
 	# Parse the arguments
 	args = getArgs()
 
-	if hasattr(args, "artifactPath") and args.artifactPath is not None:
-		raise Exception("Archetype validation build does not support artifactPath")
-
 	wars = {}
 
 	for archetype in archetypes:
 		artifactId = "test-%s-%s" % (archetype, args.version.replace(".", "-"))
 		try:
 			log = getLogFile(archetype)
-			generateArchetype(archetype, artifactId, args.repo)
-			updateRepositories(join(resultPath, artifactId), args.repo)
+			generateArchetype(archetype, artifactId, args.pluginRepo)
+			if hasattr(args, "fwRepo") and args.fwRepo is not None:
+				updateRepositories(join(resultPath, artifactId), args.fwRepo)
+			if hasattr(args, "pluginRepo") and args.pluginRepo is not None:
+				updateRepositories(join(resultPath, artifactId), args.pluginRepo, postfix="plugin")
 			mavenValidate(artifactId, logFile=log)	
 			warFiles = copyWarFiles(artifactId, name=archetype)
 			for war in warFiles:
diff --git a/scripts/BuildDemos.py b/scripts/BuildDemos.py
index 7099230339..59cfe88a81 100644
--- a/scripts/BuildDemos.py
+++ b/scripts/BuildDemos.py
@@ -36,32 +36,9 @@ if __name__ == "__main__":
 		sys.exit(1)
 	from BuildHelpers import updateRepositories, mavenValidate, copyWarFiles, getLogFile, removeDir, getArgs, mavenInstall, resultPath, readPomFile, parser
 	from DeployHelpers import deployWar
-
-	# Add command line argument for staging repos
-	parser.add_argument("--repo", type=str, help="Staging repository URL", default=None)
-
 	# Add command line agrument for ignoring failing demos
 	parser.add_argument("--ignore", type=str, help="Ignored demos", default="")
-
 	args = getArgs()
-	if hasattr(args, "artifactPath") and args.artifactPath is not None:
-		version = False
-		basePath = args.artifactPath
-		poms = []
-		for root, dirs, files in os.walk(basePath):
-			for name in files:
-				if fnmatch(name, "*.pom"):
-					poms.append(join(root, name))
-		for pom in poms:
-			jarFile = pom.replace(".pom", ".jar")
-			if isfile(jarFile):
-				mavenInstall(pom, jarFile)
-			else:
-				mavenInstall(pom)
-			if "vaadin-server" in pom:
-				pomXml, nameSpace = readPomFile(pom)
-				for version in pomXml.getroot().findall("./{%s}version" % (nameSpace)):
-					args.version = version.text
 	demosFailed = False
 	ignoredDemos = args.ignore.split(",")
 	
@@ -75,8 +52,10 @@ if __name__ == "__main__":
 				checkout(demo, repo[0], repo[1])
 			else:
 				checkout(demo, repo)
-			if hasattr(args, "repo") and args.repo is not None:
-				updateRepositories(join(resultPath, demo), args.repo)
+			if hasattr(args, "fwRepo") and args.fwRepo is not None:
+				updateRepositories(join(resultPath, demo), args.fwRepo)
+			if hasattr(args, "pluginRepo") and args.pluginRepo is not None:
+				updateRepositories(join(resultPath, demo), args.pluginRepo, postfix="plugin")
 			mavenValidate(demo, logFile=getLogFile(demo))
 			wars.extend(copyWarFiles(demo))
 			print("%s demo validation succeeded!" % (demo))
diff --git a/scripts/BuildHelpers.py b/scripts/BuildHelpers.py
index 7545467f98..8f6e2dee60 100644
--- a/scripts/BuildHelpers.py
+++ b/scripts/BuildHelpers.py
@@ -25,9 +25,10 @@ args = None
 parser = argparse.ArgumentParser(description="Automated staging validation")
 group = parser.add_mutually_exclusive_group(required=True)
 group.add_argument("--version", help="Vaadin version to use")
-group.add_argument("--artifactPath", help="Path to local folder with Vaadin artifacts")
 
 parser.add_argument("--maven", help="Additional maven command line parameters", default=None)
+parser.add_argument("--fwRepo", help="Framework staging repository URL", default=None)
+parser.add_argument("--pluginRepo", help="Maven plugin repository URL", default=None)
 
 # Parse command line arguments <version>
 def parseArgs():
@@ -109,7 +110,7 @@ def readPomFile(pomFile):
 	return ElementTree.parse(pomFile), nameSpace 
 
 # Recursive pom.xml update script
-def updateRepositories(path, repoUrl = None, version = None):
+def updateRepositories(path, repoUrl = None, version = None, postfix = "staging"):
 	# If versions are not supplied, parse arguments
 	if version is None:
 		version = getArgs().version
@@ -129,7 +130,7 @@ def updateRepositories(path, repoUrl = None, version = None):
 		print("Add staging repositories to " + pomXml)
 		
 		# Add framework staging repository
-		addRepo(repoNode, "repository", "vaadin-%s-staging" % (version), repoUrl)
+		addRepo(repoNode, "repository", "vaadin-%s-%s" % (version, postfix), repoUrl)
 		
 		# Find the correct pluginRepositories node
 		pluginRepo = tree.getroot().find("{%s}pluginRepositories" % (nameSpace))
@@ -138,7 +139,7 @@ def updateRepositories(path, repoUrl = None, version = None):
 			pluginRepo = ElementTree.SubElement(tree.getroot(), "pluginRepositories")
 		
 		# Add plugin staging repository
-		addRepo(pluginRepo, "pluginRepository", "vaadin-%s-plugin-staging" % (version), repoUrl)
+		addRepo(pluginRepo, "pluginRepository", "vaadin-%s-%s" % (version, postfix), repoUrl)
 		
 		# Overwrite the modified pom.xml
 		tree.write(pomXml, encoding='UTF-8')
@@ -147,7 +148,7 @@ def updateRepositories(path, repoUrl = None, version = None):
 	for i in listdir(path):
 		file = join(path, i)
 		if isdir(file):
-			updateRepositories(join(path, i), repoUrl, version)
+			updateRepositories(join(path, i), repoUrl, version, postfix)
 
 # Add a repository of repoType to given repoNode with id and URL
 def addRepo(repoNode, repoType, id, url):
diff --git a/scripts/DeployHelpers.py b/scripts/DeployHelpers.py
index 12c7baaaec..038e187b8b 100644
--- a/scripts/DeployHelpers.py
+++ b/scripts/DeployHelpers.py
@@ -25,6 +25,10 @@ def testServer():
 
 	if serverUp is not None:
 		return serverUp
+	if getUrl() is None:
+		print("No deploy URL provided")
+		serverUp = False
+		return serverUp
 
 	print("Checking server status")
 	i = 0
diff --git a/scripts/GenerateBuildReport.py b/scripts/GenerateBuildReport.py
index eafdb39430..e812ac899e 100644
--- a/scripts/GenerateBuildReport.py
+++ b/scripts/GenerateBuildReport.py
@@ -1,19 +1,30 @@
 #coding=UTF-8
 
+from BuildArchetypes import archetypes, getDeploymentContext
 from BuildDemos import demos
-import argparse, subprocess
+import argparse, subprocess, cgi
 
 parser = argparse.ArgumentParser(description="Build report generator")
 parser.add_argument("version", type=str, help="Vaadin version that was just built")
 parser.add_argument("deployUrl", type=str, help="Base url of the deployment server")
 parser.add_argument("buildResultUrl", type=str, help="URL for the build result page")
 
+parser.add_argument("stagingRepo", type=str, help="URL for the staging repository")
+parser.add_argument("pluginRepo", type=str, help="URL for the maven plugin staging repository")
+parser.add_argument("tbapiUrl", type=str, help="URL for the TestBench API build")
+
+parser.add_argument("frameworkRevision", type=str, default="[fill in framework repository revision]", nargs="?")
+parser.add_argument("screenshotRevision", type=str, default="[fill in screenshot repository revision]", nargs="?")
+parser.add_argument("archetypeRevision", type=str, default="[fill in maven-integration repository revision]", nargs="?")
+parser.add_argument("mavenPluginRevision", type=str, default="[fill in maven-plugin repository revision]", nargs="?")
+
 args = parser.parse_args()
 
 content = """<html>
 <head></head>
 <body>
 <table>
+<tr><td><h2>Checks that might need a second build</h2></td></tr>
 <tr><td><a href="https://dev.vaadin.com/milestone?action=new">Create milestone for next release</a></td></tr>
 <tr><td><a href="https://dev.vaadin.com/query?status=closed&component=Core+Framework&resolution=fixed&milestone=!Vaadin {version}&col=id&col=summary&col=component&col=status&col=type&col=priority&col=milestone&order=priority">Closed fixed tickets without milestone {version}</a></td></tr>
 <tr><td><a href="https://dev.vaadin.com/query?status=closed&component=Core+Framework&resolution=fixed&milestone=Vaadin {version}&col=id&col=summary&col=component&col=milestone&col=status&col=type">Closed tickets with milestone {version}</a></td></tr>
@@ -26,7 +37,7 @@ content = """<html>
 try:
 	p1 = subprocess.Popen(['find', '.', '-name', '*.java'], stdout=subprocess.PIPE)
 	p2 = subprocess.Popen(['xargs', 'egrep', '-n', '@since ?$'], stdin=p1.stdout, stdout=subprocess.PIPE)
-	missing = subprocess.check_output(['egrep', '-v', '/(tests|result)/'], stdin=p2.stdout)
+	missing = subprocess.check_output(['egrep', '-v', '/(test|tests|target)/'], stdin=p2.stdout)
 	content += "<tr><td>Empty @since:<br>\n<pre>%s</pre></td></tr>\n" % (missing)
 except subprocess.CalledProcessError as e:
 	if e.returncode == 1:
@@ -34,10 +45,67 @@ except subprocess.CalledProcessError as e:
 	else:
 		raise e
 
-content += """<tr><td><a href="{url}">Build result page (See test results, pin and tag build and dependencies)</a></td></tr>
+content += "<tr><td>Try demos<ul>"
+
+for demo in demos:
+    content += "<li><a href='{url}/{demoName}-{version}'>{demoName}</a></li>\n".format(url=args.deployUrl, demoName=demo, version=args.version)
+
+content += "</ul></td></tr>\n<tr><td>Try archetype demos<ul>"
+
+for archetype in archetypes:
+    content += "<li><a href='{url}/{context}'>{demo}</a></li>\n".format(url=args.deployUrl, demo=archetype, context=getDeploymentContext(archetype, args.version))
+
+content += """</ul></td></tr>
+    <tr><td><a href="{repoUrl}">Staging repository</a></td></tr>
+    <tr><td><a href="{pluginRepoUrl}">Maven Plugin Staging repository</a></td></tr>
+    <tr><td>Eclipse Ivy Settings:<br><pre>""".format(repoUrl=args.stagingRepo, pluginRepoUrl=args.pluginRepo)
+content += cgi.escape("""	<ibiblio name="vaadin-staging" usepoms="true" m2compatible="true"
+    root="{repoUrl}" />""".format(repoUrl=args.stagingRepo))
+content += """</pre>
+    </td></tr>
+    <tr><td><h2>Preparations before publishing</h2></td></tr>
+    <tr><td><a href="https://dev.vaadin.com/milestone/Vaadin {version}">Close Trac Milestone</a></td></tr>
+    <tr><td><a href="https://dev.vaadin.com/query?status=pending-release&component=Core+Framework&resolution=fixed&col=id&col=summary&col=component&col=milestone&col=status&col=type">Verify pending release tickets still have milestone {version}</a></td></tr>
+    <tr><td><a href="https://dev.vaadin.com/admin/ticket/versions">Add version {version} to Trac</td></tr>
+    <tr><td><a href="{url}">Result page (See test results, pin and tag build and dependencies)</a></td></tr>
+    <tr><td>Commands to tag all repositories (warning: do not run as a single script but set variables and check before any push commands - this has not been tested yet and the change IDs are missing)</td></tr>
+    <tr><td><pre>
+    GERRIT_USER=[fill in your gerrit username]
+
+    VERSION={version}
+    FRAMEWORK_REVISION={frameworkRevision}
+    SCREENSHOTS_REVISION={screenshotRevision}
+    ARCHETYPES_REVISION={archetypeRevision}
+    PLUGIN_REVISION={mavenPluginRevision}
+    
+    git clone ssh://$GERRIT_USER@dev.vaadin.com:29418/vaadin
+    cd vaadin
+    git tag -a -m"$VERSION" $VERSION $FRAMEWORK_REVISION
+    git push --tags
+    cd ..
+    
+    git clone ssh://$GERRIT_USER@dev.vaadin.com:29418/vaadin-screenshots
+    cd vaadin-screenshots
+    git tag -a -m"$VERSION" $VERSION $SCREENSHOTS_REVISION
+    git push --tags
+    cd ..
+    
+    git clone ssh://$GERRIT_USER@dev.vaadin.com:29418/maven-integration
+    cd maven-integration
+    git tag -a -m"$VERSION" $VERSION $ARCHETYPES_REVISION
+    git push --tags
+    cd ..
+    
+    git clone ssh://$GERRIT_USER@dev.vaadin.com:29418/maven-plugin
+    cd maven-plugin
+    git tag -a -m"$VERSION" $VERSION $PLUGIN_REVISION
+    git push --tags
+    cd ..
+    </pre></td></tr>
+    <tr><td><a href="{tbapi}">Build and publish TestBench API for version {version} if proceeding</a></td></tr>
 </table>
 </body>
-</html>""".format(url=args.buildResultUrl)
+</html>""".format(url=args.buildResultUrl, repoUrl=args.stagingRepo, version=args.version, tbapi=args.tbapiUrl, frameworkRevision=args.frameworkRevision, screenshotRevision=args.screenshotRevision, archetypeRevision=args.archetypeRevision, mavenPluginRevision=args.mavenPluginRevision)
 
 f = open("result/report.html", 'w')
 f.write(content)
diff --git a/scripts/GenerateStagingReport.py b/scripts/GenerateStagingReport.py
deleted file mode 100644
index 963967d28a..0000000000
--- a/scripts/GenerateStagingReport.py
+++ /dev/null
@@ -1,88 +0,0 @@
-#coding=UTF-8
-
-from BuildArchetypes import archetypes, getDeploymentContext
-from BuildDemos import demos
-import argparse, cgi
-
-parser = argparse.ArgumentParser(description="Build report generator")
-parser.add_argument("version", type=str, help="Vaadin version that was just built")
-parser.add_argument("deployUrl", type=str, help="Base url of the deployment server")
-parser.add_argument("buildResultUrl", type=str, help="URL for the build result page")
-parser.add_argument("stagingRepo", type=str, help="URL for the staging repository")
-parser.add_argument("tbapiUrl", type=str, help="URL for the TestBench API build")
-
-parser.add_argument("frameworkRevision", type=str, default="[fill in framework repository revision]", nargs="?")
-parser.add_argument("screenshotRevision", type=str, default="[fill in screenshot repository revision]", nargs="?")
-parser.add_argument("archetypeRevision", type=str, default="[fill in maven-integration repository revision]", nargs="?")
-parser.add_argument("mavenPluginRevision", type=str, default="[fill in maven-plugin repository revision]", nargs="?")
-
-args = parser.parse_args()
-
-content = """<html>
-<head></head>
-<body>
-<table>
-"""
-
-content += "<tr><td>Try demos<ul>"
-
-for demo in demos:
-	content += "<li><a href='{url}/{demoName}-{version}'>{demoName}</a></li>\n".format(url=args.deployUrl, demoName=demo, version=args.version)
-
-content += "</ul></td></tr>\n<tr><td>Try archetype demos<ul>"
-
-for archetype in archetypes:
-	content += "<li><a href='{url}/{context}'>{demo}</a></li>\n".format(url=args.deployUrl, demo=archetype, context=getDeploymentContext(archetype, args.version))
-
-content += """</ul></td></tr>
-<tr><td><a href="{repoUrl}">Staging repository</a></td></tr>
-<tr><td>Eclipse Ivy Settings:<br><pre>""".format(repoUrl=args.stagingRepo)
-content += cgi.escape("""	<ibiblio name="vaadin-staging" usepoms="true" m2compatible="true" 
-		root="{repoUrl}" />""".format(repoUrl=args.stagingRepo))
-content += """</pre>
-</td></tr>
-<tr><td><a href="https://dev.vaadin.com/milestone/Vaadin {version}">Close Trac Milestone</a></td></tr>
-<tr><td><a href="https://dev.vaadin.com/query?status=pending-release&component=Core+Framework&resolution=fixed&col=id&col=summary&col=component&col=milestone&col=status&col=type">Verify pending release tickets still have milestone {version}</a></td></tr>
-<tr><td><a href="https://dev.vaadin.com/admin/ticket/versions">Add version {version} to Trac</td></tr>
-<tr><td><a href="{url}">Staging result page (See test results, pin and tag build and dependencies)</a></td></tr>
-<tr><td>Commands to tag all repositories (warning: do not run as a single script but set variables and check before any push commands - this has not been tested yet and the change IDs are missing)</td></tr>
-<tr><td><pre>
-VERSION={version}
-
-GERRIT_USER=[fill in your gerrit username]
-FRAMEWORK_REVISION={frameworkRevision}
-SCREENSHOTS_REVISION={screenshotRevision}
-ARCHETYPES_REVISION={archetypeRevision}
-PLUGIN_REVISION={mavenPluginRevision}
-
-git clone ssh://$GERRIT_USER@dev.vaadin.com:29418/vaadin
-cd vaadin
-git tag -a -m"$VERSION" $VERSION $FRAMEWORK_REVISION
-git push --tags
-cd ..
-
-git clone ssh://$GERRIT_USER@dev.vaadin.com:29418/vaadin-screenshots
-cd vaadin-screenshots
-git tag -a -m"$VERSION" $VERSION $SCREENSHOTS_REVISION
-git push --tags
-cd ..
-
-git clone ssh://$GERRIT_USER@dev.vaadin.com:29418/maven-integration
-cd maven-integration
-git tag -a -m"$VERSION" $VERSION $ARCHETYPES_REVISION
-git push --tags
-cd ..
-
-git clone ssh://$GERRIT_USER@dev.vaadin.com:29418/maven-plugin
-cd maven-plugin
-git tag -a -m"$VERSION" $VERSION $PLUGIN_REVISION
-git push --tags
-cd ..
-</pre></td></tr>
-<tr><td><a href="{tbapi}">Build and publish TestBench API for version {version} if proceeding</a></td></tr>
-</table>
-</body>
-</html>""".format(url=args.buildResultUrl, repoUrl=args.stagingRepo, version=args.version, tbapi=args.tbapiUrl, frameworkRevision=args.frameworkRevision, screenshotRevision=args.screenshotRevision, archetypeRevision=args.archetypeRevision, mavenPluginRevision=args.mavenPluginRevision)
-
-f = open("result/report.html", 'w')
-f.write(content)
diff --git a/server/build.xml b/server/build.xml
deleted file mode 100644
index 95c0b0add4..0000000000
--- a/server/build.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="vaadin-server" basedir="." default="publish-local"
-    xmlns:ivy="antlib:org.apache.ivy.ant">
-    <description>
-        Compiles build helpers used when building other
-        modules.
-    </description>
-    <include file="../common.xml" as="common" />
-    <include file="../build.xml" as="vaadin" />
-    <include file="../gwt-files.xml" as="gwtfiles" />
-
-    <!-- global properties -->
-    <property name="module.name" value="vaadin-server" />
-    <property name="module.symbolic" value="com.vaadin.server" />
-    <property name="result.dir" value="result" />
-    <path id="classpath.compile.custom" />
-    <path id="classpath.test.custom" />
-
-    <union id="jar.includes">
-        <union refid="server.gwt.includes" />
-        <fileset dir="${vaadin.basedir}/WebContent">
-            <include name="VAADIN/vaadinBootstrap.js" />
-        </fileset>
-        <fileset dir="${result.dir}">
-            <include name="VAADIN/*" />
-        </fileset>
-    </union>
-
-    <target name="compress-files">
-        <mkdir dir="${result.dir}/VAADIN" />
-        <gzip src="${vaadin.basedir}/WebContent/VAADIN/vaadinBootstrap.js"
-            destfile="${result.dir}/VAADIN/vaadinBootstrap.js.gz" />
-    </target>
-    <target name="jar" depends="compress-files">
-        <property name="server.osgi.import"
-            value="javax.servlet;version=&quot;2.4.0&quot;,javax.servlet.http;version=&quot;2.4.0&quot;,javax.validation;version=&quot;1.0.0.GA&quot;;resolution:=optional,org.jsoup;version=&quot;1.6.3&quot;,org.jsoup.parser;version=&quot;1.6.3&quot;,org.jsoup.nodes;version=&quot;1.6.3&quot;,org.jsoup.helper;version=&quot;1.6.3&quot;,org.jsoup.safety;version=&quot;1.6.3&quot;,org.jsoup.select;version=&quot;1.6.3&quot;,javax.portlet;version=&quot;[2.0,3)&quot;;resolution:=optional,javax.portlet.filter;version=&quot;[2.0,3)&quot;;resolution:=optional,com.liferay.portal.kernel.util;resolution:=optional" />
-        <property name="server.osgi.require"
-            value="com.google.gwt.thirdparty.guava;bundle-version=&quot;16.0.1.vaadin1&quot;,com.vaadin.shared;bundle-version=&quot;${vaadin.version}&quot;,com.vaadin.push;bundle-version=&quot;${vaadin.version}&quot;;resolution:=optional,com.vaadin.sass-compiler;bundle-version=&quot;${vaadin.sass.version}&quot;;resolution:=optional" />
-        <antcall target="common.jar">
-            <param name="require-bundle" value="${server.osgi.require}" />
-            <param name="import-package" value="${server.osgi.import}" />
-            <param name="osgi.extra.package.prefixes" value="VAADIN" />
-            <reference torefid="extra.jar.includes" refid="jar.includes" />
-        </antcall>
-    </target>
-
-    <target name="publish-local" depends="jar">
-        <antcall target="common.sources.jar">
-            <reference torefid="extra.jar.includes" refid="server.gwt.includes" />
-        </antcall>
-        <antcall target="common.javadoc.jar" />
-
-        <antcall target="common.publish-local" />
-    </target>
-
-    <target name="clean">
-        <antcall target="common.clean" />
-    </target>
-
-    <target name="checkstyle">
-        <antcall target="common.checkstyle">
-            <param name="cs.src" location="src" />
-        </antcall>
-    </target>
-
-    <target name="test" depends="checkstyle">
-        <antcall target="common.test.run" />
-    </target>
-
-
-</project>
diff --git a/server/ivy.xml b/server/ivy.xml
deleted file mode 100644
index b02ab123fb..0000000000
--- a/server/ivy.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
-    xmlns:m="http://ant.apache.org/ivy/maven">
-
-    <info organisation="com.vaadin" module="vaadin-server"
-        revision="${vaadin.version}" />
-
-    <configurations>
-        <conf name="build" />
-        <conf name="build-provided" />
-        <conf name="ide" visibility="private" />
-        <conf name="test" visibility="private" />
-    </configurations>
-    <publications>
-        <artifact type="jar" ext="jar" />
-        <artifact type="source" ext="jar" m:classifier="sources" />
-        <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
-        <artifact type="pom" ext="pom" />
-    </publications>
-    <dependencies>
-        <!-- API DEPENDENCIES -->
-
-        <!-- Liferay Portal Service -->
-        <dependency org="com.liferay.portal" name="portal-service"
-            rev="6.0.2" conf="build-provided,ide -> default" />
-
-        <!--Servlet API version 3.0 -->
-        <dependency org="javax.servlet" name="javax.servlet-api"
-            rev="3.0.1" conf="build-provided,ide,test -> default" />
-
-        <!--Portlet API version 2.0 (JSR-286) -->
-        <dependency org="javax.portlet" name="portlet-api"
-            rev="2.0" conf="build-provided,ide,test -> default" />
-
-        <!-- Google App Engine -->
-        <dependency org="com.google.appengine" name="appengine-api-1.0-sdk"
-            rev="1.7.7" conf="build-provided,ide,test -> default" />
-
-        <!-- Bean Validation API -->
-        <dependency org="javax.validation" name="validation-api"
-            rev="1.0.0.GA" conf="build-provided,ide,test -> default" />
-
-        <!-- Sass compiler -->
-        <dependency org="com.vaadin" name="vaadin-sass-compiler"
-                    rev="${vaadin.sass.version}" conf="build,ide,test->default">
-            <exclude type="pom" conf="test" />
-        </dependency>
-
-        <!-- LIBRARY DEPENDENCIES (compile time) -->
-        <!-- Project modules -->
-        <dependency org="com.vaadin" name="vaadin-shared"
-            rev="${vaadin.version}" conf="build,test->build">
-            <exclude type="pom" conf="test" />
-        </dependency>
-        <dependency org="com.vaadin" name="vaadin-push" rev="${vaadin.version}"
-            conf="build-provided,test->build">
-            <exclude type="pom" conf="test" />
-        </dependency>
-
-        <!-- Jsoup for BootstrapHandler -->
-        <dependency org="org.jsoup" name="jsoup" rev="1.8.3"
-            conf="build,ide,test -> default" />
-
-        <!-- TESTING DEPENDENCIES -->
-
-        <!-- Test frameworks & related -->
-        <dependency org="junit" name="junit" rev="4.11"
-            conf="test,ide -> default" />
-        <dependency org="org.mockito" name="mockito-all" rev="1.9.5"
-            conf="test,ide->default" />
-        <dependency org="org.hamcrest" name="hamcrest-all" rev="1.3"
-                    conf="test,ide->default" />
-        <dependency org="org.easymock" name="easymock" rev="3.0"
-            conf="test,ide-> default" transitive="true" />
-        <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6"
-            conf="test,ide -> default" />
-        <dependency org="commons-io" name="commons-io" rev="${commons-io.version}"
-            conf="test->default" />
-        <dependency org="commons-lang" name="commons-lang"
-            rev="2.6" conf="test,ide->default" />
-        <!-- Bean Validation implementation -->
-        <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1"
-            conf="test -> default" />
-        <dependency org="org.hibernate" name="hibernate-validator"
-            rev="4.2.0.Final" conf="test -> default" />
-
-        <!-- For manual testing with PostgreSQL (see SQLTestConstants) -->
-        <!-- <dependency org="postgresql" name="postgresql" rev="9.1-901.jdbc3" 
-            conf="test,ide->default" /> -->
-
-        <!-- remove cssparser override once sass-compiler is updated -->
-        <override org="net.sourceforge.cssparser" module="cssparser"
-                  rev="0.9.11" />
-    </dependencies>
-
-</ivy-module>
diff --git a/server/pom.xml b/server/pom.xml
new file mode 100644
index 0000000000..92ed9c2713
--- /dev/null
+++ b/server/pom.xml
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.vaadin</groupId>
+		<artifactId>vaadin-root</artifactId>
+		<version>7.7.0-SNAPSHOT</version>
+	</parent>
+	<groupId>com.vaadin</groupId>
+	<artifactId>vaadin-server</artifactId>
+	<name>vaadin-server</name>
+	<packaging>jar</packaging>
+
+	<url>https://vaadin.com/</url>
+	<description>Vaadin server</description>
+
+	<dependencies>
+		<!-- API DEPENDENCIES -->
+
+		<!-- Liferay Portal Service -->
+		<dependency>
+			<groupId>com.liferay.portal</groupId>
+			<artifactId>portal-service</artifactId>
+			<version>${liferay.portal.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!--Servlet API version 3.0 -->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>${javax.servlet.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!--Portlet API version 2.0 (JSR-286) -->
+		<dependency>
+			<groupId>javax.portlet</groupId>
+			<artifactId>portlet-api</artifactId>
+			<version>${javax.portlet.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- Google App Engine -->
+		<dependency>
+			<groupId>com.google.appengine</groupId>
+			<artifactId>appengine-api-1.0-sdk</artifactId>
+			<version>${google.appengine.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- Bean Validation API -->
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>${javax.validation.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- Sass compiler -->
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-sass-compiler</artifactId>
+			<version>${vaadin.sass.version}</version>
+		</dependency>
+
+		<!-- LIBRARY DEPENDENCIES (compile time) -->
+		<!-- Project modules -->
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-shared</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-push</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- Jsoup for BootstrapHandler -->
+		<dependency>
+			<groupId>org.jsoup</groupId>
+			<artifactId>jsoup</artifactId>
+			<version>${jsoup.version}</version>
+		</dependency>
+
+		<!-- TESTING DEPENDENCIES -->
+
+		<!-- Test frameworks & related -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.9.5</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-all</artifactId>
+			<version>1.3</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.easymock</groupId>
+			<artifactId>easymock</artifactId>
+			<version>3.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<version>2.2.6</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>${commons-io.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.6</version>
+			<scope>test</scope>
+		</dependency>
+		<!-- Bean Validation implementation -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>1.6.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>4.2.0.Final</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- For manual testing with PostgreSQL (see SQLTestConstants) -->
+		<!-- <dependency><groupId>postgresql</groupId><artifactId>postgresql</artifactId><version>9.1-901.jdbc3</version></dependency> -->
+
+		<!-- Needed GWT dependencies. Required parts are packaged to jar -->
+		<dependency>
+			<groupId>com.vaadin.external.gwt</groupId>
+			<artifactId>gwt-user</artifactId>
+			<version>${vaadin.gwt.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin.external.gwt</groupId>
+			<artifactId>gwt-elemental</artifactId>
+			<version>${vaadin.gwt.version}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<!-- Copy needed GWT dependencies to package -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>unpack-dependencies</id>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>com.vaadin.external.gwt</groupId>
+									<artifactId>gwt-user</artifactId>
+								</artifactItem>
+							</artifactItems>
+							<includes>com/google/gwt/*/server/**</includes>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<!-- Copy .java files to package -->
+					<execution>
+						<id>copy-sources</id>
+						<!-- here the phase you need -->
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.outputDirectory}</outputDirectory>
+							<resources>
+								<resource>
+									<directory>src/main/resources</directory>
+									<filtering>false</filtering>
+								</resource>
+								<resource>
+									<directory>src/main/java</directory>
+									<filtering>false</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>checkstyle</goal>
+						</goals>
+						<phase>process-sources</phase>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>compressbootstrap</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<property name="vaadinBootstrap.js"
+									location="${project.build.outputDirectory}/VAADIN/vaadinBootstrap.js" />
+
+								<!-- Gzipped version -->
+								<gzip src="${vaadinBootstrap.js}" destfile="${vaadinBootstrap.js}.gz" />
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+						<Export-Package>com.vaadin.*;version="${project.version}",com.google.*;version="${project.version}"</Export-Package>
+						<Import-Package>javax.servlet;version="${javax.servlet.version}",
+							javax.servlet.http;version="${javax.servlet.version}",
+							javax.validation;version="${javax.validation.version}";resolution:=optional,
+							org.jsoup;version="${jsoup.version}",
+							org.jsoup.parser;version="${jsoup.version}",
+							org.jsoup.nodes;version="${jsoup.version}",
+							org.jsoup.helper;version="${jsoup.version}",
+							org.jsoup.safety;version="${jsoup.version}",
+							org.jsoup.select;version="${jsoup.version}",
+							javax.portlet;version="[${javax.portlet.version},3)";resolution:=optional,
+							javax.portlet.filter;version="[${javax.portlet.version},3)";resolution:=optional,
+							com.liferay.portal.kernel.util;resolution:=optional</Import-Package>
+						<Require-Bundle>com.google.gwt.thirdparty.guava;bundle-version="${guava.version}",
+							com.vaadin.shared;bundle-version="${project.version}",
+							com.vaadin.push;bundle-version="${project.version}";resolution:=optional,
+							com.vaadin.sass-compiler;bundle-version="${vaadin.sass.version}";resolution:=optional"</Require-Bundle>
+					</instructions>
+				</configuration>
+				<executions>
+					<execution>
+						<id>bundle-manifest</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+						<index>false</index>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/server/src/com/vaadin/annotations/AutoGenerated.java b/server/src/main/java/com/vaadin/annotations/AutoGenerated.java
index 1ad9f67ad1..1ad9f67ad1 100644
--- a/server/src/com/vaadin/annotations/AutoGenerated.java
+++ b/server/src/main/java/com/vaadin/annotations/AutoGenerated.java
diff --git a/server/src/com/vaadin/annotations/DesignRoot.java b/server/src/main/java/com/vaadin/annotations/DesignRoot.java
index a00a00dc0b..a00a00dc0b 100644
--- a/server/src/com/vaadin/annotations/DesignRoot.java
+++ b/server/src/main/java/com/vaadin/annotations/DesignRoot.java
diff --git a/server/src/com/vaadin/annotations/JavaScript.java b/server/src/main/java/com/vaadin/annotations/JavaScript.java
index 445ef75ddf..445ef75ddf 100644
--- a/server/src/com/vaadin/annotations/JavaScript.java
+++ b/server/src/main/java/com/vaadin/annotations/JavaScript.java
diff --git a/server/src/com/vaadin/annotations/PreserveOnRefresh.java b/server/src/main/java/com/vaadin/annotations/PreserveOnRefresh.java
index 86723b97fc..86723b97fc 100644
--- a/server/src/com/vaadin/annotations/PreserveOnRefresh.java
+++ b/server/src/main/java/com/vaadin/annotations/PreserveOnRefresh.java
diff --git a/server/src/com/vaadin/annotations/Push.java b/server/src/main/java/com/vaadin/annotations/Push.java
index 736bc4488b..736bc4488b 100644
--- a/server/src/com/vaadin/annotations/Push.java
+++ b/server/src/main/java/com/vaadin/annotations/Push.java
diff --git a/server/src/com/vaadin/annotations/StyleSheet.java b/server/src/main/java/com/vaadin/annotations/StyleSheet.java
index 191e39ee24..191e39ee24 100644
--- a/server/src/com/vaadin/annotations/StyleSheet.java
+++ b/server/src/main/java/com/vaadin/annotations/StyleSheet.java
diff --git a/server/src/com/vaadin/annotations/Theme.java b/server/src/main/java/com/vaadin/annotations/Theme.java
index 03fa1179bc..03fa1179bc 100644
--- a/server/src/com/vaadin/annotations/Theme.java
+++ b/server/src/main/java/com/vaadin/annotations/Theme.java
diff --git a/server/src/com/vaadin/annotations/Title.java b/server/src/main/java/com/vaadin/annotations/Title.java
index 07eaf17e33..07eaf17e33 100644
--- a/server/src/com/vaadin/annotations/Title.java
+++ b/server/src/main/java/com/vaadin/annotations/Title.java
diff --git a/server/src/com/vaadin/annotations/VaadinServletConfiguration.java b/server/src/main/java/com/vaadin/annotations/VaadinServletConfiguration.java
index 907f2c3a0c..907f2c3a0c 100644
--- a/server/src/com/vaadin/annotations/VaadinServletConfiguration.java
+++ b/server/src/main/java/com/vaadin/annotations/VaadinServletConfiguration.java
diff --git a/server/src/com/vaadin/annotations/Viewport.java b/server/src/main/java/com/vaadin/annotations/Viewport.java
index c5b0abd56f..c5b0abd56f 100644
--- a/server/src/com/vaadin/annotations/Viewport.java
+++ b/server/src/main/java/com/vaadin/annotations/Viewport.java
diff --git a/server/src/com/vaadin/annotations/ViewportGeneratorClass.java b/server/src/main/java/com/vaadin/annotations/ViewportGeneratorClass.java
index aec7ac07e6..aec7ac07e6 100644
--- a/server/src/com/vaadin/annotations/ViewportGeneratorClass.java
+++ b/server/src/main/java/com/vaadin/annotations/ViewportGeneratorClass.java
diff --git a/server/src/com/vaadin/annotations/Widgetset.java b/server/src/main/java/com/vaadin/annotations/Widgetset.java
index 2dcf93af13..2dcf93af13 100644
--- a/server/src/com/vaadin/annotations/Widgetset.java
+++ b/server/src/main/java/com/vaadin/annotations/Widgetset.java
diff --git a/server/src/com/vaadin/data/Buffered.java b/server/src/main/java/com/vaadin/data/Buffered.java
index 469f9987a4..469f9987a4 100644
--- a/server/src/com/vaadin/data/Buffered.java
+++ b/server/src/main/java/com/vaadin/data/Buffered.java
diff --git a/server/src/com/vaadin/data/BufferedValidatable.java b/server/src/main/java/com/vaadin/data/BufferedValidatable.java
index 6f9d952d2f..6f9d952d2f 100644
--- a/server/src/com/vaadin/data/BufferedValidatable.java
+++ b/server/src/main/java/com/vaadin/data/BufferedValidatable.java
diff --git a/server/src/com/vaadin/data/Collapsible.java b/server/src/main/java/com/vaadin/data/Collapsible.java
index 0ef290312d..0ef290312d 100644
--- a/server/src/com/vaadin/data/Collapsible.java
+++ b/server/src/main/java/com/vaadin/data/Collapsible.java
diff --git a/server/src/com/vaadin/data/Container.java b/server/src/main/java/com/vaadin/data/Container.java
index fb7a93e832..fb7a93e832 100644
--- a/server/src/com/vaadin/data/Container.java
+++ b/server/src/main/java/com/vaadin/data/Container.java
diff --git a/server/src/com/vaadin/data/ContainerHelpers.java b/server/src/main/java/com/vaadin/data/ContainerHelpers.java
index 817bec9474..817bec9474 100644
--- a/server/src/com/vaadin/data/ContainerHelpers.java
+++ b/server/src/main/java/com/vaadin/data/ContainerHelpers.java
diff --git a/server/src/com/vaadin/data/Item.java b/server/src/main/java/com/vaadin/data/Item.java
index 13f965f098..13f965f098 100644
--- a/server/src/com/vaadin/data/Item.java
+++ b/server/src/main/java/com/vaadin/data/Item.java
diff --git a/server/src/com/vaadin/data/Property.java b/server/src/main/java/com/vaadin/data/Property.java
index 74ae1f86ec..74ae1f86ec 100644
--- a/server/src/com/vaadin/data/Property.java
+++ b/server/src/main/java/com/vaadin/data/Property.java
diff --git a/server/src/com/vaadin/data/Validatable.java b/server/src/main/java/com/vaadin/data/Validatable.java
index 1ae7cd8cee..1ae7cd8cee 100644
--- a/server/src/com/vaadin/data/Validatable.java
+++ b/server/src/main/java/com/vaadin/data/Validatable.java
diff --git a/server/src/com/vaadin/data/Validator.java b/server/src/main/java/com/vaadin/data/Validator.java
index d567267338..d567267338 100644
--- a/server/src/com/vaadin/data/Validator.java
+++ b/server/src/main/java/com/vaadin/data/Validator.java
diff --git a/server/src/com/vaadin/data/fieldgroup/BeanFieldGroup.java b/server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java
index 0a92c00cad..0a92c00cad 100644
--- a/server/src/com/vaadin/data/fieldgroup/BeanFieldGroup.java
+++ b/server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java
diff --git a/server/src/com/vaadin/data/fieldgroup/Caption.java b/server/src/main/java/com/vaadin/data/fieldgroup/Caption.java
index efe6f99d9a..efe6f99d9a 100644
--- a/server/src/com/vaadin/data/fieldgroup/Caption.java
+++ b/server/src/main/java/com/vaadin/data/fieldgroup/Caption.java
diff --git a/server/src/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java b/server/src/main/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java
index b6bf97e68e..b6bf97e68e 100644
--- a/server/src/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java
+++ b/server/src/main/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java
diff --git a/server/src/com/vaadin/data/fieldgroup/FieldGroup.java b/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java
index aaaae9e4f7..aaaae9e4f7 100644
--- a/server/src/com/vaadin/data/fieldgroup/FieldGroup.java
+++ b/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java
diff --git a/server/src/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java b/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java
index 4aad08ba8d..4aad08ba8d 100644
--- a/server/src/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java
+++ b/server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java
diff --git a/server/src/com/vaadin/data/fieldgroup/PropertyId.java b/server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java
index e7fe50305e..e7fe50305e 100644
--- a/server/src/com/vaadin/data/fieldgroup/PropertyId.java
+++ b/server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java
diff --git a/server/src/com/vaadin/data/sort/Sort.java b/server/src/main/java/com/vaadin/data/sort/Sort.java
index 81e0d08c73..81e0d08c73 100644
--- a/server/src/com/vaadin/data/sort/Sort.java
+++ b/server/src/main/java/com/vaadin/data/sort/Sort.java
diff --git a/server/src/com/vaadin/data/sort/SortOrder.java b/server/src/main/java/com/vaadin/data/sort/SortOrder.java
index 2c419f88b7..2c419f88b7 100644
--- a/server/src/com/vaadin/data/sort/SortOrder.java
+++ b/server/src/main/java/com/vaadin/data/sort/SortOrder.java
diff --git a/server/src/com/vaadin/data/util/AbstractBeanContainer.java b/server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java
index 6dcfbb2b84..6dcfbb2b84 100644
--- a/server/src/com/vaadin/data/util/AbstractBeanContainer.java
+++ b/server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java
diff --git a/server/src/com/vaadin/data/util/AbstractContainer.java b/server/src/main/java/com/vaadin/data/util/AbstractContainer.java
index dafdd15b06..dafdd15b06 100644
--- a/server/src/com/vaadin/data/util/AbstractContainer.java
+++ b/server/src/main/java/com/vaadin/data/util/AbstractContainer.java
diff --git a/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java b/server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java
index f7b1a4b0d8..f7b1a4b0d8 100644
--- a/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
+++ b/server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java
diff --git a/server/src/com/vaadin/data/util/AbstractProperty.java b/server/src/main/java/com/vaadin/data/util/AbstractProperty.java
index ee79fcd91e..ee79fcd91e 100644
--- a/server/src/com/vaadin/data/util/AbstractProperty.java
+++ b/server/src/main/java/com/vaadin/data/util/AbstractProperty.java
diff --git a/server/src/com/vaadin/data/util/BeanContainer.java b/server/src/main/java/com/vaadin/data/util/BeanContainer.java
index 9b878d627e..9b878d627e 100644
--- a/server/src/com/vaadin/data/util/BeanContainer.java
+++ b/server/src/main/java/com/vaadin/data/util/BeanContainer.java
diff --git a/server/src/com/vaadin/data/util/BeanItem.java b/server/src/main/java/com/vaadin/data/util/BeanItem.java
index 71f51c3feb..71f51c3feb 100644
--- a/server/src/com/vaadin/data/util/BeanItem.java
+++ b/server/src/main/java/com/vaadin/data/util/BeanItem.java
diff --git a/server/src/com/vaadin/data/util/BeanItemContainer.java b/server/src/main/java/com/vaadin/data/util/BeanItemContainer.java
index d5d399f0f8..d5d399f0f8 100644
--- a/server/src/com/vaadin/data/util/BeanItemContainer.java
+++ b/server/src/main/java/com/vaadin/data/util/BeanItemContainer.java
diff --git a/server/src/com/vaadin/data/util/BeanUtil.java b/server/src/main/java/com/vaadin/data/util/BeanUtil.java
index 1356cf5359..1356cf5359 100644
--- a/server/src/com/vaadin/data/util/BeanUtil.java
+++ b/server/src/main/java/com/vaadin/data/util/BeanUtil.java
diff --git a/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java
index 199d186fab..199d186fab 100644
--- a/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
+++ b/server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java
diff --git a/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java b/server/src/main/java/com/vaadin/data/util/ContainerOrderedWrapper.java
index 4329219e96..4329219e96 100644
--- a/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java
+++ b/server/src/main/java/com/vaadin/data/util/ContainerOrderedWrapper.java
diff --git a/server/src/com/vaadin/data/util/DefaultItemSorter.java b/server/src/main/java/com/vaadin/data/util/DefaultItemSorter.java
index 9728ccbd51..9728ccbd51 100644
--- a/server/src/com/vaadin/data/util/DefaultItemSorter.java
+++ b/server/src/main/java/com/vaadin/data/util/DefaultItemSorter.java
diff --git a/server/src/com/vaadin/data/util/FilesystemContainer.java b/server/src/main/java/com/vaadin/data/util/FilesystemContainer.java
index 7ceda49918..7ceda49918 100644
--- a/server/src/com/vaadin/data/util/FilesystemContainer.java
+++ b/server/src/main/java/com/vaadin/data/util/FilesystemContainer.java
diff --git a/server/src/com/vaadin/data/util/GeneratedPropertyContainer.java b/server/src/main/java/com/vaadin/data/util/GeneratedPropertyContainer.java
index 98dd3ed0c1..98dd3ed0c1 100644
--- a/server/src/com/vaadin/data/util/GeneratedPropertyContainer.java
+++ b/server/src/main/java/com/vaadin/data/util/GeneratedPropertyContainer.java
diff --git a/server/src/com/vaadin/data/util/HierarchicalContainer.java b/server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java
index 2235e77b34..2235e77b34 100644
--- a/server/src/com/vaadin/data/util/HierarchicalContainer.java
+++ b/server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java
diff --git a/server/src/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java b/server/src/main/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java
index 1c7960f954..1c7960f954 100644
--- a/server/src/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java
+++ b/server/src/main/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java
diff --git a/server/src/com/vaadin/data/util/IndexedContainer.java b/server/src/main/java/com/vaadin/data/util/IndexedContainer.java
index 8783c061ac..8783c061ac 100644
--- a/server/src/com/vaadin/data/util/IndexedContainer.java
+++ b/server/src/main/java/com/vaadin/data/util/IndexedContainer.java
diff --git a/server/src/com/vaadin/data/util/ItemSorter.java b/server/src/main/java/com/vaadin/data/util/ItemSorter.java
index 141f84ad43..141f84ad43 100644
--- a/server/src/com/vaadin/data/util/ItemSorter.java
+++ b/server/src/main/java/com/vaadin/data/util/ItemSorter.java
diff --git a/server/src/com/vaadin/data/util/LegacyPropertyHelper.java b/server/src/main/java/com/vaadin/data/util/LegacyPropertyHelper.java
index 7432d036fb..7432d036fb 100644
--- a/server/src/com/vaadin/data/util/LegacyPropertyHelper.java
+++ b/server/src/main/java/com/vaadin/data/util/LegacyPropertyHelper.java
diff --git a/server/src/com/vaadin/data/util/ListSet.java b/server/src/main/java/com/vaadin/data/util/ListSet.java
index ccc9e0dbfd..ccc9e0dbfd 100644
--- a/server/src/com/vaadin/data/util/ListSet.java
+++ b/server/src/main/java/com/vaadin/data/util/ListSet.java
diff --git a/server/src/com/vaadin/data/util/MethodProperty.java b/server/src/main/java/com/vaadin/data/util/MethodProperty.java
index 83279afa53..83279afa53 100644
--- a/server/src/com/vaadin/data/util/MethodProperty.java
+++ b/server/src/main/java/com/vaadin/data/util/MethodProperty.java
diff --git a/server/src/com/vaadin/data/util/MethodPropertyDescriptor.java b/server/src/main/java/com/vaadin/data/util/MethodPropertyDescriptor.java
index f94ee75ac3..f94ee75ac3 100644
--- a/server/src/com/vaadin/data/util/MethodPropertyDescriptor.java
+++ b/server/src/main/java/com/vaadin/data/util/MethodPropertyDescriptor.java
diff --git a/server/src/com/vaadin/data/util/NestedMethodProperty.java b/server/src/main/java/com/vaadin/data/util/NestedMethodProperty.java
index 29fe62f845..29fe62f845 100644
--- a/server/src/com/vaadin/data/util/NestedMethodProperty.java
+++ b/server/src/main/java/com/vaadin/data/util/NestedMethodProperty.java
diff --git a/server/src/com/vaadin/data/util/NestedPropertyDescriptor.java b/server/src/main/java/com/vaadin/data/util/NestedPropertyDescriptor.java
index ca423b34ed..ca423b34ed 100644
--- a/server/src/com/vaadin/data/util/NestedPropertyDescriptor.java
+++ b/server/src/main/java/com/vaadin/data/util/NestedPropertyDescriptor.java
diff --git a/server/src/com/vaadin/data/util/ObjectProperty.java b/server/src/main/java/com/vaadin/data/util/ObjectProperty.java
index 8a2daa443c..8a2daa443c 100644
--- a/server/src/com/vaadin/data/util/ObjectProperty.java
+++ b/server/src/main/java/com/vaadin/data/util/ObjectProperty.java
diff --git a/server/src/com/vaadin/data/util/PropertyFormatter.java b/server/src/main/java/com/vaadin/data/util/PropertyFormatter.java
index e188ce8bc3..e188ce8bc3 100644
--- a/server/src/com/vaadin/data/util/PropertyFormatter.java
+++ b/server/src/main/java/com/vaadin/data/util/PropertyFormatter.java
diff --git a/server/src/com/vaadin/data/util/PropertyValueGenerator.java b/server/src/main/java/com/vaadin/data/util/PropertyValueGenerator.java
index 453e45b1db..453e45b1db 100644
--- a/server/src/com/vaadin/data/util/PropertyValueGenerator.java
+++ b/server/src/main/java/com/vaadin/data/util/PropertyValueGenerator.java
diff --git a/server/src/com/vaadin/data/util/PropertysetItem.java b/server/src/main/java/com/vaadin/data/util/PropertysetItem.java
index f463a52f54..f463a52f54 100644
--- a/server/src/com/vaadin/data/util/PropertysetItem.java
+++ b/server/src/main/java/com/vaadin/data/util/PropertysetItem.java
diff --git a/server/src/com/vaadin/data/util/TextFileProperty.java b/server/src/main/java/com/vaadin/data/util/TextFileProperty.java
index 22fd8168a1..22fd8168a1 100644
--- a/server/src/com/vaadin/data/util/TextFileProperty.java
+++ b/server/src/main/java/com/vaadin/data/util/TextFileProperty.java
diff --git a/server/src/com/vaadin/data/util/TransactionalPropertyWrapper.java b/server/src/main/java/com/vaadin/data/util/TransactionalPropertyWrapper.java
index c3cef6a0ec..c3cef6a0ec 100644
--- a/server/src/com/vaadin/data/util/TransactionalPropertyWrapper.java
+++ b/server/src/main/java/com/vaadin/data/util/TransactionalPropertyWrapper.java
diff --git a/server/src/com/vaadin/data/util/VaadinPropertyDescriptor.java b/server/src/main/java/com/vaadin/data/util/VaadinPropertyDescriptor.java
index 51084d9115..51084d9115 100644
--- a/server/src/com/vaadin/data/util/VaadinPropertyDescriptor.java
+++ b/server/src/main/java/com/vaadin/data/util/VaadinPropertyDescriptor.java
diff --git a/server/src/com/vaadin/data/util/converter/AbstractStringToNumberConverter.java b/server/src/main/java/com/vaadin/data/util/converter/AbstractStringToNumberConverter.java
index 81f1a85f89..81f1a85f89 100644
--- a/server/src/com/vaadin/data/util/converter/AbstractStringToNumberConverter.java
+++ b/server/src/main/java/com/vaadin/data/util/converter/AbstractStringToNumberConverter.java
diff --git a/server/src/com/vaadin/data/util/converter/Converter.java b/server/src/main/java/com/vaadin/data/util/converter/Converter.java
index a7188ebb33..a7188ebb33 100644
--- a/server/src/com/vaadin/data/util/converter/Converter.java
+++ b/server/src/main/java/com/vaadin/data/util/converter/Converter.java
diff --git a/server/src/com/vaadin/data/util/converter/ConverterFactory.java b/server/src/main/java/com/vaadin/data/util/converter/ConverterFactory.java
index 0280be4a73..0280be4a73 100644
--- a/server/src/com/vaadin/data/util/converter/ConverterFactory.java
+++ b/server/src/main/java/com/vaadin/data/util/converter/ConverterFactory.java
diff --git a/server/src/com/vaadin/data/util/converter/ConverterUtil.java b/server/src/main/java/com/vaadin/data/util/converter/ConverterUtil.java
index 91e11a6222..91e11a6222 100644
--- a/server/src/com/vaadin/data/util/converter/ConverterUtil.java
+++ b/server/src/main/java/com/vaadin/data/util/converter/ConverterUtil.java
diff --git a/server/src/com/vaadin/data/util/converter/DateToLongConverter.java b/server/src/main/java/com/vaadin/data/util/converter/DateToLongConverter.java
index fffe80352e..fffe80352e 100644
--- a/server/src/com/vaadin/data/util/converter/DateToLongConverter.java
+++ b/server/src/main/java/com/vaadin/data/util/converter/DateToLongConverter.java
diff --git a/server/src/com/vaadin/data/util/converter/DateToSqlDateConverter.java b/server/src/main/java/com/vaadin/data/util/converter/DateToSqlDateConverter.java
index 6a7e8327a1..6a7e8327a1 100644
--- a/server/src/com/vaadin/data/util/converter/DateToSqlDateConverter.java
+++ b/server/src/main/java/com/vaadin/data/util/converter/DateToSqlDateConverter.java
diff --git a/server/src/com/vaadin/data/util/converter/DefaultConverterFactory.java b/server/src/main/java/com/vaadin/data/util/converter/DefaultConverterFactory.java
index 3a1f1a4252..3a1f1a4252 100644
--- a/server/src/com/vaadin/data/util/converter/DefaultConverterFactory.java
+++ b/server/src/main/java/com/vaadin/data/util/converter/DefaultConverterFactory.java
diff --git a/server/src/com/vaadin/data/util/converter/ReverseConverter.java b/server/src/main/java/com/vaadin/data/util/converter/ReverseConverter.java
index 2495dc631a..2495dc631a 100644
--- a/server/src/com/vaadin/data/util/converter/ReverseConverter.java
+++ b/server/src/main/java/com/vaadin/data/util/converter/ReverseConverter.java
diff --git a/server/src/com/vaadin/data/util/converter/StringToBigDecimalConverter.java b/server/src/main/java/com/vaadin/data/util/converter/StringToBigDecimalConverter.java
index 549f156f61..549f156f61 100644
--- a/server/src/com/vaadin/data/util/converter/StringToBigDecimalConverter.java
+++ b/server/src/main/java/com/vaadin/data/util/converter/StringToBigDecimalConverter.java
diff --git a/server/src/com/vaadin/data/util/converter/StringToBigIntegerConverter.java b/server/src/main/java/com/vaadin/data/util/converter/StringToBigIntegerConverter.java
index adaa8c6111..adaa8c6111 100644
--- a/server/src/com/vaadin/data/util/converter/StringToBigIntegerConverter.java
+++ b/server/src/main/java/com/vaadin/data/util/converter/StringToBigIntegerConverter.java
diff --git a/server/src/com/vaadin/data/util/converter/StringToBooleanConverter.java b/server/src/main/java/com/vaadin/data/util/converter/StringToBooleanConverter.java
index f965cfcc6a..f965cfcc6a 100644
--- a/server/src/com/vaadin/data/util/converter/StringToBooleanConverter.java
+++ b/server/src/main/java/com/vaadin/data/util/converter/StringToBooleanConverter.java
diff --git a/server/src/com/vaadin/data/util/converter/StringToByteConverter.java b/server/src/main/java/com/vaadin/data/util/converter/StringToByteConverter.java
index 719fced0ed..719fced0ed 100644
--- a/server/src/com/vaadin/data/util/converter/StringToByteConverter.java
+++ b/server/src/main/java/com/vaadin/data/util/converter/StringToByteConverter.java
diff --git a/server/src/com/vaadin/data/util/converter/StringToCollectionConverter.java b/server/src/main/java/com/vaadin/data/util/converter/StringToCollectionConverter.java
index 6930b6da06..6930b6da06 100644
--- a/server/src/com/vaadin/data/util/converter/StringToCollectionConverter.java
+++ b/server/src/main/java/com/vaadin/data/util/converter/StringToCollectionConverter.java
diff --git a/server/src/com/vaadin/data/util/converter/StringToDateConverter.java b/server/src/main/java/com/vaadin/data/util/converter/StringToDateConverter.java
index 8f0db24caf..8f0db24caf 100644
--- a/server/src/com/vaadin/data/util/converter/StringToDateConverter.java
+++ b/server/src/main/java/com/vaadin/data/util/converter/StringToDateConverter.java
diff --git a/server/src/com/vaadin/data/util/converter/StringToDoubleConverter.java b/server/src/main/java/com/vaadin/data/util/converter/StringToDoubleConverter.java
index f514eac648..f514eac648 100644
--- a/server/src/com/vaadin/data/util/converter/StringToDoubleConverter.java
+++ b/server/src/main/java/com/vaadin/data/util/converter/StringToDoubleConverter.java
diff --git a/server/src/com/vaadin/data/util/converter/StringToEnumConverter.java b/server/src/main/java/com/vaadin/data/util/converter/StringToEnumConverter.java
index 7b2f43f972..7b2f43f972 100644
--- a/server/src/com/vaadin/data/util/converter/StringToEnumConverter.java
+++ b/server/src/main/java/com/vaadin/data/util/converter/StringToEnumConverter.java
diff --git a/server/src/com/vaadin/data/util/converter/StringToFloatConverter.java b/server/src/main/java/com/vaadin/data/util/converter/StringToFloatConverter.java
index f4d7f97853..f4d7f97853 100644
--- a/server/src/com/vaadin/data/util/converter/StringToFloatConverter.java
+++ b/server/src/main/java/com/vaadin/data/util/converter/StringToFloatConverter.java
diff --git a/server/src/com/vaadin/data/util/converter/StringToIntegerConverter.java b/server/src/main/java/com/vaadin/data/util/converter/StringToIntegerConverter.java
index 59a46babe1..59a46babe1 100644
--- a/server/src/com/vaadin/data/util/converter/StringToIntegerConverter.java
+++ b/server/src/main/java/com/vaadin/data/util/converter/StringToIntegerConverter.java
diff --git a/server/src/com/vaadin/data/util/converter/StringToLongConverter.java b/server/src/main/java/com/vaadin/data/util/converter/StringToLongConverter.java
index cd7cf49042..cd7cf49042 100644
--- a/server/src/com/vaadin/data/util/converter/StringToLongConverter.java
+++ b/server/src/main/java/com/vaadin/data/util/converter/StringToLongConverter.java
diff --git a/server/src/com/vaadin/data/util/converter/StringToShortConverter.java b/server/src/main/java/com/vaadin/data/util/converter/StringToShortConverter.java
index 554b958ee0..554b958ee0 100644
--- a/server/src/com/vaadin/data/util/converter/StringToShortConverter.java
+++ b/server/src/main/java/com/vaadin/data/util/converter/StringToShortConverter.java
diff --git a/server/src/com/vaadin/data/util/filter/AbstractJunctionFilter.java b/server/src/main/java/com/vaadin/data/util/filter/AbstractJunctionFilter.java
index 28e6cda34e..28e6cda34e 100644
--- a/server/src/com/vaadin/data/util/filter/AbstractJunctionFilter.java
+++ b/server/src/main/java/com/vaadin/data/util/filter/AbstractJunctionFilter.java
diff --git a/server/src/com/vaadin/data/util/filter/And.java b/server/src/main/java/com/vaadin/data/util/filter/And.java
index 938aedae95..938aedae95 100644
--- a/server/src/com/vaadin/data/util/filter/And.java
+++ b/server/src/main/java/com/vaadin/data/util/filter/And.java
diff --git a/server/src/com/vaadin/data/util/filter/Between.java b/server/src/main/java/com/vaadin/data/util/filter/Between.java
index c50488c521..c50488c521 100644
--- a/server/src/com/vaadin/data/util/filter/Between.java
+++ b/server/src/main/java/com/vaadin/data/util/filter/Between.java
diff --git a/server/src/com/vaadin/data/util/filter/Compare.java b/server/src/main/java/com/vaadin/data/util/filter/Compare.java
index 1fcbe85580..1fcbe85580 100644
--- a/server/src/com/vaadin/data/util/filter/Compare.java
+++ b/server/src/main/java/com/vaadin/data/util/filter/Compare.java
diff --git a/server/src/com/vaadin/data/util/filter/IsNull.java b/server/src/main/java/com/vaadin/data/util/filter/IsNull.java
index 9bcfe40c03..9bcfe40c03 100644
--- a/server/src/com/vaadin/data/util/filter/IsNull.java
+++ b/server/src/main/java/com/vaadin/data/util/filter/IsNull.java
diff --git a/server/src/com/vaadin/data/util/filter/Like.java b/server/src/main/java/com/vaadin/data/util/filter/Like.java
index 9b7b2af292..9b7b2af292 100644
--- a/server/src/com/vaadin/data/util/filter/Like.java
+++ b/server/src/main/java/com/vaadin/data/util/filter/Like.java
diff --git a/server/src/com/vaadin/data/util/filter/Not.java b/server/src/main/java/com/vaadin/data/util/filter/Not.java
index a677e7f752..a677e7f752 100644
--- a/server/src/com/vaadin/data/util/filter/Not.java
+++ b/server/src/main/java/com/vaadin/data/util/filter/Not.java
diff --git a/server/src/com/vaadin/data/util/filter/Or.java b/server/src/main/java/com/vaadin/data/util/filter/Or.java
index 69d20513a2..69d20513a2 100644
--- a/server/src/com/vaadin/data/util/filter/Or.java
+++ b/server/src/main/java/com/vaadin/data/util/filter/Or.java
diff --git a/server/src/com/vaadin/data/util/filter/SimpleStringFilter.java b/server/src/main/java/com/vaadin/data/util/filter/SimpleStringFilter.java
index ea5e93277e..ea5e93277e 100644
--- a/server/src/com/vaadin/data/util/filter/SimpleStringFilter.java
+++ b/server/src/main/java/com/vaadin/data/util/filter/SimpleStringFilter.java
diff --git a/server/src/com/vaadin/data/util/filter/UnsupportedFilterException.java b/server/src/main/java/com/vaadin/data/util/filter/UnsupportedFilterException.java
index 42a7784da8..42a7784da8 100644
--- a/server/src/com/vaadin/data/util/filter/UnsupportedFilterException.java
+++ b/server/src/main/java/com/vaadin/data/util/filter/UnsupportedFilterException.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java
index 12d806a8d5..12d806a8d5 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/CacheMap.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheMap.java
index cdeff873d0..cdeff873d0 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/CacheMap.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheMap.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
index e89b8c02a8..e89b8c02a8 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java
index ed8eb3c0ff..ed8eb3c0ff 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java
index c845cadc7a..c845cadc7a 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/Reference.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/Reference.java
index e82f63ad2f..e82f63ad2f 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/Reference.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/Reference.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/RowId.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/RowId.java
index 79c16b0f60..79c16b0f60 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/RowId.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/RowId.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/RowItem.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/RowItem.java
index ddb5de1d31..ddb5de1d31 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/RowItem.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/RowItem.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java
index 86e9069e90..86e9069e90 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/SQLUtil.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLUtil.java
index e5282c867a..e5282c867a 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/SQLUtil.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLUtil.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java
index ca2f25963e..ca2f25963e 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java
index acad5beed9..acad5beed9 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java
index 11669075a3..11669075a3 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java
index 57ea188cb4..57ea188cb4 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java
index e7fd9f4aa4..e7fd9f4aa4 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java
index 6b800cb965..6b800cb965 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java
index b6fa56055d..b6fa56055d 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java
index 9df72f5b98..9df72f5b98 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/OrderBy.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/OrderBy.java
index 2bafa5dc0c..2bafa5dc0c 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/OrderBy.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/OrderBy.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
index 413dd55ab9..413dd55ab9 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
index 9a41766a31..9a41766a31 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java
index 2fc7ebd544..2fc7ebd544 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java
index 5a1f2003cd..5a1f2003cd 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java
index 86508d37c4..86508d37c4 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java
index 53ff924a36..53ff924a36 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java
index 5a9fcb17c0..5a9fcb17c0 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java
index a3d9b90705..a3d9b90705 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java
index 13d3553742..13d3553742 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java
index d8d5cc61fb..d8d5cc61fb 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java
index 0ece263ef4..0ece263ef4 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java
index 764a04eece..764a04eece 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java
index 07e544d40b..07e544d40b 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java
index 1bbc2a8e7e..1bbc2a8e7e 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java
index 00b4d5421b..00b4d5421b 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java
index b277551209..b277551209 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java
index 9bfda5fb34..9bfda5fb34 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java
index 0132260a0c..0132260a0c 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java
+++ b/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java
diff --git a/server/src/com/vaadin/data/validator/AbstractStringValidator.java b/server/src/main/java/com/vaadin/data/validator/AbstractStringValidator.java
index 70227afa67..70227afa67 100644
--- a/server/src/com/vaadin/data/validator/AbstractStringValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/AbstractStringValidator.java
diff --git a/server/src/com/vaadin/data/validator/AbstractValidator.java b/server/src/main/java/com/vaadin/data/validator/AbstractValidator.java
index b0894bbdbf..b0894bbdbf 100644
--- a/server/src/com/vaadin/data/validator/AbstractValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/AbstractValidator.java
diff --git a/server/src/com/vaadin/data/validator/BeanValidator.java b/server/src/main/java/com/vaadin/data/validator/BeanValidator.java
index b25f7e687c..b25f7e687c 100644
--- a/server/src/com/vaadin/data/validator/BeanValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/BeanValidator.java
diff --git a/server/src/com/vaadin/data/validator/BigDecimalRangeValidator.java b/server/src/main/java/com/vaadin/data/validator/BigDecimalRangeValidator.java
index 1363d230f6..1363d230f6 100644
--- a/server/src/com/vaadin/data/validator/BigDecimalRangeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/BigDecimalRangeValidator.java
diff --git a/server/src/com/vaadin/data/validator/BigIntegerRangeValidator.java b/server/src/main/java/com/vaadin/data/validator/BigIntegerRangeValidator.java
index ecf1990192..ecf1990192 100644
--- a/server/src/com/vaadin/data/validator/BigIntegerRangeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/BigIntegerRangeValidator.java
diff --git a/server/src/com/vaadin/data/validator/ByteRangeValidator.java b/server/src/main/java/com/vaadin/data/validator/ByteRangeValidator.java
index b147212c06..b147212c06 100644
--- a/server/src/com/vaadin/data/validator/ByteRangeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/ByteRangeValidator.java
diff --git a/server/src/com/vaadin/data/validator/CompositeValidator.java b/server/src/main/java/com/vaadin/data/validator/CompositeValidator.java
index f3b7133b9d..f3b7133b9d 100644
--- a/server/src/com/vaadin/data/validator/CompositeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/CompositeValidator.java
diff --git a/server/src/com/vaadin/data/validator/DateRangeValidator.java b/server/src/main/java/com/vaadin/data/validator/DateRangeValidator.java
index 3add69c207..3add69c207 100644
--- a/server/src/com/vaadin/data/validator/DateRangeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/DateRangeValidator.java
diff --git a/server/src/com/vaadin/data/validator/DoubleRangeValidator.java b/server/src/main/java/com/vaadin/data/validator/DoubleRangeValidator.java
index 8992e2644a..8992e2644a 100644
--- a/server/src/com/vaadin/data/validator/DoubleRangeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/DoubleRangeValidator.java
diff --git a/server/src/com/vaadin/data/validator/DoubleValidator.java b/server/src/main/java/com/vaadin/data/validator/DoubleValidator.java
index e40cf3eecf..e40cf3eecf 100644
--- a/server/src/com/vaadin/data/validator/DoubleValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/DoubleValidator.java
diff --git a/server/src/com/vaadin/data/validator/EmailValidator.java b/server/src/main/java/com/vaadin/data/validator/EmailValidator.java
index 853c855a37..853c855a37 100644
--- a/server/src/com/vaadin/data/validator/EmailValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/EmailValidator.java
diff --git a/server/src/com/vaadin/data/validator/FloatRangeValidator.java b/server/src/main/java/com/vaadin/data/validator/FloatRangeValidator.java
index ee29cf16b1..ee29cf16b1 100644
--- a/server/src/com/vaadin/data/validator/FloatRangeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/FloatRangeValidator.java
diff --git a/server/src/com/vaadin/data/validator/IntegerRangeValidator.java b/server/src/main/java/com/vaadin/data/validator/IntegerRangeValidator.java
index 6ef848bed3..6ef848bed3 100644
--- a/server/src/com/vaadin/data/validator/IntegerRangeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/IntegerRangeValidator.java
diff --git a/server/src/com/vaadin/data/validator/IntegerValidator.java b/server/src/main/java/com/vaadin/data/validator/IntegerValidator.java
index f52ba0ab3a..f52ba0ab3a 100644
--- a/server/src/com/vaadin/data/validator/IntegerValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/IntegerValidator.java
diff --git a/server/src/com/vaadin/data/validator/LongRangeValidator.java b/server/src/main/java/com/vaadin/data/validator/LongRangeValidator.java
index c4d8a9c9ca..c4d8a9c9ca 100644
--- a/server/src/com/vaadin/data/validator/LongRangeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/LongRangeValidator.java
diff --git a/server/src/com/vaadin/data/validator/NullValidator.java b/server/src/main/java/com/vaadin/data/validator/NullValidator.java
index 42cf419973..42cf419973 100644
--- a/server/src/com/vaadin/data/validator/NullValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/NullValidator.java
diff --git a/server/src/com/vaadin/data/validator/RangeValidator.java b/server/src/main/java/com/vaadin/data/validator/RangeValidator.java
index 5ba3aef363..5ba3aef363 100644
--- a/server/src/com/vaadin/data/validator/RangeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/RangeValidator.java
diff --git a/server/src/com/vaadin/data/validator/RegexpValidator.java b/server/src/main/java/com/vaadin/data/validator/RegexpValidator.java
index 74e1f89253..74e1f89253 100644
--- a/server/src/com/vaadin/data/validator/RegexpValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/RegexpValidator.java
diff --git a/server/src/com/vaadin/data/validator/ShortRangeValidator.java b/server/src/main/java/com/vaadin/data/validator/ShortRangeValidator.java
index a8b0d3aeb4..a8b0d3aeb4 100644
--- a/server/src/com/vaadin/data/validator/ShortRangeValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/ShortRangeValidator.java
diff --git a/server/src/com/vaadin/data/validator/StringLengthValidator.java b/server/src/main/java/com/vaadin/data/validator/StringLengthValidator.java
index efb551c614..efb551c614 100644
--- a/server/src/com/vaadin/data/validator/StringLengthValidator.java
+++ b/server/src/main/java/com/vaadin/data/validator/StringLengthValidator.java
diff --git a/server/src/com/vaadin/event/Action.java b/server/src/main/java/com/vaadin/event/Action.java
index 1af1de6e6d..1af1de6e6d 100644
--- a/server/src/com/vaadin/event/Action.java
+++ b/server/src/main/java/com/vaadin/event/Action.java
diff --git a/server/src/com/vaadin/event/ActionManager.java b/server/src/main/java/com/vaadin/event/ActionManager.java
index 6eb698d08a..6eb698d08a 100644
--- a/server/src/com/vaadin/event/ActionManager.java
+++ b/server/src/main/java/com/vaadin/event/ActionManager.java
diff --git a/server/src/com/vaadin/event/ConnectorActionManager.java b/server/src/main/java/com/vaadin/event/ConnectorActionManager.java
index 0816ba48df..0816ba48df 100644
--- a/server/src/com/vaadin/event/ConnectorActionManager.java
+++ b/server/src/main/java/com/vaadin/event/ConnectorActionManager.java
diff --git a/server/src/com/vaadin/event/ConnectorEvent.java b/server/src/main/java/com/vaadin/event/ConnectorEvent.java
index 3dc73b864a..3dc73b864a 100644
--- a/server/src/com/vaadin/event/ConnectorEvent.java
+++ b/server/src/main/java/com/vaadin/event/ConnectorEvent.java
diff --git a/server/src/com/vaadin/event/ConnectorEventListener.java b/server/src/main/java/com/vaadin/event/ConnectorEventListener.java
index e3cb9c283b..e3cb9c283b 100644
--- a/server/src/com/vaadin/event/ConnectorEventListener.java
+++ b/server/src/main/java/com/vaadin/event/ConnectorEventListener.java
diff --git a/server/src/com/vaadin/event/ContextClickEvent.java b/server/src/main/java/com/vaadin/event/ContextClickEvent.java
index 5b15634105..5b15634105 100644
--- a/server/src/com/vaadin/event/ContextClickEvent.java
+++ b/server/src/main/java/com/vaadin/event/ContextClickEvent.java
diff --git a/server/src/com/vaadin/event/DataBoundTransferable.java b/server/src/main/java/com/vaadin/event/DataBoundTransferable.java
index d461692b2e..d461692b2e 100644
--- a/server/src/com/vaadin/event/DataBoundTransferable.java
+++ b/server/src/main/java/com/vaadin/event/DataBoundTransferable.java
diff --git a/server/src/com/vaadin/event/EventRouter.java b/server/src/main/java/com/vaadin/event/EventRouter.java
index b662dfcb36..b662dfcb36 100644
--- a/server/src/com/vaadin/event/EventRouter.java
+++ b/server/src/main/java/com/vaadin/event/EventRouter.java
diff --git a/server/src/com/vaadin/event/FieldEvents.java b/server/src/main/java/com/vaadin/event/FieldEvents.java
index 364ac76ffd..364ac76ffd 100644
--- a/server/src/com/vaadin/event/FieldEvents.java
+++ b/server/src/main/java/com/vaadin/event/FieldEvents.java
diff --git a/server/src/com/vaadin/event/ItemClickEvent.java b/server/src/main/java/com/vaadin/event/ItemClickEvent.java
index 1280c16872..1280c16872 100644
--- a/server/src/com/vaadin/event/ItemClickEvent.java
+++ b/server/src/main/java/com/vaadin/event/ItemClickEvent.java
diff --git a/server/src/com/vaadin/event/LayoutEvents.java b/server/src/main/java/com/vaadin/event/LayoutEvents.java
index e4432b7c7a..e4432b7c7a 100644
--- a/server/src/com/vaadin/event/LayoutEvents.java
+++ b/server/src/main/java/com/vaadin/event/LayoutEvents.java
diff --git a/server/src/com/vaadin/event/ListenerMethod.java b/server/src/main/java/com/vaadin/event/ListenerMethod.java
index 3311ed705e..3311ed705e 100644
--- a/server/src/com/vaadin/event/ListenerMethod.java
+++ b/server/src/main/java/com/vaadin/event/ListenerMethod.java
diff --git a/server/src/com/vaadin/event/MethodEventSource.java b/server/src/main/java/com/vaadin/event/MethodEventSource.java
index ddfc87ca8c..ddfc87ca8c 100644
--- a/server/src/com/vaadin/event/MethodEventSource.java
+++ b/server/src/main/java/com/vaadin/event/MethodEventSource.java
diff --git a/server/src/com/vaadin/event/MouseEvents.java b/server/src/main/java/com/vaadin/event/MouseEvents.java
index b32ce06587..b32ce06587 100644
--- a/server/src/com/vaadin/event/MouseEvents.java
+++ b/server/src/main/java/com/vaadin/event/MouseEvents.java
diff --git a/server/src/com/vaadin/event/SelectionEvent.java b/server/src/main/java/com/vaadin/event/SelectionEvent.java
index e75369e6da..e75369e6da 100644
--- a/server/src/com/vaadin/event/SelectionEvent.java
+++ b/server/src/main/java/com/vaadin/event/SelectionEvent.java
diff --git a/server/src/com/vaadin/event/ShortcutAction.java b/server/src/main/java/com/vaadin/event/ShortcutAction.java
index dd511c23c0..dd511c23c0 100644
--- a/server/src/com/vaadin/event/ShortcutAction.java
+++ b/server/src/main/java/com/vaadin/event/ShortcutAction.java
diff --git a/server/src/com/vaadin/event/ShortcutListener.java b/server/src/main/java/com/vaadin/event/ShortcutListener.java
index ccfe68d6fb..ccfe68d6fb 100644
--- a/server/src/com/vaadin/event/ShortcutListener.java
+++ b/server/src/main/java/com/vaadin/event/ShortcutListener.java
diff --git a/server/src/com/vaadin/event/SortEvent.java b/server/src/main/java/com/vaadin/event/SortEvent.java
index f303e47781..f303e47781 100644
--- a/server/src/com/vaadin/event/SortEvent.java
+++ b/server/src/main/java/com/vaadin/event/SortEvent.java
diff --git a/server/src/com/vaadin/event/Transferable.java b/server/src/main/java/com/vaadin/event/Transferable.java
index 9cfbba5161..9cfbba5161 100644
--- a/server/src/com/vaadin/event/Transferable.java
+++ b/server/src/main/java/com/vaadin/event/Transferable.java
diff --git a/server/src/com/vaadin/event/TransferableImpl.java b/server/src/main/java/com/vaadin/event/TransferableImpl.java
index 9c8e79f1bf..9c8e79f1bf 100644
--- a/server/src/com/vaadin/event/TransferableImpl.java
+++ b/server/src/main/java/com/vaadin/event/TransferableImpl.java
diff --git a/server/src/com/vaadin/event/UIEvents.java b/server/src/main/java/com/vaadin/event/UIEvents.java
index e986386da8..e986386da8 100644
--- a/server/src/com/vaadin/event/UIEvents.java
+++ b/server/src/main/java/com/vaadin/event/UIEvents.java
diff --git a/server/src/com/vaadin/event/dd/DragAndDropEvent.java b/server/src/main/java/com/vaadin/event/dd/DragAndDropEvent.java
index 661c7ed1cc..661c7ed1cc 100644
--- a/server/src/com/vaadin/event/dd/DragAndDropEvent.java
+++ b/server/src/main/java/com/vaadin/event/dd/DragAndDropEvent.java
diff --git a/server/src/com/vaadin/event/dd/DragSource.java b/server/src/main/java/com/vaadin/event/dd/DragSource.java
index 8e4d43bfc4..8e4d43bfc4 100644
--- a/server/src/com/vaadin/event/dd/DragSource.java
+++ b/server/src/main/java/com/vaadin/event/dd/DragSource.java
diff --git a/server/src/com/vaadin/event/dd/DropHandler.java b/server/src/main/java/com/vaadin/event/dd/DropHandler.java
index c45ae7e7d3..c45ae7e7d3 100644
--- a/server/src/com/vaadin/event/dd/DropHandler.java
+++ b/server/src/main/java/com/vaadin/event/dd/DropHandler.java
diff --git a/server/src/com/vaadin/event/dd/DropTarget.java b/server/src/main/java/com/vaadin/event/dd/DropTarget.java
index f96170cf98..f96170cf98 100644
--- a/server/src/com/vaadin/event/dd/DropTarget.java
+++ b/server/src/main/java/com/vaadin/event/dd/DropTarget.java
diff --git a/server/src/com/vaadin/event/dd/TargetDetails.java b/server/src/main/java/com/vaadin/event/dd/TargetDetails.java
index b5635bc2a8..b5635bc2a8 100644
--- a/server/src/com/vaadin/event/dd/TargetDetails.java
+++ b/server/src/main/java/com/vaadin/event/dd/TargetDetails.java
diff --git a/server/src/com/vaadin/event/dd/TargetDetailsImpl.java b/server/src/main/java/com/vaadin/event/dd/TargetDetailsImpl.java
index 8a6ec506ba..8a6ec506ba 100644
--- a/server/src/com/vaadin/event/dd/TargetDetailsImpl.java
+++ b/server/src/main/java/com/vaadin/event/dd/TargetDetailsImpl.java
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/AcceptAll.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptAll.java
index fa6a4c2b9a..fa6a4c2b9a 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/AcceptAll.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptAll.java
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java
index a968cd8741..a968cd8741 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/And.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/And.java
index b2fc1b1b94..b2fc1b1b94 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/And.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/And.java
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java
index 6bb227a95e..6bb227a95e 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java
index 57f4d8253b..57f4d8253b 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/Not.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/Not.java
index 95f96bbf08..95f96bbf08 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/Not.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/Not.java
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/Or.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/Or.java
index e300606464..e300606464 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/Or.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/Or.java
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java
index 8b769ee031..8b769ee031 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIs.java
index 8e9fdecdae..8e9fdecdae 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIs.java
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java
index c49f126941..c49f126941 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java
index 42fb5dfa11..42fb5dfa11 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java
diff --git a/server/src/com/vaadin/navigator/NavigationStateManager.java b/server/src/main/java/com/vaadin/navigator/NavigationStateManager.java
index 3e9c54c961..3e9c54c961 100644
--- a/server/src/com/vaadin/navigator/NavigationStateManager.java
+++ b/server/src/main/java/com/vaadin/navigator/NavigationStateManager.java
diff --git a/server/src/com/vaadin/navigator/Navigator.java b/server/src/main/java/com/vaadin/navigator/Navigator.java
index 82e8de920a..82e8de920a 100644
--- a/server/src/com/vaadin/navigator/Navigator.java
+++ b/server/src/main/java/com/vaadin/navigator/Navigator.java
diff --git a/server/src/com/vaadin/navigator/View.java b/server/src/main/java/com/vaadin/navigator/View.java
index 76b76f5520..76b76f5520 100644
--- a/server/src/com/vaadin/navigator/View.java
+++ b/server/src/main/java/com/vaadin/navigator/View.java
diff --git a/server/src/com/vaadin/navigator/ViewChangeListener.java b/server/src/main/java/com/vaadin/navigator/ViewChangeListener.java
index 7d3f2b6044..7d3f2b6044 100644
--- a/server/src/com/vaadin/navigator/ViewChangeListener.java
+++ b/server/src/main/java/com/vaadin/navigator/ViewChangeListener.java
diff --git a/server/src/com/vaadin/navigator/ViewDisplay.java b/server/src/main/java/com/vaadin/navigator/ViewDisplay.java
index 36aa5dadc2..36aa5dadc2 100644
--- a/server/src/com/vaadin/navigator/ViewDisplay.java
+++ b/server/src/main/java/com/vaadin/navigator/ViewDisplay.java
diff --git a/server/src/com/vaadin/navigator/ViewProvider.java b/server/src/main/java/com/vaadin/navigator/ViewProvider.java
index ecf4e51073..ecf4e51073 100644
--- a/server/src/com/vaadin/navigator/ViewProvider.java
+++ b/server/src/main/java/com/vaadin/navigator/ViewProvider.java
diff --git a/server/src/com/vaadin/server/AbstractClientConnector.java b/server/src/main/java/com/vaadin/server/AbstractClientConnector.java
index c624663d50..c624663d50 100644
--- a/server/src/com/vaadin/server/AbstractClientConnector.java
+++ b/server/src/main/java/com/vaadin/server/AbstractClientConnector.java
diff --git a/server/src/com/vaadin/server/AbstractDeploymentConfiguration.java b/server/src/main/java/com/vaadin/server/AbstractDeploymentConfiguration.java
index 2554e421c8..2554e421c8 100644
--- a/server/src/com/vaadin/server/AbstractDeploymentConfiguration.java
+++ b/server/src/main/java/com/vaadin/server/AbstractDeploymentConfiguration.java
diff --git a/server/src/com/vaadin/server/AbstractErrorMessage.java b/server/src/main/java/com/vaadin/server/AbstractErrorMessage.java
index b56521993a..b56521993a 100644
--- a/server/src/com/vaadin/server/AbstractErrorMessage.java
+++ b/server/src/main/java/com/vaadin/server/AbstractErrorMessage.java
diff --git a/server/src/com/vaadin/server/AbstractExtension.java b/server/src/main/java/com/vaadin/server/AbstractExtension.java
index c72cc9cb39..c72cc9cb39 100644
--- a/server/src/com/vaadin/server/AbstractExtension.java
+++ b/server/src/main/java/com/vaadin/server/AbstractExtension.java
diff --git a/server/src/com/vaadin/server/AbstractJavaScriptExtension.java b/server/src/main/java/com/vaadin/server/AbstractJavaScriptExtension.java
index 2fb50fe7dd..2fb50fe7dd 100644
--- a/server/src/com/vaadin/server/AbstractJavaScriptExtension.java
+++ b/server/src/main/java/com/vaadin/server/AbstractJavaScriptExtension.java
diff --git a/server/src/com/vaadin/server/BootstrapFragmentResponse.java b/server/src/main/java/com/vaadin/server/BootstrapFragmentResponse.java
index 14a12a20ec..14a12a20ec 100644
--- a/server/src/com/vaadin/server/BootstrapFragmentResponse.java
+++ b/server/src/main/java/com/vaadin/server/BootstrapFragmentResponse.java
diff --git a/server/src/com/vaadin/server/BootstrapHandler.java b/server/src/main/java/com/vaadin/server/BootstrapHandler.java
index a9343a7e03..a9343a7e03 100644
--- a/server/src/com/vaadin/server/BootstrapHandler.java
+++ b/server/src/main/java/com/vaadin/server/BootstrapHandler.java
diff --git a/server/src/com/vaadin/server/BootstrapListener.java b/server/src/main/java/com/vaadin/server/BootstrapListener.java
index 374268dbdc..374268dbdc 100644
--- a/server/src/com/vaadin/server/BootstrapListener.java
+++ b/server/src/main/java/com/vaadin/server/BootstrapListener.java
diff --git a/server/src/com/vaadin/server/BootstrapPageResponse.java b/server/src/main/java/com/vaadin/server/BootstrapPageResponse.java
index e57ed413f0..e57ed413f0 100644
--- a/server/src/com/vaadin/server/BootstrapPageResponse.java
+++ b/server/src/main/java/com/vaadin/server/BootstrapPageResponse.java
diff --git a/server/src/com/vaadin/server/BootstrapResponse.java b/server/src/main/java/com/vaadin/server/BootstrapResponse.java
index 59e18d4c8a..59e18d4c8a 100644
--- a/server/src/com/vaadin/server/BootstrapResponse.java
+++ b/server/src/main/java/com/vaadin/server/BootstrapResponse.java
diff --git a/server/src/com/vaadin/server/BrowserWindowOpener.java b/server/src/main/java/com/vaadin/server/BrowserWindowOpener.java
index c1b8cbe91e..c1b8cbe91e 100644
--- a/server/src/com/vaadin/server/BrowserWindowOpener.java
+++ b/server/src/main/java/com/vaadin/server/BrowserWindowOpener.java
diff --git a/server/src/com/vaadin/server/ClassResource.java b/server/src/main/java/com/vaadin/server/ClassResource.java
index 5fb30095ed..5fb30095ed 100644
--- a/server/src/com/vaadin/server/ClassResource.java
+++ b/server/src/main/java/com/vaadin/server/ClassResource.java
diff --git a/server/src/com/vaadin/server/ClientConnector.java b/server/src/main/java/com/vaadin/server/ClientConnector.java
index 63483bc254..63483bc254 100644
--- a/server/src/com/vaadin/server/ClientConnector.java
+++ b/server/src/main/java/com/vaadin/server/ClientConnector.java
diff --git a/server/src/com/vaadin/server/ClientMethodInvocation.java b/server/src/main/java/com/vaadin/server/ClientMethodInvocation.java
index 77849c83df..77849c83df 100644
--- a/server/src/com/vaadin/server/ClientMethodInvocation.java
+++ b/server/src/main/java/com/vaadin/server/ClientMethodInvocation.java
diff --git a/server/src/com/vaadin/server/ComponentSizeValidator.java b/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java
index b8b06c780f..b8b06c780f 100644
--- a/server/src/com/vaadin/server/ComponentSizeValidator.java
+++ b/server/src/main/java/com/vaadin/server/ComponentSizeValidator.java
diff --git a/server/src/com/vaadin/server/CompositeErrorMessage.java b/server/src/main/java/com/vaadin/server/CompositeErrorMessage.java
index ee2af74994..ee2af74994 100644
--- a/server/src/com/vaadin/server/CompositeErrorMessage.java
+++ b/server/src/main/java/com/vaadin/server/CompositeErrorMessage.java
diff --git a/server/src/com/vaadin/server/ConnectorResource.java b/server/src/main/java/com/vaadin/server/ConnectorResource.java
index 3c4fb1955f..3c4fb1955f 100644
--- a/server/src/com/vaadin/server/ConnectorResource.java
+++ b/server/src/main/java/com/vaadin/server/ConnectorResource.java
diff --git a/server/src/com/vaadin/server/ConnectorResourceHandler.java b/server/src/main/java/com/vaadin/server/ConnectorResourceHandler.java
index 8715134773..8715134773 100644
--- a/server/src/com/vaadin/server/ConnectorResourceHandler.java
+++ b/server/src/main/java/com/vaadin/server/ConnectorResourceHandler.java
diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/main/java/com/vaadin/server/Constants.java
index 4dd4b45cfd..4dd4b45cfd 100644
--- a/server/src/com/vaadin/server/Constants.java
+++ b/server/src/main/java/com/vaadin/server/Constants.java
diff --git a/server/src/com/vaadin/server/CustomizedSystemMessages.java b/server/src/main/java/com/vaadin/server/CustomizedSystemMessages.java
index 0a7f864f40..0a7f864f40 100644
--- a/server/src/com/vaadin/server/CustomizedSystemMessages.java
+++ b/server/src/main/java/com/vaadin/server/CustomizedSystemMessages.java
diff --git a/server/src/com/vaadin/server/DefaultDeploymentConfiguration.java b/server/src/main/java/com/vaadin/server/DefaultDeploymentConfiguration.java
index 1f22a9e33d..1f22a9e33d 100644
--- a/server/src/com/vaadin/server/DefaultDeploymentConfiguration.java
+++ b/server/src/main/java/com/vaadin/server/DefaultDeploymentConfiguration.java
diff --git a/server/src/com/vaadin/server/DefaultErrorHandler.java b/server/src/main/java/com/vaadin/server/DefaultErrorHandler.java
index fa0729e011..fa0729e011 100644
--- a/server/src/com/vaadin/server/DefaultErrorHandler.java
+++ b/server/src/main/java/com/vaadin/server/DefaultErrorHandler.java
diff --git a/server/src/com/vaadin/server/DefaultSystemMessagesProvider.java b/server/src/main/java/com/vaadin/server/DefaultSystemMessagesProvider.java
index 17177c36ca..17177c36ca 100644
--- a/server/src/com/vaadin/server/DefaultSystemMessagesProvider.java
+++ b/server/src/main/java/com/vaadin/server/DefaultSystemMessagesProvider.java
diff --git a/server/src/com/vaadin/server/DefaultUIProvider.java b/server/src/main/java/com/vaadin/server/DefaultUIProvider.java
index 38525fc020..38525fc020 100644
--- a/server/src/com/vaadin/server/DefaultUIProvider.java
+++ b/server/src/main/java/com/vaadin/server/DefaultUIProvider.java
diff --git a/server/src/com/vaadin/server/DeploymentConfiguration.java b/server/src/main/java/com/vaadin/server/DeploymentConfiguration.java
index 968ec7c0c3..968ec7c0c3 100644
--- a/server/src/com/vaadin/server/DeploymentConfiguration.java
+++ b/server/src/main/java/com/vaadin/server/DeploymentConfiguration.java
diff --git a/server/src/com/vaadin/server/DownloadStream.java b/server/src/main/java/com/vaadin/server/DownloadStream.java
index 65ef560974..65ef560974 100644
--- a/server/src/com/vaadin/server/DownloadStream.java
+++ b/server/src/main/java/com/vaadin/server/DownloadStream.java
diff --git a/server/src/com/vaadin/server/DragAndDropService.java b/server/src/main/java/com/vaadin/server/DragAndDropService.java
index 4a894b3bff..4a894b3bff 100644
--- a/server/src/com/vaadin/server/DragAndDropService.java
+++ b/server/src/main/java/com/vaadin/server/DragAndDropService.java
diff --git a/server/src/com/vaadin/server/EncodeResult.java b/server/src/main/java/com/vaadin/server/EncodeResult.java
index bf4fd48438..bf4fd48438 100644
--- a/server/src/com/vaadin/server/EncodeResult.java
+++ b/server/src/main/java/com/vaadin/server/EncodeResult.java
diff --git a/server/src/com/vaadin/server/ErrorEvent.java b/server/src/main/java/com/vaadin/server/ErrorEvent.java
index 5f8cb4eaca..5f8cb4eaca 100644
--- a/server/src/com/vaadin/server/ErrorEvent.java
+++ b/server/src/main/java/com/vaadin/server/ErrorEvent.java
diff --git a/server/src/com/vaadin/server/ErrorHandler.java b/server/src/main/java/com/vaadin/server/ErrorHandler.java
index 9c3af4c999..9c3af4c999 100644
--- a/server/src/com/vaadin/server/ErrorHandler.java
+++ b/server/src/main/java/com/vaadin/server/ErrorHandler.java
diff --git a/server/src/com/vaadin/server/ErrorHandlingRunnable.java b/server/src/main/java/com/vaadin/server/ErrorHandlingRunnable.java
index 8ec24c0bcb..8ec24c0bcb 100644
--- a/server/src/com/vaadin/server/ErrorHandlingRunnable.java
+++ b/server/src/main/java/com/vaadin/server/ErrorHandlingRunnable.java
diff --git a/server/src/com/vaadin/server/ErrorMessage.java b/server/src/main/java/com/vaadin/server/ErrorMessage.java
index 0171b95e54..0171b95e54 100644
--- a/server/src/com/vaadin/server/ErrorMessage.java
+++ b/server/src/main/java/com/vaadin/server/ErrorMessage.java
diff --git a/server/src/com/vaadin/server/Extension.java b/server/src/main/java/com/vaadin/server/Extension.java
index b27c58b4bc..b27c58b4bc 100644
--- a/server/src/com/vaadin/server/Extension.java
+++ b/server/src/main/java/com/vaadin/server/Extension.java
diff --git a/server/src/com/vaadin/server/ExternalResource.java b/server/src/main/java/com/vaadin/server/ExternalResource.java
index e3b026dde8..e3b026dde8 100644
--- a/server/src/com/vaadin/server/ExternalResource.java
+++ b/server/src/main/java/com/vaadin/server/ExternalResource.java
diff --git a/server/src/com/vaadin/server/FileDownloader.java b/server/src/main/java/com/vaadin/server/FileDownloader.java
index b0c3bb1120..b0c3bb1120 100644
--- a/server/src/com/vaadin/server/FileDownloader.java
+++ b/server/src/main/java/com/vaadin/server/FileDownloader.java
diff --git a/server/src/com/vaadin/server/FileResource.java b/server/src/main/java/com/vaadin/server/FileResource.java
index 28de124fe9..28de124fe9 100644
--- a/server/src/com/vaadin/server/FileResource.java
+++ b/server/src/main/java/com/vaadin/server/FileResource.java
diff --git a/server/src/com/vaadin/server/FontAwesome.java b/server/src/main/java/com/vaadin/server/FontAwesome.java
index 2a07a0b1a6..2a07a0b1a6 100644
--- a/server/src/com/vaadin/server/FontAwesome.java
+++ b/server/src/main/java/com/vaadin/server/FontAwesome.java
diff --git a/server/src/com/vaadin/server/FontIcon.java b/server/src/main/java/com/vaadin/server/FontIcon.java
index 2ada45084f..2ada45084f 100644
--- a/server/src/com/vaadin/server/FontIcon.java
+++ b/server/src/main/java/com/vaadin/server/FontIcon.java
diff --git a/server/src/com/vaadin/server/GAEVaadinServlet.java b/server/src/main/java/com/vaadin/server/GAEVaadinServlet.java
index 2429fde746..2429fde746 100644
--- a/server/src/com/vaadin/server/GAEVaadinServlet.java
+++ b/server/src/main/java/com/vaadin/server/GAEVaadinServlet.java
diff --git a/server/src/com/vaadin/server/GenericFontIcon.java b/server/src/main/java/com/vaadin/server/GenericFontIcon.java
index cf435d55e6..cf435d55e6 100644
--- a/server/src/com/vaadin/server/GenericFontIcon.java
+++ b/server/src/main/java/com/vaadin/server/GenericFontIcon.java
diff --git a/server/src/com/vaadin/server/GlobalResourceHandler.java b/server/src/main/java/com/vaadin/server/GlobalResourceHandler.java
index d1ef125534..d1ef125534 100644
--- a/server/src/com/vaadin/server/GlobalResourceHandler.java
+++ b/server/src/main/java/com/vaadin/server/GlobalResourceHandler.java
diff --git a/server/src/com/vaadin/server/JavaScriptCallbackHelper.java b/server/src/main/java/com/vaadin/server/JavaScriptCallbackHelper.java
index ac4a586d00..ac4a586d00 100644
--- a/server/src/com/vaadin/server/JavaScriptCallbackHelper.java
+++ b/server/src/main/java/com/vaadin/server/JavaScriptCallbackHelper.java
diff --git a/server/src/com/vaadin/server/JsonCodec.java b/server/src/main/java/com/vaadin/server/JsonCodec.java
index 8b685bb046..8b685bb046 100644
--- a/server/src/com/vaadin/server/JsonCodec.java
+++ b/server/src/main/java/com/vaadin/server/JsonCodec.java
diff --git a/server/src/com/vaadin/server/JsonPaintTarget.java b/server/src/main/java/com/vaadin/server/JsonPaintTarget.java
index 47c69f1a30..47c69f1a30 100644
--- a/server/src/com/vaadin/server/JsonPaintTarget.java
+++ b/server/src/main/java/com/vaadin/server/JsonPaintTarget.java
diff --git a/server/src/com/vaadin/server/KeyMapper.java b/server/src/main/java/com/vaadin/server/KeyMapper.java
index 0e4b7edc77..0e4b7edc77 100644
--- a/server/src/com/vaadin/server/KeyMapper.java
+++ b/server/src/main/java/com/vaadin/server/KeyMapper.java
diff --git a/server/src/com/vaadin/server/LegacyApplication.java b/server/src/main/java/com/vaadin/server/LegacyApplication.java
index d03b3d7f96..d03b3d7f96 100644
--- a/server/src/com/vaadin/server/LegacyApplication.java
+++ b/server/src/main/java/com/vaadin/server/LegacyApplication.java
diff --git a/server/src/com/vaadin/server/LegacyApplicationUIProvider.java b/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java
index 0977071806..0977071806 100644
--- a/server/src/com/vaadin/server/LegacyApplicationUIProvider.java
+++ b/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java
diff --git a/server/src/com/vaadin/server/LegacyCommunicationManager.java b/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java
index 87b484a65f..87b484a65f 100644
--- a/server/src/com/vaadin/server/LegacyCommunicationManager.java
+++ b/server/src/main/java/com/vaadin/server/LegacyCommunicationManager.java
diff --git a/server/src/com/vaadin/server/LegacyPaint.java b/server/src/main/java/com/vaadin/server/LegacyPaint.java
index 91ff103db6..91ff103db6 100644
--- a/server/src/com/vaadin/server/LegacyPaint.java
+++ b/server/src/main/java/com/vaadin/server/LegacyPaint.java
diff --git a/server/src/com/vaadin/server/LegacyVaadinPortlet.java b/server/src/main/java/com/vaadin/server/LegacyVaadinPortlet.java
index 606809d893..606809d893 100644
--- a/server/src/com/vaadin/server/LegacyVaadinPortlet.java
+++ b/server/src/main/java/com/vaadin/server/LegacyVaadinPortlet.java
diff --git a/server/src/com/vaadin/server/LegacyVaadinServlet.java b/server/src/main/java/com/vaadin/server/LegacyVaadinServlet.java
index 8ef16b50bc..8ef16b50bc 100644
--- a/server/src/com/vaadin/server/LegacyVaadinServlet.java
+++ b/server/src/main/java/com/vaadin/server/LegacyVaadinServlet.java
diff --git a/server/src/com/vaadin/server/LocaleService.java b/server/src/main/java/com/vaadin/server/LocaleService.java
index ccdc49f690..ccdc49f690 100644
--- a/server/src/com/vaadin/server/LocaleService.java
+++ b/server/src/main/java/com/vaadin/server/LocaleService.java
diff --git a/server/src/com/vaadin/server/NoInputStreamException.java b/server/src/main/java/com/vaadin/server/NoInputStreamException.java
index 9f12c52fdf..9f12c52fdf 100644
--- a/server/src/com/vaadin/server/NoInputStreamException.java
+++ b/server/src/main/java/com/vaadin/server/NoInputStreamException.java
diff --git a/server/src/com/vaadin/server/NoOutputStreamException.java b/server/src/main/java/com/vaadin/server/NoOutputStreamException.java
index 8dce2194e8..8dce2194e8 100644
--- a/server/src/com/vaadin/server/NoOutputStreamException.java
+++ b/server/src/main/java/com/vaadin/server/NoOutputStreamException.java
diff --git a/server/src/com/vaadin/server/Page.java b/server/src/main/java/com/vaadin/server/Page.java
index 74d79ade50..74d79ade50 100644
--- a/server/src/com/vaadin/server/Page.java
+++ b/server/src/main/java/com/vaadin/server/Page.java
diff --git a/server/src/com/vaadin/server/PaintException.java b/server/src/main/java/com/vaadin/server/PaintException.java
index a7025598b2..a7025598b2 100644
--- a/server/src/com/vaadin/server/PaintException.java
+++ b/server/src/main/java/com/vaadin/server/PaintException.java
diff --git a/server/src/com/vaadin/server/PaintTarget.java b/server/src/main/java/com/vaadin/server/PaintTarget.java
index 902cb13816..902cb13816 100644
--- a/server/src/com/vaadin/server/PaintTarget.java
+++ b/server/src/main/java/com/vaadin/server/PaintTarget.java
diff --git a/server/src/com/vaadin/server/RequestHandler.java b/server/src/main/java/com/vaadin/server/RequestHandler.java
index b667ed038c..b667ed038c 100644
--- a/server/src/com/vaadin/server/RequestHandler.java
+++ b/server/src/main/java/com/vaadin/server/RequestHandler.java
diff --git a/server/src/com/vaadin/server/Resource.java b/server/src/main/java/com/vaadin/server/Resource.java
index 20e0bb7f9a..20e0bb7f9a 100644
--- a/server/src/com/vaadin/server/Resource.java
+++ b/server/src/main/java/com/vaadin/server/Resource.java
diff --git a/server/src/com/vaadin/server/ResourceReference.java b/server/src/main/java/com/vaadin/server/ResourceReference.java
index aeb06394b7..aeb06394b7 100644
--- a/server/src/com/vaadin/server/ResourceReference.java
+++ b/server/src/main/java/com/vaadin/server/ResourceReference.java
diff --git a/server/src/com/vaadin/server/Responsive.java b/server/src/main/java/com/vaadin/server/Responsive.java
index 9209f14ff9..9209f14ff9 100644
--- a/server/src/com/vaadin/server/Responsive.java
+++ b/server/src/main/java/com/vaadin/server/Responsive.java
diff --git a/server/src/com/vaadin/server/RestrictedRenderResponse.java b/server/src/main/java/com/vaadin/server/RestrictedRenderResponse.java
index 5bee476cff..5bee476cff 100644
--- a/server/src/com/vaadin/server/RestrictedRenderResponse.java
+++ b/server/src/main/java/com/vaadin/server/RestrictedRenderResponse.java
diff --git a/server/src/com/vaadin/server/Scrollable.java b/server/src/main/java/com/vaadin/server/Scrollable.java
index ae6828e339..ae6828e339 100644
--- a/server/src/com/vaadin/server/Scrollable.java
+++ b/server/src/main/java/com/vaadin/server/Scrollable.java
diff --git a/server/src/com/vaadin/server/ServerRpcManager.java b/server/src/main/java/com/vaadin/server/ServerRpcManager.java
index ae99622a4a..ae99622a4a 100644
--- a/server/src/com/vaadin/server/ServerRpcManager.java
+++ b/server/src/main/java/com/vaadin/server/ServerRpcManager.java
diff --git a/server/src/com/vaadin/server/ServerRpcMethodInvocation.java b/server/src/main/java/com/vaadin/server/ServerRpcMethodInvocation.java
index d3f8531406..d3f8531406 100644
--- a/server/src/com/vaadin/server/ServerRpcMethodInvocation.java
+++ b/server/src/main/java/com/vaadin/server/ServerRpcMethodInvocation.java
diff --git a/server/src/com/vaadin/server/ServiceDestroyEvent.java b/server/src/main/java/com/vaadin/server/ServiceDestroyEvent.java
index 2ed0bbf8f1..2ed0bbf8f1 100644
--- a/server/src/com/vaadin/server/ServiceDestroyEvent.java
+++ b/server/src/main/java/com/vaadin/server/ServiceDestroyEvent.java
diff --git a/server/src/com/vaadin/server/ServiceDestroyListener.java b/server/src/main/java/com/vaadin/server/ServiceDestroyListener.java
index 1549d82d51..1549d82d51 100644
--- a/server/src/com/vaadin/server/ServiceDestroyListener.java
+++ b/server/src/main/java/com/vaadin/server/ServiceDestroyListener.java
diff --git a/server/src/com/vaadin/server/ServiceException.java b/server/src/main/java/com/vaadin/server/ServiceException.java
index 2bc36bc1d7..2bc36bc1d7 100644
--- a/server/src/com/vaadin/server/ServiceException.java
+++ b/server/src/main/java/com/vaadin/server/ServiceException.java
diff --git a/server/src/com/vaadin/server/ServletPortletHelper.java b/server/src/main/java/com/vaadin/server/ServletPortletHelper.java
index 33ecf16e17..33ecf16e17 100644
--- a/server/src/com/vaadin/server/ServletPortletHelper.java
+++ b/server/src/main/java/com/vaadin/server/ServletPortletHelper.java
diff --git a/server/src/com/vaadin/server/SessionDestroyEvent.java b/server/src/main/java/com/vaadin/server/SessionDestroyEvent.java
index a64fce0b64..a64fce0b64 100644
--- a/server/src/com/vaadin/server/SessionDestroyEvent.java
+++ b/server/src/main/java/com/vaadin/server/SessionDestroyEvent.java
diff --git a/server/src/com/vaadin/server/SessionDestroyListener.java b/server/src/main/java/com/vaadin/server/SessionDestroyListener.java
index 29daa60a40..29daa60a40 100644
--- a/server/src/com/vaadin/server/SessionDestroyListener.java
+++ b/server/src/main/java/com/vaadin/server/SessionDestroyListener.java
diff --git a/server/src/com/vaadin/server/SessionExpiredException.java b/server/src/main/java/com/vaadin/server/SessionExpiredException.java
index d70498e7cb..d70498e7cb 100644
--- a/server/src/com/vaadin/server/SessionExpiredException.java
+++ b/server/src/main/java/com/vaadin/server/SessionExpiredException.java
diff --git a/server/src/com/vaadin/server/SessionExpiredHandler.java b/server/src/main/java/com/vaadin/server/SessionExpiredHandler.java
index 3d6de95dea..3d6de95dea 100644
--- a/server/src/com/vaadin/server/SessionExpiredHandler.java
+++ b/server/src/main/java/com/vaadin/server/SessionExpiredHandler.java
diff --git a/server/src/com/vaadin/server/SessionInitEvent.java b/server/src/main/java/com/vaadin/server/SessionInitEvent.java
index 76262c6140..76262c6140 100644
--- a/server/src/com/vaadin/server/SessionInitEvent.java
+++ b/server/src/main/java/com/vaadin/server/SessionInitEvent.java
diff --git a/server/src/com/vaadin/server/SessionInitListener.java b/server/src/main/java/com/vaadin/server/SessionInitListener.java
index 2bbb8e3d1f..2bbb8e3d1f 100644
--- a/server/src/com/vaadin/server/SessionInitListener.java
+++ b/server/src/main/java/com/vaadin/server/SessionInitListener.java
diff --git a/server/src/com/vaadin/server/SizeWithUnit.java b/server/src/main/java/com/vaadin/server/SizeWithUnit.java
index 4c3c51eaec..4c3c51eaec 100644
--- a/server/src/com/vaadin/server/SizeWithUnit.java
+++ b/server/src/main/java/com/vaadin/server/SizeWithUnit.java
diff --git a/server/src/com/vaadin/server/Sizeable.java b/server/src/main/java/com/vaadin/server/Sizeable.java
index ede5e6ab3b..ede5e6ab3b 100644
--- a/server/src/com/vaadin/server/Sizeable.java
+++ b/server/src/main/java/com/vaadin/server/Sizeable.java
diff --git a/server/src/com/vaadin/server/StreamResource.java b/server/src/main/java/com/vaadin/server/StreamResource.java
index 070cfb5138..070cfb5138 100644
--- a/server/src/com/vaadin/server/StreamResource.java
+++ b/server/src/main/java/com/vaadin/server/StreamResource.java
diff --git a/server/src/com/vaadin/server/StreamVariable.java b/server/src/main/java/com/vaadin/server/StreamVariable.java
index c7b84c92d6..c7b84c92d6 100644
--- a/server/src/com/vaadin/server/StreamVariable.java
+++ b/server/src/main/java/com/vaadin/server/StreamVariable.java
diff --git a/server/src/com/vaadin/server/SynchronizedRequestHandler.java b/server/src/main/java/com/vaadin/server/SynchronizedRequestHandler.java
index 56abfbb8f3..56abfbb8f3 100644
--- a/server/src/com/vaadin/server/SynchronizedRequestHandler.java
+++ b/server/src/main/java/com/vaadin/server/SynchronizedRequestHandler.java
diff --git a/server/src/com/vaadin/server/SystemError.java b/server/src/main/java/com/vaadin/server/SystemError.java
index 834055e1e1..834055e1e1 100644
--- a/server/src/com/vaadin/server/SystemError.java
+++ b/server/src/main/java/com/vaadin/server/SystemError.java
diff --git a/server/src/com/vaadin/server/SystemMessageException.java b/server/src/main/java/com/vaadin/server/SystemMessageException.java
index 854d8001f6..854d8001f6 100644
--- a/server/src/com/vaadin/server/SystemMessageException.java
+++ b/server/src/main/java/com/vaadin/server/SystemMessageException.java
diff --git a/server/src/com/vaadin/server/SystemMessages.java b/server/src/main/java/com/vaadin/server/SystemMessages.java
index 3bcf0a90fa..3bcf0a90fa 100644
--- a/server/src/com/vaadin/server/SystemMessages.java
+++ b/server/src/main/java/com/vaadin/server/SystemMessages.java
diff --git a/server/src/com/vaadin/server/SystemMessagesInfo.java b/server/src/main/java/com/vaadin/server/SystemMessagesInfo.java
index 195cf3c711..195cf3c711 100644
--- a/server/src/com/vaadin/server/SystemMessagesInfo.java
+++ b/server/src/main/java/com/vaadin/server/SystemMessagesInfo.java
diff --git a/server/src/com/vaadin/server/SystemMessagesProvider.java b/server/src/main/java/com/vaadin/server/SystemMessagesProvider.java
index a69cc0b159..a69cc0b159 100644
--- a/server/src/com/vaadin/server/SystemMessagesProvider.java
+++ b/server/src/main/java/com/vaadin/server/SystemMessagesProvider.java
diff --git a/server/src/com/vaadin/server/ThemeResource.java b/server/src/main/java/com/vaadin/server/ThemeResource.java
index 45a2736bf3..45a2736bf3 100644
--- a/server/src/com/vaadin/server/ThemeResource.java
+++ b/server/src/main/java/com/vaadin/server/ThemeResource.java
diff --git a/server/src/com/vaadin/server/UIClassSelectionEvent.java b/server/src/main/java/com/vaadin/server/UIClassSelectionEvent.java
index 9c9bbe5bc9..9c9bbe5bc9 100644
--- a/server/src/com/vaadin/server/UIClassSelectionEvent.java
+++ b/server/src/main/java/com/vaadin/server/UIClassSelectionEvent.java
diff --git a/server/src/com/vaadin/server/UICreateEvent.java b/server/src/main/java/com/vaadin/server/UICreateEvent.java
index 1688416ba5..1688416ba5 100644
--- a/server/src/com/vaadin/server/UICreateEvent.java
+++ b/server/src/main/java/com/vaadin/server/UICreateEvent.java
diff --git a/server/src/com/vaadin/server/UIProvider.java b/server/src/main/java/com/vaadin/server/UIProvider.java
index 7fd880919e..7fd880919e 100644
--- a/server/src/com/vaadin/server/UIProvider.java
+++ b/server/src/main/java/com/vaadin/server/UIProvider.java
diff --git a/server/src/com/vaadin/server/UIProviderEvent.java b/server/src/main/java/com/vaadin/server/UIProviderEvent.java
index 1fcc0a3ddc..1fcc0a3ddc 100644
--- a/server/src/com/vaadin/server/UIProviderEvent.java
+++ b/server/src/main/java/com/vaadin/server/UIProviderEvent.java
diff --git a/server/src/com/vaadin/server/UnsupportedBrowserHandler.java b/server/src/main/java/com/vaadin/server/UnsupportedBrowserHandler.java
index e5ea55b116..e5ea55b116 100644
--- a/server/src/com/vaadin/server/UnsupportedBrowserHandler.java
+++ b/server/src/main/java/com/vaadin/server/UnsupportedBrowserHandler.java
diff --git a/server/src/com/vaadin/server/UploadException.java b/server/src/main/java/com/vaadin/server/UploadException.java
index 1f1073b435..1f1073b435 100644
--- a/server/src/com/vaadin/server/UploadException.java
+++ b/server/src/main/java/com/vaadin/server/UploadException.java
diff --git a/server/src/com/vaadin/server/UserError.java b/server/src/main/java/com/vaadin/server/UserError.java
index ec1ac042f8..ec1ac042f8 100644
--- a/server/src/com/vaadin/server/UserError.java
+++ b/server/src/main/java/com/vaadin/server/UserError.java
diff --git a/server/src/com/vaadin/server/VaadinPortlet.java b/server/src/main/java/com/vaadin/server/VaadinPortlet.java
index 5c91b6669c..5c91b6669c 100644
--- a/server/src/com/vaadin/server/VaadinPortlet.java
+++ b/server/src/main/java/com/vaadin/server/VaadinPortlet.java
diff --git a/server/src/com/vaadin/server/VaadinPortletRequest.java b/server/src/main/java/com/vaadin/server/VaadinPortletRequest.java
index 93e06d7f45..93e06d7f45 100644
--- a/server/src/com/vaadin/server/VaadinPortletRequest.java
+++ b/server/src/main/java/com/vaadin/server/VaadinPortletRequest.java
diff --git a/server/src/com/vaadin/server/VaadinPortletResponse.java b/server/src/main/java/com/vaadin/server/VaadinPortletResponse.java
index 2b6e0c75fb..2b6e0c75fb 100644
--- a/server/src/com/vaadin/server/VaadinPortletResponse.java
+++ b/server/src/main/java/com/vaadin/server/VaadinPortletResponse.java
diff --git a/server/src/com/vaadin/server/VaadinPortletService.java b/server/src/main/java/com/vaadin/server/VaadinPortletService.java
index 5f22dd7d7c..5f22dd7d7c 100644
--- a/server/src/com/vaadin/server/VaadinPortletService.java
+++ b/server/src/main/java/com/vaadin/server/VaadinPortletService.java
diff --git a/server/src/com/vaadin/server/VaadinPortletSession.java b/server/src/main/java/com/vaadin/server/VaadinPortletSession.java
index 23b5027b03..23b5027b03 100644
--- a/server/src/com/vaadin/server/VaadinPortletSession.java
+++ b/server/src/main/java/com/vaadin/server/VaadinPortletSession.java
diff --git a/server/src/com/vaadin/server/VaadinRequest.java b/server/src/main/java/com/vaadin/server/VaadinRequest.java
index 5b7e16ac46..5b7e16ac46 100644
--- a/server/src/com/vaadin/server/VaadinRequest.java
+++ b/server/src/main/java/com/vaadin/server/VaadinRequest.java
diff --git a/server/src/com/vaadin/server/VaadinResponse.java b/server/src/main/java/com/vaadin/server/VaadinResponse.java
index c31c6c05d8..c31c6c05d8 100644
--- a/server/src/com/vaadin/server/VaadinResponse.java
+++ b/server/src/main/java/com/vaadin/server/VaadinResponse.java
diff --git a/server/src/com/vaadin/server/VaadinService.java b/server/src/main/java/com/vaadin/server/VaadinService.java
index 740371aec1..740371aec1 100644
--- a/server/src/com/vaadin/server/VaadinService.java
+++ b/server/src/main/java/com/vaadin/server/VaadinService.java
diff --git a/server/src/com/vaadin/server/VaadinServiceClassLoaderUtil.java b/server/src/main/java/com/vaadin/server/VaadinServiceClassLoaderUtil.java
index 8c85a6b3b3..8c85a6b3b3 100644
--- a/server/src/com/vaadin/server/VaadinServiceClassLoaderUtil.java
+++ b/server/src/main/java/com/vaadin/server/VaadinServiceClassLoaderUtil.java
diff --git a/server/src/com/vaadin/server/VaadinServlet.java b/server/src/main/java/com/vaadin/server/VaadinServlet.java
index cd6e4cd7cd..cd6e4cd7cd 100644
--- a/server/src/com/vaadin/server/VaadinServlet.java
+++ b/server/src/main/java/com/vaadin/server/VaadinServlet.java
diff --git a/server/src/com/vaadin/server/VaadinServletRequest.java b/server/src/main/java/com/vaadin/server/VaadinServletRequest.java
index c68eefedb1..c68eefedb1 100644
--- a/server/src/com/vaadin/server/VaadinServletRequest.java
+++ b/server/src/main/java/com/vaadin/server/VaadinServletRequest.java
diff --git a/server/src/com/vaadin/server/VaadinServletResponse.java b/server/src/main/java/com/vaadin/server/VaadinServletResponse.java
index fd688a594c..fd688a594c 100644
--- a/server/src/com/vaadin/server/VaadinServletResponse.java
+++ b/server/src/main/java/com/vaadin/server/VaadinServletResponse.java
diff --git a/server/src/com/vaadin/server/VaadinServletService.java b/server/src/main/java/com/vaadin/server/VaadinServletService.java
index 5faea1ce6c..5faea1ce6c 100644
--- a/server/src/com/vaadin/server/VaadinServletService.java
+++ b/server/src/main/java/com/vaadin/server/VaadinServletService.java
diff --git a/server/src/com/vaadin/server/VaadinSession.java b/server/src/main/java/com/vaadin/server/VaadinSession.java
index 304dd4bec6..304dd4bec6 100644
--- a/server/src/com/vaadin/server/VaadinSession.java
+++ b/server/src/main/java/com/vaadin/server/VaadinSession.java
diff --git a/server/src/com/vaadin/server/VariableOwner.java b/server/src/main/java/com/vaadin/server/VariableOwner.java
index 87a820e8b7..87a820e8b7 100644
--- a/server/src/com/vaadin/server/VariableOwner.java
+++ b/server/src/main/java/com/vaadin/server/VariableOwner.java
diff --git a/server/src/com/vaadin/server/ViewportGenerator.java b/server/src/main/java/com/vaadin/server/ViewportGenerator.java
index 33cc1341af..33cc1341af 100644
--- a/server/src/com/vaadin/server/ViewportGenerator.java
+++ b/server/src/main/java/com/vaadin/server/ViewportGenerator.java
diff --git a/server/src/com/vaadin/server/WebBrowser.java b/server/src/main/java/com/vaadin/server/WebBrowser.java
index 5b7d795793..5b7d795793 100644
--- a/server/src/com/vaadin/server/WebBrowser.java
+++ b/server/src/main/java/com/vaadin/server/WebBrowser.java
diff --git a/server/src/com/vaadin/server/WrappedHttpSession.java b/server/src/main/java/com/vaadin/server/WrappedHttpSession.java
index db4318e37a..db4318e37a 100644
--- a/server/src/com/vaadin/server/WrappedHttpSession.java
+++ b/server/src/main/java/com/vaadin/server/WrappedHttpSession.java
diff --git a/server/src/com/vaadin/server/WrappedPortletSession.java b/server/src/main/java/com/vaadin/server/WrappedPortletSession.java
index 9f0f1ac10f..9f0f1ac10f 100644
--- a/server/src/com/vaadin/server/WrappedPortletSession.java
+++ b/server/src/main/java/com/vaadin/server/WrappedPortletSession.java
diff --git a/server/src/com/vaadin/server/WrappedSession.java b/server/src/main/java/com/vaadin/server/WrappedSession.java
index b839e5d87a..b839e5d87a 100644
--- a/server/src/com/vaadin/server/WrappedSession.java
+++ b/server/src/main/java/com/vaadin/server/WrappedSession.java
diff --git a/server/src/com/vaadin/server/communication/AbstractStreamingEvent.java b/server/src/main/java/com/vaadin/server/communication/AbstractStreamingEvent.java
index 1f546b2489..1f546b2489 100644
--- a/server/src/com/vaadin/server/communication/AbstractStreamingEvent.java
+++ b/server/src/main/java/com/vaadin/server/communication/AbstractStreamingEvent.java
diff --git a/server/src/com/vaadin/server/communication/AtmospherePushConnection.java b/server/src/main/java/com/vaadin/server/communication/AtmospherePushConnection.java
index 5c0d2e14d4..5c0d2e14d4 100644
--- a/server/src/com/vaadin/server/communication/AtmospherePushConnection.java
+++ b/server/src/main/java/com/vaadin/server/communication/AtmospherePushConnection.java
diff --git a/server/src/com/vaadin/server/communication/ClientRpcWriter.java b/server/src/main/java/com/vaadin/server/communication/ClientRpcWriter.java
index 2ecf81287e..2ecf81287e 100644
--- a/server/src/com/vaadin/server/communication/ClientRpcWriter.java
+++ b/server/src/main/java/com/vaadin/server/communication/ClientRpcWriter.java
diff --git a/server/src/com/vaadin/server/communication/ConnectorHierarchyWriter.java b/server/src/main/java/com/vaadin/server/communication/ConnectorHierarchyWriter.java
index 16ed9985c4..16ed9985c4 100644
--- a/server/src/com/vaadin/server/communication/ConnectorHierarchyWriter.java
+++ b/server/src/main/java/com/vaadin/server/communication/ConnectorHierarchyWriter.java
diff --git a/server/src/com/vaadin/server/communication/ConnectorTypeWriter.java b/server/src/main/java/com/vaadin/server/communication/ConnectorTypeWriter.java
index d534987061..d534987061 100644
--- a/server/src/com/vaadin/server/communication/ConnectorTypeWriter.java
+++ b/server/src/main/java/com/vaadin/server/communication/ConnectorTypeWriter.java
diff --git a/server/src/com/vaadin/server/communication/DateSerializer.java b/server/src/main/java/com/vaadin/server/communication/DateSerializer.java
index 593728bac7..593728bac7 100644
--- a/server/src/com/vaadin/server/communication/DateSerializer.java
+++ b/server/src/main/java/com/vaadin/server/communication/DateSerializer.java
diff --git a/server/src/com/vaadin/server/communication/FileUploadHandler.java b/server/src/main/java/com/vaadin/server/communication/FileUploadHandler.java
index b9eaff3bd1..b9eaff3bd1 100644
--- a/server/src/com/vaadin/server/communication/FileUploadHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/FileUploadHandler.java
diff --git a/server/src/com/vaadin/server/communication/HeartbeatHandler.java b/server/src/main/java/com/vaadin/server/communication/HeartbeatHandler.java
index c6711d1d18..c6711d1d18 100644
--- a/server/src/com/vaadin/server/communication/HeartbeatHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/HeartbeatHandler.java
diff --git a/server/src/com/vaadin/server/communication/JSONSerializer.java b/server/src/main/java/com/vaadin/server/communication/JSONSerializer.java
index 7f673d01e8..7f673d01e8 100644
--- a/server/src/com/vaadin/server/communication/JSONSerializer.java
+++ b/server/src/main/java/com/vaadin/server/communication/JSONSerializer.java
diff --git a/server/src/com/vaadin/server/communication/JSR356WebsocketInitializer.java b/server/src/main/java/com/vaadin/server/communication/JSR356WebsocketInitializer.java
index 6d2843a4fc..6d2843a4fc 100644
--- a/server/src/com/vaadin/server/communication/JSR356WebsocketInitializer.java
+++ b/server/src/main/java/com/vaadin/server/communication/JSR356WebsocketInitializer.java
diff --git a/server/src/com/vaadin/server/communication/LegacyUidlWriter.java b/server/src/main/java/com/vaadin/server/communication/LegacyUidlWriter.java
index 3f70a25c5b..3f70a25c5b 100644
--- a/server/src/com/vaadin/server/communication/LegacyUidlWriter.java
+++ b/server/src/main/java/com/vaadin/server/communication/LegacyUidlWriter.java
diff --git a/server/src/com/vaadin/server/communication/MetadataWriter.java b/server/src/main/java/com/vaadin/server/communication/MetadataWriter.java
index 9c46e64692..9c46e64692 100644
--- a/server/src/com/vaadin/server/communication/MetadataWriter.java
+++ b/server/src/main/java/com/vaadin/server/communication/MetadataWriter.java
diff --git a/server/src/com/vaadin/server/communication/PortletBootstrapHandler.java b/server/src/main/java/com/vaadin/server/communication/PortletBootstrapHandler.java
index 289309b631..289309b631 100644
--- a/server/src/com/vaadin/server/communication/PortletBootstrapHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/PortletBootstrapHandler.java
diff --git a/server/src/com/vaadin/server/communication/PortletDummyRequestHandler.java b/server/src/main/java/com/vaadin/server/communication/PortletDummyRequestHandler.java
index a79f5e96f2..a79f5e96f2 100644
--- a/server/src/com/vaadin/server/communication/PortletDummyRequestHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/PortletDummyRequestHandler.java
diff --git a/server/src/com/vaadin/server/communication/PortletListenerNotifier.java b/server/src/main/java/com/vaadin/server/communication/PortletListenerNotifier.java
index 3aa3426d2f..3aa3426d2f 100644
--- a/server/src/com/vaadin/server/communication/PortletListenerNotifier.java
+++ b/server/src/main/java/com/vaadin/server/communication/PortletListenerNotifier.java
diff --git a/server/src/com/vaadin/server/communication/PortletStateAwareRequestHandler.java b/server/src/main/java/com/vaadin/server/communication/PortletStateAwareRequestHandler.java
index a1276025d8..a1276025d8 100644
--- a/server/src/com/vaadin/server/communication/PortletStateAwareRequestHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/PortletStateAwareRequestHandler.java
diff --git a/server/src/com/vaadin/server/communication/PortletUIInitHandler.java b/server/src/main/java/com/vaadin/server/communication/PortletUIInitHandler.java
index b3cda44592..b3cda44592 100644
--- a/server/src/com/vaadin/server/communication/PortletUIInitHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/PortletUIInitHandler.java
diff --git a/server/src/com/vaadin/server/communication/PublishedFileHandler.java b/server/src/main/java/com/vaadin/server/communication/PublishedFileHandler.java
index 56edffd16d..56edffd16d 100644
--- a/server/src/com/vaadin/server/communication/PublishedFileHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/PublishedFileHandler.java
diff --git a/server/src/com/vaadin/server/communication/PushAtmosphereHandler.java b/server/src/main/java/com/vaadin/server/communication/PushAtmosphereHandler.java
index 50279a1a74..50279a1a74 100644
--- a/server/src/com/vaadin/server/communication/PushAtmosphereHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/PushAtmosphereHandler.java
diff --git a/server/src/com/vaadin/server/communication/PushConnection.java b/server/src/main/java/com/vaadin/server/communication/PushConnection.java
index d5a0d6e9bc..d5a0d6e9bc 100644
--- a/server/src/com/vaadin/server/communication/PushConnection.java
+++ b/server/src/main/java/com/vaadin/server/communication/PushConnection.java
diff --git a/server/src/com/vaadin/server/communication/PushHandler.java b/server/src/main/java/com/vaadin/server/communication/PushHandler.java
index 0b4fe28b77..0b4fe28b77 100644
--- a/server/src/com/vaadin/server/communication/PushHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/PushHandler.java
diff --git a/server/src/com/vaadin/server/communication/PushRequestHandler.java b/server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java
index 84b81c8963..84b81c8963 100644
--- a/server/src/com/vaadin/server/communication/PushRequestHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/PushRequestHandler.java
diff --git a/server/src/com/vaadin/server/communication/ResourceWriter.java b/server/src/main/java/com/vaadin/server/communication/ResourceWriter.java
index 2c5d1b409b..2c5d1b409b 100644
--- a/server/src/com/vaadin/server/communication/ResourceWriter.java
+++ b/server/src/main/java/com/vaadin/server/communication/ResourceWriter.java
diff --git a/server/src/com/vaadin/server/communication/ServerRpcHandler.java b/server/src/main/java/com/vaadin/server/communication/ServerRpcHandler.java
index be261ede92..be261ede92 100644
--- a/server/src/com/vaadin/server/communication/ServerRpcHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/ServerRpcHandler.java
diff --git a/server/src/com/vaadin/server/communication/ServletBootstrapHandler.java b/server/src/main/java/com/vaadin/server/communication/ServletBootstrapHandler.java
index 46909cecee..46909cecee 100644
--- a/server/src/com/vaadin/server/communication/ServletBootstrapHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/ServletBootstrapHandler.java
diff --git a/server/src/com/vaadin/server/communication/ServletUIInitHandler.java b/server/src/main/java/com/vaadin/server/communication/ServletUIInitHandler.java
index b3b1684809..b3b1684809 100644
--- a/server/src/com/vaadin/server/communication/ServletUIInitHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/ServletUIInitHandler.java
diff --git a/server/src/com/vaadin/server/communication/SessionRequestHandler.java b/server/src/main/java/com/vaadin/server/communication/SessionRequestHandler.java
index 383ad2d541..383ad2d541 100644
--- a/server/src/com/vaadin/server/communication/SessionRequestHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/SessionRequestHandler.java
diff --git a/server/src/com/vaadin/server/communication/SharedStateWriter.java b/server/src/main/java/com/vaadin/server/communication/SharedStateWriter.java
index 06b59ad4cc..06b59ad4cc 100644
--- a/server/src/com/vaadin/server/communication/SharedStateWriter.java
+++ b/server/src/main/java/com/vaadin/server/communication/SharedStateWriter.java
diff --git a/server/src/com/vaadin/server/communication/StreamingEndEventImpl.java b/server/src/main/java/com/vaadin/server/communication/StreamingEndEventImpl.java
index 6d87d0cc8b..6d87d0cc8b 100644
--- a/server/src/com/vaadin/server/communication/StreamingEndEventImpl.java
+++ b/server/src/main/java/com/vaadin/server/communication/StreamingEndEventImpl.java
diff --git a/server/src/com/vaadin/server/communication/StreamingErrorEventImpl.java b/server/src/main/java/com/vaadin/server/communication/StreamingErrorEventImpl.java
index a96f759216..a96f759216 100644
--- a/server/src/com/vaadin/server/communication/StreamingErrorEventImpl.java
+++ b/server/src/main/java/com/vaadin/server/communication/StreamingErrorEventImpl.java
diff --git a/server/src/com/vaadin/server/communication/StreamingProgressEventImpl.java b/server/src/main/java/com/vaadin/server/communication/StreamingProgressEventImpl.java
index 7f2428a55d..7f2428a55d 100644
--- a/server/src/com/vaadin/server/communication/StreamingProgressEventImpl.java
+++ b/server/src/main/java/com/vaadin/server/communication/StreamingProgressEventImpl.java
diff --git a/server/src/com/vaadin/server/communication/StreamingStartEventImpl.java b/server/src/main/java/com/vaadin/server/communication/StreamingStartEventImpl.java
index a2ce075458..a2ce075458 100644
--- a/server/src/com/vaadin/server/communication/StreamingStartEventImpl.java
+++ b/server/src/main/java/com/vaadin/server/communication/StreamingStartEventImpl.java
diff --git a/server/src/com/vaadin/server/communication/UIInitHandler.java b/server/src/main/java/com/vaadin/server/communication/UIInitHandler.java
index f380a6df6e..f380a6df6e 100644
--- a/server/src/com/vaadin/server/communication/UIInitHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/UIInitHandler.java
diff --git a/server/src/com/vaadin/server/communication/UidlRequestHandler.java b/server/src/main/java/com/vaadin/server/communication/UidlRequestHandler.java
index 20b906c3e6..20b906c3e6 100644
--- a/server/src/com/vaadin/server/communication/UidlRequestHandler.java
+++ b/server/src/main/java/com/vaadin/server/communication/UidlRequestHandler.java
diff --git a/server/src/com/vaadin/server/communication/UidlWriter.java b/server/src/main/java/com/vaadin/server/communication/UidlWriter.java
index 8a4e62fb24..8a4e62fb24 100644
--- a/server/src/com/vaadin/server/communication/UidlWriter.java
+++ b/server/src/main/java/com/vaadin/server/communication/UidlWriter.java
diff --git a/server/src/com/vaadin/server/communication/data/DataGenerator.java b/server/src/main/java/com/vaadin/server/communication/data/DataGenerator.java
index 58ba1b3b00..58ba1b3b00 100644
--- a/server/src/com/vaadin/server/communication/data/DataGenerator.java
+++ b/server/src/main/java/com/vaadin/server/communication/data/DataGenerator.java
diff --git a/server/src/com/vaadin/server/communication/data/RpcDataProviderExtension.java b/server/src/main/java/com/vaadin/server/communication/data/RpcDataProviderExtension.java
index 1b78ca4518..1b78ca4518 100644
--- a/server/src/com/vaadin/server/communication/data/RpcDataProviderExtension.java
+++ b/server/src/main/java/com/vaadin/server/communication/data/RpcDataProviderExtension.java
diff --git a/server/src/com/vaadin/server/themeutils/SASSAddonImportFileCreator.java b/server/src/main/java/com/vaadin/server/themeutils/SASSAddonImportFileCreator.java
index cfee2a320e..cfee2a320e 100644
--- a/server/src/com/vaadin/server/themeutils/SASSAddonImportFileCreator.java
+++ b/server/src/main/java/com/vaadin/server/themeutils/SASSAddonImportFileCreator.java
diff --git a/server/src/com/vaadin/server/widgetsetutils/ClassPathExplorer.java b/server/src/main/java/com/vaadin/server/widgetsetutils/ClassPathExplorer.java
index 45bd3751d3..45bd3751d3 100644
--- a/server/src/com/vaadin/server/widgetsetutils/ClassPathExplorer.java
+++ b/server/src/main/java/com/vaadin/server/widgetsetutils/ClassPathExplorer.java
diff --git a/server/src/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java b/server/src/main/java/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java
index b0d8cdd004..b0d8cdd004 100644
--- a/server/src/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java
+++ b/server/src/main/java/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java
diff --git a/server/src/com/vaadin/ui/AbsoluteLayout.java b/server/src/main/java/com/vaadin/ui/AbsoluteLayout.java
index c62da24612..c62da24612 100644
--- a/server/src/com/vaadin/ui/AbsoluteLayout.java
+++ b/server/src/main/java/com/vaadin/ui/AbsoluteLayout.java
diff --git a/server/src/com/vaadin/ui/AbstractColorPicker.java b/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java
index 4ce4e46d6a..4ce4e46d6a 100644
--- a/server/src/com/vaadin/ui/AbstractColorPicker.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java
diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/main/java/com/vaadin/ui/AbstractComponent.java
index d3506e9097..d3506e9097 100644
--- a/server/src/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractComponent.java
diff --git a/server/src/com/vaadin/ui/AbstractComponentContainer.java b/server/src/main/java/com/vaadin/ui/AbstractComponentContainer.java
index 1095331602..1095331602 100644
--- a/server/src/com/vaadin/ui/AbstractComponentContainer.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractComponentContainer.java
diff --git a/server/src/com/vaadin/ui/AbstractEmbedded.java b/server/src/main/java/com/vaadin/ui/AbstractEmbedded.java
index a38e9bb788..a38e9bb788 100644
--- a/server/src/com/vaadin/ui/AbstractEmbedded.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractEmbedded.java
diff --git a/server/src/com/vaadin/ui/AbstractField.java b/server/src/main/java/com/vaadin/ui/AbstractField.java
index e69322b1cc..e69322b1cc 100644
--- a/server/src/com/vaadin/ui/AbstractField.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractField.java
diff --git a/server/src/com/vaadin/ui/AbstractFocusable.java b/server/src/main/java/com/vaadin/ui/AbstractFocusable.java
index ad3b96f29b..ad3b96f29b 100644
--- a/server/src/com/vaadin/ui/AbstractFocusable.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractFocusable.java
diff --git a/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java b/server/src/main/java/com/vaadin/ui/AbstractJavaScriptComponent.java
index 68ff947137..68ff947137 100644
--- a/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractJavaScriptComponent.java
diff --git a/server/src/com/vaadin/ui/AbstractLayout.java b/server/src/main/java/com/vaadin/ui/AbstractLayout.java
index 0770670680..0770670680 100644
--- a/server/src/com/vaadin/ui/AbstractLayout.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractLayout.java
diff --git a/server/src/com/vaadin/ui/AbstractMedia.java b/server/src/main/java/com/vaadin/ui/AbstractMedia.java
index a0344624d7..a0344624d7 100644
--- a/server/src/com/vaadin/ui/AbstractMedia.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractMedia.java
diff --git a/server/src/com/vaadin/ui/AbstractOrderedLayout.java b/server/src/main/java/com/vaadin/ui/AbstractOrderedLayout.java
index f517ab0af5..f517ab0af5 100644
--- a/server/src/com/vaadin/ui/AbstractOrderedLayout.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractOrderedLayout.java
diff --git a/server/src/com/vaadin/ui/AbstractSelect.java b/server/src/main/java/com/vaadin/ui/AbstractSelect.java
index 2714e0cbf5..2714e0cbf5 100644
--- a/server/src/com/vaadin/ui/AbstractSelect.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractSelect.java
diff --git a/server/src/com/vaadin/ui/AbstractSingleComponentContainer.java b/server/src/main/java/com/vaadin/ui/AbstractSingleComponentContainer.java
index 0854ffe9c2..0854ffe9c2 100644
--- a/server/src/com/vaadin/ui/AbstractSingleComponentContainer.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractSingleComponentContainer.java
diff --git a/server/src/com/vaadin/ui/AbstractSplitPanel.java b/server/src/main/java/com/vaadin/ui/AbstractSplitPanel.java
index 0561996277..0561996277 100644
--- a/server/src/com/vaadin/ui/AbstractSplitPanel.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractSplitPanel.java
diff --git a/server/src/com/vaadin/ui/AbstractTextField.java b/server/src/main/java/com/vaadin/ui/AbstractTextField.java
index 5fbe60937a..5fbe60937a 100644
--- a/server/src/com/vaadin/ui/AbstractTextField.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractTextField.java
diff --git a/server/src/com/vaadin/ui/Accordion.java b/server/src/main/java/com/vaadin/ui/Accordion.java
index 1d53937d24..1d53937d24 100644
--- a/server/src/com/vaadin/ui/Accordion.java
+++ b/server/src/main/java/com/vaadin/ui/Accordion.java
diff --git a/server/src/com/vaadin/ui/Alignment.java b/server/src/main/java/com/vaadin/ui/Alignment.java
index 57131494ac..57131494ac 100644
--- a/server/src/com/vaadin/ui/Alignment.java
+++ b/server/src/main/java/com/vaadin/ui/Alignment.java
diff --git a/server/src/com/vaadin/ui/Audio.java b/server/src/main/java/com/vaadin/ui/Audio.java
index 8b9fad2196..8b9fad2196 100644
--- a/server/src/com/vaadin/ui/Audio.java
+++ b/server/src/main/java/com/vaadin/ui/Audio.java
diff --git a/server/src/com/vaadin/ui/BrowserFrame.java b/server/src/main/java/com/vaadin/ui/BrowserFrame.java
index 5717941ac5..5717941ac5 100644
--- a/server/src/com/vaadin/ui/BrowserFrame.java
+++ b/server/src/main/java/com/vaadin/ui/BrowserFrame.java
diff --git a/server/src/com/vaadin/ui/Button.java b/server/src/main/java/com/vaadin/ui/Button.java
index 677e8cac7d..677e8cac7d 100644
--- a/server/src/com/vaadin/ui/Button.java
+++ b/server/src/main/java/com/vaadin/ui/Button.java
diff --git a/server/src/com/vaadin/ui/Calendar.java b/server/src/main/java/com/vaadin/ui/Calendar.java
index 028a094cb5..028a094cb5 100644
--- a/server/src/com/vaadin/ui/Calendar.java
+++ b/server/src/main/java/com/vaadin/ui/Calendar.java
diff --git a/server/src/com/vaadin/ui/CheckBox.java b/server/src/main/java/com/vaadin/ui/CheckBox.java
index 8b31edcbb4..8b31edcbb4 100644
--- a/server/src/com/vaadin/ui/CheckBox.java
+++ b/server/src/main/java/com/vaadin/ui/CheckBox.java
diff --git a/server/src/com/vaadin/ui/ColorPicker.java b/server/src/main/java/com/vaadin/ui/ColorPicker.java
index 9e46c4e718..9e46c4e718 100644
--- a/server/src/com/vaadin/ui/ColorPicker.java
+++ b/server/src/main/java/com/vaadin/ui/ColorPicker.java
diff --git a/server/src/com/vaadin/ui/ColorPickerArea.java b/server/src/main/java/com/vaadin/ui/ColorPickerArea.java
index 94f64cf256..94f64cf256 100644
--- a/server/src/com/vaadin/ui/ColorPickerArea.java
+++ b/server/src/main/java/com/vaadin/ui/ColorPickerArea.java
diff --git a/server/src/com/vaadin/ui/ComboBox.java b/server/src/main/java/com/vaadin/ui/ComboBox.java
index b632cb0d8d..b632cb0d8d 100644
--- a/server/src/com/vaadin/ui/ComboBox.java
+++ b/server/src/main/java/com/vaadin/ui/ComboBox.java
diff --git a/server/src/com/vaadin/ui/Component.java b/server/src/main/java/com/vaadin/ui/Component.java
index 5db48806c3..5db48806c3 100644
--- a/server/src/com/vaadin/ui/Component.java
+++ b/server/src/main/java/com/vaadin/ui/Component.java
diff --git a/server/src/com/vaadin/ui/ComponentContainer.java b/server/src/main/java/com/vaadin/ui/ComponentContainer.java
index 2d5b4ffa9a..2d5b4ffa9a 100644
--- a/server/src/com/vaadin/ui/ComponentContainer.java
+++ b/server/src/main/java/com/vaadin/ui/ComponentContainer.java
diff --git a/server/src/com/vaadin/ui/ConnectorTracker.java b/server/src/main/java/com/vaadin/ui/ConnectorTracker.java
index 159bd09c0d..159bd09c0d 100644
--- a/server/src/com/vaadin/ui/ConnectorTracker.java
+++ b/server/src/main/java/com/vaadin/ui/ConnectorTracker.java
diff --git a/server/src/com/vaadin/ui/CssLayout.java b/server/src/main/java/com/vaadin/ui/CssLayout.java
index dbedfa53ff..dbedfa53ff 100644
--- a/server/src/com/vaadin/ui/CssLayout.java
+++ b/server/src/main/java/com/vaadin/ui/CssLayout.java
diff --git a/server/src/com/vaadin/ui/CustomComponent.java b/server/src/main/java/com/vaadin/ui/CustomComponent.java
index 55f9d7db03..55f9d7db03 100644
--- a/server/src/com/vaadin/ui/CustomComponent.java
+++ b/server/src/main/java/com/vaadin/ui/CustomComponent.java
diff --git a/server/src/com/vaadin/ui/CustomField.java b/server/src/main/java/com/vaadin/ui/CustomField.java
index 12f00ac23f..12f00ac23f 100644
--- a/server/src/com/vaadin/ui/CustomField.java
+++ b/server/src/main/java/com/vaadin/ui/CustomField.java
diff --git a/server/src/com/vaadin/ui/CustomLayout.java b/server/src/main/java/com/vaadin/ui/CustomLayout.java
index d64f70e95e..d64f70e95e 100644
--- a/server/src/com/vaadin/ui/CustomLayout.java
+++ b/server/src/main/java/com/vaadin/ui/CustomLayout.java
diff --git a/server/src/com/vaadin/ui/DateField.java b/server/src/main/java/com/vaadin/ui/DateField.java
index 052539cd28..052539cd28 100644
--- a/server/src/com/vaadin/ui/DateField.java
+++ b/server/src/main/java/com/vaadin/ui/DateField.java
diff --git a/server/src/com/vaadin/ui/DefaultFieldFactory.java b/server/src/main/java/com/vaadin/ui/DefaultFieldFactory.java
index 535943bcd5..535943bcd5 100644
--- a/server/src/com/vaadin/ui/DefaultFieldFactory.java
+++ b/server/src/main/java/com/vaadin/ui/DefaultFieldFactory.java
diff --git a/server/src/com/vaadin/ui/DragAndDropWrapper.java b/server/src/main/java/com/vaadin/ui/DragAndDropWrapper.java
index 29179ddca7..29179ddca7 100644
--- a/server/src/com/vaadin/ui/DragAndDropWrapper.java
+++ b/server/src/main/java/com/vaadin/ui/DragAndDropWrapper.java
diff --git a/server/src/com/vaadin/ui/Embedded.java b/server/src/main/java/com/vaadin/ui/Embedded.java
index d83eef9c4d..d83eef9c4d 100644
--- a/server/src/com/vaadin/ui/Embedded.java
+++ b/server/src/main/java/com/vaadin/ui/Embedded.java
diff --git a/server/src/com/vaadin/ui/Field.java b/server/src/main/java/com/vaadin/ui/Field.java
index 8a9acd570f..8a9acd570f 100644
--- a/server/src/com/vaadin/ui/Field.java
+++ b/server/src/main/java/com/vaadin/ui/Field.java
diff --git a/server/src/com/vaadin/ui/Flash.java b/server/src/main/java/com/vaadin/ui/Flash.java
index 6e99d2fe35..6e99d2fe35 100644
--- a/server/src/com/vaadin/ui/Flash.java
+++ b/server/src/main/java/com/vaadin/ui/Flash.java
diff --git a/server/src/com/vaadin/ui/Form.java b/server/src/main/java/com/vaadin/ui/Form.java
index 45532756e5..45532756e5 100644
--- a/server/src/com/vaadin/ui/Form.java
+++ b/server/src/main/java/com/vaadin/ui/Form.java
diff --git a/server/src/com/vaadin/ui/FormFieldFactory.java b/server/src/main/java/com/vaadin/ui/FormFieldFactory.java
index 124e0fcb9a..124e0fcb9a 100644
--- a/server/src/com/vaadin/ui/FormFieldFactory.java
+++ b/server/src/main/java/com/vaadin/ui/FormFieldFactory.java
diff --git a/server/src/com/vaadin/ui/FormLayout.java b/server/src/main/java/com/vaadin/ui/FormLayout.java
index c817300e53..c817300e53 100644
--- a/server/src/com/vaadin/ui/FormLayout.java
+++ b/server/src/main/java/com/vaadin/ui/FormLayout.java
diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/main/java/com/vaadin/ui/Grid.java
index 036fe8b756..036fe8b756 100644
--- a/server/src/com/vaadin/ui/Grid.java
+++ b/server/src/main/java/com/vaadin/ui/Grid.java
diff --git a/server/src/com/vaadin/ui/GridLayout.java b/server/src/main/java/com/vaadin/ui/GridLayout.java
index 148fd85fff..148fd85fff 100644
--- a/server/src/com/vaadin/ui/GridLayout.java
+++ b/server/src/main/java/com/vaadin/ui/GridLayout.java
diff --git a/server/src/com/vaadin/ui/HasChildMeasurementHint.java b/server/src/main/java/com/vaadin/ui/HasChildMeasurementHint.java
index 86d33f57b2..86d33f57b2 100644
--- a/server/src/com/vaadin/ui/HasChildMeasurementHint.java
+++ b/server/src/main/java/com/vaadin/ui/HasChildMeasurementHint.java
diff --git a/server/src/com/vaadin/ui/HasComponents.java b/server/src/main/java/com/vaadin/ui/HasComponents.java
index 6273e8053b..6273e8053b 100644
--- a/server/src/com/vaadin/ui/HasComponents.java
+++ b/server/src/main/java/com/vaadin/ui/HasComponents.java
diff --git a/server/src/com/vaadin/ui/HorizontalLayout.java b/server/src/main/java/com/vaadin/ui/HorizontalLayout.java
index 616fa09225..616fa09225 100644
--- a/server/src/com/vaadin/ui/HorizontalLayout.java
+++ b/server/src/main/java/com/vaadin/ui/HorizontalLayout.java
diff --git a/server/src/com/vaadin/ui/HorizontalSplitPanel.java b/server/src/main/java/com/vaadin/ui/HorizontalSplitPanel.java
index 922986eeda..922986eeda 100644
--- a/server/src/com/vaadin/ui/HorizontalSplitPanel.java
+++ b/server/src/main/java/com/vaadin/ui/HorizontalSplitPanel.java
diff --git a/server/src/com/vaadin/ui/Html5File.java b/server/src/main/java/com/vaadin/ui/Html5File.java
index 87ea83c8c9..87ea83c8c9 100644
--- a/server/src/com/vaadin/ui/Html5File.java
+++ b/server/src/main/java/com/vaadin/ui/Html5File.java
diff --git a/server/src/com/vaadin/ui/Image.java b/server/src/main/java/com/vaadin/ui/Image.java
index 7b0294a450..7b0294a450 100644
--- a/server/src/com/vaadin/ui/Image.java
+++ b/server/src/main/java/com/vaadin/ui/Image.java
diff --git a/server/src/com/vaadin/ui/InlineDateField.java b/server/src/main/java/com/vaadin/ui/InlineDateField.java
index e6f0f5d7a0..e6f0f5d7a0 100644
--- a/server/src/com/vaadin/ui/InlineDateField.java
+++ b/server/src/main/java/com/vaadin/ui/InlineDateField.java
diff --git a/server/src/com/vaadin/ui/JavaScript.java b/server/src/main/java/com/vaadin/ui/JavaScript.java
index 668ae67056..668ae67056 100644
--- a/server/src/com/vaadin/ui/JavaScript.java
+++ b/server/src/main/java/com/vaadin/ui/JavaScript.java
diff --git a/server/src/com/vaadin/ui/JavaScriptFunction.java b/server/src/main/java/com/vaadin/ui/JavaScriptFunction.java
index 071c88350b..071c88350b 100644
--- a/server/src/com/vaadin/ui/JavaScriptFunction.java
+++ b/server/src/main/java/com/vaadin/ui/JavaScriptFunction.java
diff --git a/server/src/com/vaadin/ui/Label.java b/server/src/main/java/com/vaadin/ui/Label.java
index 1498246ec5..1498246ec5 100644
--- a/server/src/com/vaadin/ui/Label.java
+++ b/server/src/main/java/com/vaadin/ui/Label.java
diff --git a/server/src/com/vaadin/ui/Layout.java b/server/src/main/java/com/vaadin/ui/Layout.java
index 6cf2cec249..6cf2cec249 100644
--- a/server/src/com/vaadin/ui/Layout.java
+++ b/server/src/main/java/com/vaadin/ui/Layout.java
diff --git a/server/src/com/vaadin/ui/LegacyComponent.java b/server/src/main/java/com/vaadin/ui/LegacyComponent.java
index 7f71162c94..7f71162c94 100644
--- a/server/src/com/vaadin/ui/LegacyComponent.java
+++ b/server/src/main/java/com/vaadin/ui/LegacyComponent.java
diff --git a/server/src/com/vaadin/ui/LegacyWindow.java b/server/src/main/java/com/vaadin/ui/LegacyWindow.java
index fe71d14430..fe71d14430 100644
--- a/server/src/com/vaadin/ui/LegacyWindow.java
+++ b/server/src/main/java/com/vaadin/ui/LegacyWindow.java
diff --git a/server/src/com/vaadin/ui/Link.java b/server/src/main/java/com/vaadin/ui/Link.java
index c100336180..c100336180 100644
--- a/server/src/com/vaadin/ui/Link.java
+++ b/server/src/main/java/com/vaadin/ui/Link.java
diff --git a/server/src/com/vaadin/ui/ListSelect.java b/server/src/main/java/com/vaadin/ui/ListSelect.java
index 9f44407db9..9f44407db9 100644
--- a/server/src/com/vaadin/ui/ListSelect.java
+++ b/server/src/main/java/com/vaadin/ui/ListSelect.java
diff --git a/server/src/com/vaadin/ui/LoadingIndicatorConfiguration.java b/server/src/main/java/com/vaadin/ui/LoadingIndicatorConfiguration.java
index 46fe7ead35..46fe7ead35 100644
--- a/server/src/com/vaadin/ui/LoadingIndicatorConfiguration.java
+++ b/server/src/main/java/com/vaadin/ui/LoadingIndicatorConfiguration.java
diff --git a/server/src/com/vaadin/ui/LoginForm.java b/server/src/main/java/com/vaadin/ui/LoginForm.java
index 1f0e3fc3b3..1f0e3fc3b3 100644
--- a/server/src/com/vaadin/ui/LoginForm.java
+++ b/server/src/main/java/com/vaadin/ui/LoginForm.java
diff --git a/server/src/com/vaadin/ui/MenuBar.java b/server/src/main/java/com/vaadin/ui/MenuBar.java
index 9f05df7869..9f05df7869 100644
--- a/server/src/com/vaadin/ui/MenuBar.java
+++ b/server/src/main/java/com/vaadin/ui/MenuBar.java
diff --git a/server/src/com/vaadin/ui/NativeButton.java b/server/src/main/java/com/vaadin/ui/NativeButton.java
index 3c220719b5..3c220719b5 100644
--- a/server/src/com/vaadin/ui/NativeButton.java
+++ b/server/src/main/java/com/vaadin/ui/NativeButton.java
diff --git a/server/src/com/vaadin/ui/NativeSelect.java b/server/src/main/java/com/vaadin/ui/NativeSelect.java
index 137d57f677..137d57f677 100644
--- a/server/src/com/vaadin/ui/NativeSelect.java
+++ b/server/src/main/java/com/vaadin/ui/NativeSelect.java
diff --git a/server/src/com/vaadin/ui/Notification.java b/server/src/main/java/com/vaadin/ui/Notification.java
index aaf25a9e9d..aaf25a9e9d 100644
--- a/server/src/com/vaadin/ui/Notification.java
+++ b/server/src/main/java/com/vaadin/ui/Notification.java
diff --git a/server/src/com/vaadin/ui/NotificationConfiguration.java b/server/src/main/java/com/vaadin/ui/NotificationConfiguration.java
index 925c888a51..925c888a51 100644
--- a/server/src/com/vaadin/ui/NotificationConfiguration.java
+++ b/server/src/main/java/com/vaadin/ui/NotificationConfiguration.java
diff --git a/server/src/com/vaadin/ui/OptionGroup.java b/server/src/main/java/com/vaadin/ui/OptionGroup.java
index 81e81c9a3a..81e81c9a3a 100644
--- a/server/src/com/vaadin/ui/OptionGroup.java
+++ b/server/src/main/java/com/vaadin/ui/OptionGroup.java
diff --git a/server/src/com/vaadin/ui/Panel.java b/server/src/main/java/com/vaadin/ui/Panel.java
index 6458d5f57d..6458d5f57d 100644
--- a/server/src/com/vaadin/ui/Panel.java
+++ b/server/src/main/java/com/vaadin/ui/Panel.java
diff --git a/server/src/com/vaadin/ui/PasswordField.java b/server/src/main/java/com/vaadin/ui/PasswordField.java
index 385649c318..385649c318 100644
--- a/server/src/com/vaadin/ui/PasswordField.java
+++ b/server/src/main/java/com/vaadin/ui/PasswordField.java
diff --git a/server/src/com/vaadin/ui/PopupDateField.java b/server/src/main/java/com/vaadin/ui/PopupDateField.java
index f07ac84160..f07ac84160 100644
--- a/server/src/com/vaadin/ui/PopupDateField.java
+++ b/server/src/main/java/com/vaadin/ui/PopupDateField.java
diff --git a/server/src/com/vaadin/ui/PopupView.java b/server/src/main/java/com/vaadin/ui/PopupView.java
index 73c93b29f3..73c93b29f3 100644
--- a/server/src/com/vaadin/ui/PopupView.java
+++ b/server/src/main/java/com/vaadin/ui/PopupView.java
diff --git a/server/src/com/vaadin/ui/ProgressBar.java b/server/src/main/java/com/vaadin/ui/ProgressBar.java
index d38067d51e..d38067d51e 100644
--- a/server/src/com/vaadin/ui/ProgressBar.java
+++ b/server/src/main/java/com/vaadin/ui/ProgressBar.java
diff --git a/server/src/com/vaadin/ui/ProgressIndicator.java b/server/src/main/java/com/vaadin/ui/ProgressIndicator.java
index 6e436169e3..6e436169e3 100644
--- a/server/src/com/vaadin/ui/ProgressIndicator.java
+++ b/server/src/main/java/com/vaadin/ui/ProgressIndicator.java
diff --git a/server/src/com/vaadin/ui/PushConfiguration.java b/server/src/main/java/com/vaadin/ui/PushConfiguration.java
index 6ef323cea8..6ef323cea8 100644
--- a/server/src/com/vaadin/ui/PushConfiguration.java
+++ b/server/src/main/java/com/vaadin/ui/PushConfiguration.java
diff --git a/server/src/com/vaadin/ui/ReconnectDialogConfiguration.java b/server/src/main/java/com/vaadin/ui/ReconnectDialogConfiguration.java
index 92eb1e785f..92eb1e785f 100644
--- a/server/src/com/vaadin/ui/ReconnectDialogConfiguration.java
+++ b/server/src/main/java/com/vaadin/ui/ReconnectDialogConfiguration.java
diff --git a/server/src/com/vaadin/ui/RichTextArea.java b/server/src/main/java/com/vaadin/ui/RichTextArea.java
index 2f0ba215b9..2f0ba215b9 100644
--- a/server/src/com/vaadin/ui/RichTextArea.java
+++ b/server/src/main/java/com/vaadin/ui/RichTextArea.java
diff --git a/server/src/com/vaadin/ui/Select.java b/server/src/main/java/com/vaadin/ui/Select.java
index e63cba3eaa..e63cba3eaa 100644
--- a/server/src/com/vaadin/ui/Select.java
+++ b/server/src/main/java/com/vaadin/ui/Select.java
diff --git a/server/src/com/vaadin/ui/SelectiveRenderer.java b/server/src/main/java/com/vaadin/ui/SelectiveRenderer.java
index 5c4d052a53..5c4d052a53 100644
--- a/server/src/com/vaadin/ui/SelectiveRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/SelectiveRenderer.java
diff --git a/server/src/com/vaadin/ui/SingleComponentContainer.java b/server/src/main/java/com/vaadin/ui/SingleComponentContainer.java
index 9feee84f15..9feee84f15 100644
--- a/server/src/com/vaadin/ui/SingleComponentContainer.java
+++ b/server/src/main/java/com/vaadin/ui/SingleComponentContainer.java
diff --git a/server/src/com/vaadin/ui/Slider.java b/server/src/main/java/com/vaadin/ui/Slider.java
index 1fd6d425fe..1fd6d425fe 100644
--- a/server/src/com/vaadin/ui/Slider.java
+++ b/server/src/main/java/com/vaadin/ui/Slider.java
diff --git a/server/src/com/vaadin/ui/TabSheet.java b/server/src/main/java/com/vaadin/ui/TabSheet.java
index 66784aaa02..66784aaa02 100644
--- a/server/src/com/vaadin/ui/TabSheet.java
+++ b/server/src/main/java/com/vaadin/ui/TabSheet.java
diff --git a/server/src/com/vaadin/ui/Table.java b/server/src/main/java/com/vaadin/ui/Table.java
index b303fddd81..b303fddd81 100644
--- a/server/src/com/vaadin/ui/Table.java
+++ b/server/src/main/java/com/vaadin/ui/Table.java
diff --git a/server/src/com/vaadin/ui/TableFieldFactory.java b/server/src/main/java/com/vaadin/ui/TableFieldFactory.java
index 3c946dcec2..3c946dcec2 100644
--- a/server/src/com/vaadin/ui/TableFieldFactory.java
+++ b/server/src/main/java/com/vaadin/ui/TableFieldFactory.java
diff --git a/server/src/com/vaadin/ui/TextArea.java b/server/src/main/java/com/vaadin/ui/TextArea.java
index d66fbf0668..d66fbf0668 100644
--- a/server/src/com/vaadin/ui/TextArea.java
+++ b/server/src/main/java/com/vaadin/ui/TextArea.java
diff --git a/server/src/com/vaadin/ui/TextField.java b/server/src/main/java/com/vaadin/ui/TextField.java
index 8772f95f3d..8772f95f3d 100644
--- a/server/src/com/vaadin/ui/TextField.java
+++ b/server/src/main/java/com/vaadin/ui/TextField.java
diff --git a/server/src/com/vaadin/ui/TooltipConfiguration.java b/server/src/main/java/com/vaadin/ui/TooltipConfiguration.java
index ecb8ac7534..ecb8ac7534 100644
--- a/server/src/com/vaadin/ui/TooltipConfiguration.java
+++ b/server/src/main/java/com/vaadin/ui/TooltipConfiguration.java
diff --git a/server/src/com/vaadin/ui/Tree.java b/server/src/main/java/com/vaadin/ui/Tree.java
index 5e6ac55027..5e6ac55027 100644
--- a/server/src/com/vaadin/ui/Tree.java
+++ b/server/src/main/java/com/vaadin/ui/Tree.java
diff --git a/server/src/com/vaadin/ui/TreeTable.java b/server/src/main/java/com/vaadin/ui/TreeTable.java
index bf38148aa9..bf38148aa9 100644
--- a/server/src/com/vaadin/ui/TreeTable.java
+++ b/server/src/main/java/com/vaadin/ui/TreeTable.java
diff --git a/server/src/com/vaadin/ui/TwinColSelect.java b/server/src/main/java/com/vaadin/ui/TwinColSelect.java
index 8086220c94..8086220c94 100644
--- a/server/src/com/vaadin/ui/TwinColSelect.java
+++ b/server/src/main/java/com/vaadin/ui/TwinColSelect.java
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/main/java/com/vaadin/ui/UI.java
index c429b64491..c429b64491 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/main/java/com/vaadin/ui/UI.java
diff --git a/server/src/com/vaadin/ui/UIDetachedException.java b/server/src/main/java/com/vaadin/ui/UIDetachedException.java
index 7cd7f0889e..7cd7f0889e 100644
--- a/server/src/com/vaadin/ui/UIDetachedException.java
+++ b/server/src/main/java/com/vaadin/ui/UIDetachedException.java
diff --git a/server/src/com/vaadin/ui/UniqueSerializable.java b/server/src/main/java/com/vaadin/ui/UniqueSerializable.java
index f5d68e8a71..f5d68e8a71 100644
--- a/server/src/com/vaadin/ui/UniqueSerializable.java
+++ b/server/src/main/java/com/vaadin/ui/UniqueSerializable.java
diff --git a/server/src/com/vaadin/ui/Upload.java b/server/src/main/java/com/vaadin/ui/Upload.java
index a61bcf1bd9..a61bcf1bd9 100644
--- a/server/src/com/vaadin/ui/Upload.java
+++ b/server/src/main/java/com/vaadin/ui/Upload.java
diff --git a/server/src/com/vaadin/ui/VerticalLayout.java b/server/src/main/java/com/vaadin/ui/VerticalLayout.java
index 7002fbc7e6..7002fbc7e6 100644
--- a/server/src/com/vaadin/ui/VerticalLayout.java
+++ b/server/src/main/java/com/vaadin/ui/VerticalLayout.java
diff --git a/server/src/com/vaadin/ui/VerticalSplitPanel.java b/server/src/main/java/com/vaadin/ui/VerticalSplitPanel.java
index e5e6eb60e1..e5e6eb60e1 100644
--- a/server/src/com/vaadin/ui/VerticalSplitPanel.java
+++ b/server/src/main/java/com/vaadin/ui/VerticalSplitPanel.java
diff --git a/server/src/com/vaadin/ui/Video.java b/server/src/main/java/com/vaadin/ui/Video.java
index 46a4293b36..46a4293b36 100644
--- a/server/src/com/vaadin/ui/Video.java
+++ b/server/src/main/java/com/vaadin/ui/Video.java
diff --git a/server/src/com/vaadin/ui/Window.java b/server/src/main/java/com/vaadin/ui/Window.java
index 70399ae566..70399ae566 100644
--- a/server/src/com/vaadin/ui/Window.java
+++ b/server/src/main/java/com/vaadin/ui/Window.java
diff --git a/server/src/com/vaadin/ui/components/calendar/CalendarComponentEvent.java b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvent.java
index dfb59e148b..dfb59e148b 100644
--- a/server/src/com/vaadin/ui/components/calendar/CalendarComponentEvent.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvent.java
diff --git a/server/src/com/vaadin/ui/components/calendar/CalendarComponentEvents.java b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvents.java
index f01b465dd2..f01b465dd2 100644
--- a/server/src/com/vaadin/ui/components/calendar/CalendarComponentEvents.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvents.java
diff --git a/server/src/com/vaadin/ui/components/calendar/CalendarDateRange.java b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarDateRange.java
index 18b98e1f6c..18b98e1f6c 100644
--- a/server/src/com/vaadin/ui/components/calendar/CalendarDateRange.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarDateRange.java
diff --git a/server/src/com/vaadin/ui/components/calendar/CalendarTargetDetails.java b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarTargetDetails.java
index 3ea6c4d8f4..3ea6c4d8f4 100644
--- a/server/src/com/vaadin/ui/components/calendar/CalendarTargetDetails.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarTargetDetails.java
diff --git a/server/src/com/vaadin/ui/components/calendar/ContainerEventProvider.java b/server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java
index 2f51b21f7c..2f51b21f7c 100644
--- a/server/src/com/vaadin/ui/components/calendar/ContainerEventProvider.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java
diff --git a/server/src/com/vaadin/ui/components/calendar/event/BasicEvent.java b/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEvent.java
index a1ccad2712..a1ccad2712 100644
--- a/server/src/com/vaadin/ui/components/calendar/event/BasicEvent.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEvent.java
diff --git a/server/src/com/vaadin/ui/components/calendar/event/BasicEventProvider.java b/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEventProvider.java
index 9fa6baadad..9fa6baadad 100644
--- a/server/src/com/vaadin/ui/components/calendar/event/BasicEventProvider.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEventProvider.java
diff --git a/server/src/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java b/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java
index 920600368e..920600368e 100644
--- a/server/src/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java
diff --git a/server/src/com/vaadin/ui/components/calendar/event/CalendarEvent.java b/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEvent.java
index 2ad8c777ff..2ad8c777ff 100644
--- a/server/src/com/vaadin/ui/components/calendar/event/CalendarEvent.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEvent.java
diff --git a/server/src/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java b/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java
index 2a8ec7e834..2a8ec7e834 100644
--- a/server/src/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java
diff --git a/server/src/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java b/server/src/main/java/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java
index df708697b8..df708697b8 100644
--- a/server/src/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java
diff --git a/server/src/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java
index 0e99b26856..0e99b26856 100644
--- a/server/src/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java
diff --git a/server/src/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java
index 8d366ed52f..8d366ed52f 100644
--- a/server/src/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java
diff --git a/server/src/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java
index 418e03d24a..418e03d24a 100644
--- a/server/src/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java
diff --git a/server/src/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java
index 6141c84c5b..6141c84c5b 100644
--- a/server/src/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java
diff --git a/server/src/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java
index 45b44cb673..45b44cb673 100644
--- a/server/src/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java
diff --git a/server/src/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java
index c52d0a5a82..c52d0a5a82 100644
--- a/server/src/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java
+++ b/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java
diff --git a/server/src/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java
index b55b55357f..b55b55357f 100644
--- a/server/src/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java
+++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java
diff --git a/server/src/com/vaadin/ui/components/colorpicker/ColorChangeListener.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeListener.java
index 6db148989c..6db148989c 100644
--- a/server/src/com/vaadin/ui/components/colorpicker/ColorChangeListener.java
+++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeListener.java
diff --git a/server/src/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java
index 81b178e4f0..81b178e4f0 100644
--- a/server/src/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java
+++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java
diff --git a/server/src/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java
index 002f36d99d..002f36d99d 100644
--- a/server/src/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java
+++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java
diff --git a/server/src/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java
index a3297a282c..a3297a282c 100644
--- a/server/src/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java
+++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java
diff --git a/server/src/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java
index 86ac0111ad..86ac0111ad 100644
--- a/server/src/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java
+++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java
diff --git a/server/src/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java
index 21a3630de2..21a3630de2 100644
--- a/server/src/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java
+++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java
diff --git a/server/src/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java
index 8e441b25ee..8e441b25ee 100644
--- a/server/src/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java
+++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java
diff --git a/server/src/com/vaadin/ui/components/colorpicker/ColorSelector.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorSelector.java
index c282c22f62..c282c22f62 100644
--- a/server/src/com/vaadin/ui/components/colorpicker/ColorSelector.java
+++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorSelector.java
diff --git a/server/src/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java
index eb16d8cbbe..eb16d8cbbe 100644
--- a/server/src/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java
+++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java
diff --git a/server/src/com/vaadin/ui/declarative/Design.java b/server/src/main/java/com/vaadin/ui/declarative/Design.java
index 5ce1f5dc60..5ce1f5dc60 100644
--- a/server/src/com/vaadin/ui/declarative/Design.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/Design.java
diff --git a/server/src/com/vaadin/ui/declarative/DesignAttributeHandler.java b/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java
index bbfd90b2cc..bbfd90b2cc 100644
--- a/server/src/com/vaadin/ui/declarative/DesignAttributeHandler.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java
diff --git a/server/src/com/vaadin/ui/declarative/DesignContext.java b/server/src/main/java/com/vaadin/ui/declarative/DesignContext.java
index d72ec77d4a..d72ec77d4a 100644
--- a/server/src/com/vaadin/ui/declarative/DesignContext.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/DesignContext.java
diff --git a/server/src/com/vaadin/ui/declarative/DesignException.java b/server/src/main/java/com/vaadin/ui/declarative/DesignException.java
index 01482f84b0..01482f84b0 100644
--- a/server/src/com/vaadin/ui/declarative/DesignException.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/DesignException.java
diff --git a/server/src/com/vaadin/ui/declarative/DesignFormatter.java b/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java
index 509015130d..509015130d 100644
--- a/server/src/com/vaadin/ui/declarative/DesignFormatter.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java
diff --git a/server/src/com/vaadin/ui/declarative/FieldBinder.java b/server/src/main/java/com/vaadin/ui/declarative/FieldBinder.java
index 3766458175..3766458175 100644
--- a/server/src/com/vaadin/ui/declarative/FieldBinder.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/FieldBinder.java
diff --git a/server/src/com/vaadin/ui/declarative/FieldBindingException.java b/server/src/main/java/com/vaadin/ui/declarative/FieldBindingException.java
index d8b587a14c..d8b587a14c 100644
--- a/server/src/com/vaadin/ui/declarative/FieldBindingException.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/FieldBindingException.java
diff --git a/server/src/com/vaadin/ui/declarative/ShouldWriteDataDelegate.java b/server/src/main/java/com/vaadin/ui/declarative/ShouldWriteDataDelegate.java
index 9cb1f1c605..9cb1f1c605 100644
--- a/server/src/com/vaadin/ui/declarative/ShouldWriteDataDelegate.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/ShouldWriteDataDelegate.java
diff --git a/server/src/com/vaadin/ui/declarative/converters/DesignDateConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignDateConverter.java
index d2d63ad16e..d2d63ad16e 100644
--- a/server/src/com/vaadin/ui/declarative/converters/DesignDateConverter.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignDateConverter.java
diff --git a/server/src/com/vaadin/ui/declarative/converters/DesignEnumConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignEnumConverter.java
index 9f07ff9560..9f07ff9560 100644
--- a/server/src/com/vaadin/ui/declarative/converters/DesignEnumConverter.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignEnumConverter.java
diff --git a/server/src/com/vaadin/ui/declarative/converters/DesignObjectConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignObjectConverter.java
index f11585d6b8..f11585d6b8 100644
--- a/server/src/com/vaadin/ui/declarative/converters/DesignObjectConverter.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignObjectConverter.java
diff --git a/server/src/com/vaadin/ui/declarative/converters/DesignResourceConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java
index ffa51fedd1..ffa51fedd1 100644
--- a/server/src/com/vaadin/ui/declarative/converters/DesignResourceConverter.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java
diff --git a/server/src/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java
index d6f2f65938..d6f2f65938 100644
--- a/server/src/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java
diff --git a/server/src/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java
index 51f47edac9..51f47edac9 100644
--- a/server/src/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java
diff --git a/server/src/com/vaadin/ui/declarative/converters/DesignToStringConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java
index 0c6cf55bed..0c6cf55bed 100644
--- a/server/src/com/vaadin/ui/declarative/converters/DesignToStringConverter.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java
diff --git a/server/src/com/vaadin/ui/declarative/converters/ShortcutKeyMapper.java b/server/src/main/java/com/vaadin/ui/declarative/converters/ShortcutKeyMapper.java
index 2940c82c06..2940c82c06 100644
--- a/server/src/com/vaadin/ui/declarative/converters/ShortcutKeyMapper.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/converters/ShortcutKeyMapper.java
diff --git a/server/src/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java
index 91a5c0ea45..91a5c0ea45 100644
--- a/server/src/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java
diff --git a/server/src/com/vaadin/ui/renderers/ButtonRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java
index e7e723ebd6..e7e723ebd6 100644
--- a/server/src/com/vaadin/ui/renderers/ButtonRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java
diff --git a/server/src/com/vaadin/ui/renderers/ClickableRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java
index 7210eb7840..7210eb7840 100644
--- a/server/src/com/vaadin/ui/renderers/ClickableRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java
diff --git a/server/src/com/vaadin/ui/renderers/DateRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/DateRenderer.java
index dddeb6cd77..dddeb6cd77 100644
--- a/server/src/com/vaadin/ui/renderers/DateRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/DateRenderer.java
diff --git a/server/src/com/vaadin/ui/renderers/HtmlRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java
index 2ec43800c0..2ec43800c0 100644
--- a/server/src/com/vaadin/ui/renderers/HtmlRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java
diff --git a/server/src/com/vaadin/ui/renderers/ImageRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/ImageRenderer.java
index ad7d5cae2b..ad7d5cae2b 100644
--- a/server/src/com/vaadin/ui/renderers/ImageRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/ImageRenderer.java
diff --git a/server/src/com/vaadin/ui/renderers/NumberRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/NumberRenderer.java
index b1ba309c9a..b1ba309c9a 100644
--- a/server/src/com/vaadin/ui/renderers/NumberRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/NumberRenderer.java
diff --git a/server/src/com/vaadin/ui/renderers/ProgressBarRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/ProgressBarRenderer.java
index 1566c47222..1566c47222 100644
--- a/server/src/com/vaadin/ui/renderers/ProgressBarRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/ProgressBarRenderer.java
diff --git a/server/src/com/vaadin/ui/renderers/Renderer.java b/server/src/main/java/com/vaadin/ui/renderers/Renderer.java
index ac85174618..ac85174618 100644
--- a/server/src/com/vaadin/ui/renderers/Renderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/Renderer.java
diff --git a/server/src/com/vaadin/ui/renderers/TextRenderer.java b/server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java
index ce8a73d057..ce8a73d057 100644
--- a/server/src/com/vaadin/ui/renderers/TextRenderer.java
+++ b/server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java
diff --git a/server/src/com/vaadin/ui/themes/BaseTheme.java b/server/src/main/java/com/vaadin/ui/themes/BaseTheme.java
index 9421cf2341..9421cf2341 100644
--- a/server/src/com/vaadin/ui/themes/BaseTheme.java
+++ b/server/src/main/java/com/vaadin/ui/themes/BaseTheme.java
diff --git a/server/src/com/vaadin/ui/themes/ChameleonTheme.java b/server/src/main/java/com/vaadin/ui/themes/ChameleonTheme.java
index 6e230c426e..6e230c426e 100644
--- a/server/src/com/vaadin/ui/themes/ChameleonTheme.java
+++ b/server/src/main/java/com/vaadin/ui/themes/ChameleonTheme.java
diff --git a/server/src/com/vaadin/ui/themes/LiferayTheme.java b/server/src/main/java/com/vaadin/ui/themes/LiferayTheme.java
index de56be39ac..de56be39ac 100644
--- a/server/src/com/vaadin/ui/themes/LiferayTheme.java
+++ b/server/src/main/java/com/vaadin/ui/themes/LiferayTheme.java
diff --git a/server/src/com/vaadin/ui/themes/Reindeer.java b/server/src/main/java/com/vaadin/ui/themes/Reindeer.java
index e0ab792a15..e0ab792a15 100644
--- a/server/src/com/vaadin/ui/themes/Reindeer.java
+++ b/server/src/main/java/com/vaadin/ui/themes/Reindeer.java
diff --git a/server/src/com/vaadin/ui/themes/Runo.java b/server/src/main/java/com/vaadin/ui/themes/Runo.java
index 6f8d5f37d9..6f8d5f37d9 100644
--- a/server/src/com/vaadin/ui/themes/Runo.java
+++ b/server/src/main/java/com/vaadin/ui/themes/Runo.java
diff --git a/server/src/com/vaadin/ui/themes/ValoTheme.java b/server/src/main/java/com/vaadin/ui/themes/ValoTheme.java
index 3a9986c632..3a9986c632 100644
--- a/server/src/com/vaadin/ui/themes/ValoTheme.java
+++ b/server/src/main/java/com/vaadin/ui/themes/ValoTheme.java
diff --git a/server/src/com/vaadin/util/ConnectorHelper.java b/server/src/main/java/com/vaadin/util/ConnectorHelper.java
index b3457068c3..b3457068c3 100644
--- a/server/src/com/vaadin/util/ConnectorHelper.java
+++ b/server/src/main/java/com/vaadin/util/ConnectorHelper.java
diff --git a/server/src/com/vaadin/util/CurrentInstance.java b/server/src/main/java/com/vaadin/util/CurrentInstance.java
index e6b58ec65c..e6b58ec65c 100644
--- a/server/src/com/vaadin/util/CurrentInstance.java
+++ b/server/src/main/java/com/vaadin/util/CurrentInstance.java
diff --git a/server/src/com/vaadin/util/FileTypeResolver.java b/server/src/main/java/com/vaadin/util/FileTypeResolver.java
index a49a0e2d01..a49a0e2d01 100644
--- a/server/src/com/vaadin/util/FileTypeResolver.java
+++ b/server/src/main/java/com/vaadin/util/FileTypeResolver.java
diff --git a/server/src/com/vaadin/util/ReflectTools.java b/server/src/main/java/com/vaadin/util/ReflectTools.java
index 2e2d3fe238..2e2d3fe238 100644
--- a/server/src/com/vaadin/util/ReflectTools.java
+++ b/server/src/main/java/com/vaadin/util/ReflectTools.java
diff --git a/server/src/com/vaadin/util/SerializerHelper.java b/server/src/main/java/com/vaadin/util/SerializerHelper.java
index 793488d892..793488d892 100644
--- a/server/src/com/vaadin/util/SerializerHelper.java
+++ b/server/src/main/java/com/vaadin/util/SerializerHelper.java
diff --git a/server/src/com/vaadin/annotations/package.html b/server/src/main/javadoc/com/vaadin/annotations/package.html
index d789e9b5df..d789e9b5df 100644
--- a/server/src/com/vaadin/annotations/package.html
+++ b/server/src/main/javadoc/com/vaadin/annotations/package.html
diff --git a/server/src/com/vaadin/data/package.html b/server/src/main/javadoc/com/vaadin/data/package.html
index a14ea1ac88..a14ea1ac88 100644
--- a/server/src/com/vaadin/data/package.html
+++ b/server/src/main/javadoc/com/vaadin/data/package.html
diff --git a/server/src/com/vaadin/data/util/package.html b/server/src/main/javadoc/com/vaadin/data/util/package.html
index 07e3acde9e..07e3acde9e 100644
--- a/server/src/com/vaadin/data/util/package.html
+++ b/server/src/main/javadoc/com/vaadin/data/util/package.html
diff --git a/server/src/com/vaadin/data/validator/package.html b/server/src/main/javadoc/com/vaadin/data/validator/package.html
index c991bfc82a..c991bfc82a 100644
--- a/server/src/com/vaadin/data/validator/package.html
+++ b/server/src/main/javadoc/com/vaadin/data/validator/package.html
diff --git a/server/src/com/vaadin/event/package.html b/server/src/main/javadoc/com/vaadin/event/package.html
index 2e7e17b892..2e7e17b892 100644
--- a/server/src/com/vaadin/event/package.html
+++ b/server/src/main/javadoc/com/vaadin/event/package.html
diff --git a/server/src/com/vaadin/package.html b/server/src/main/javadoc/com/vaadin/package.html
index 097fd94aca..097fd94aca 100644
--- a/server/src/com/vaadin/package.html
+++ b/server/src/main/javadoc/com/vaadin/package.html
diff --git a/server/src/com/vaadin/server/package.html b/server/src/main/javadoc/com/vaadin/server/package.html
index 83514a0de5..83514a0de5 100644
--- a/server/src/com/vaadin/server/package.html
+++ b/server/src/main/javadoc/com/vaadin/server/package.html
diff --git a/server/src/com/vaadin/ui/package.html b/server/src/main/javadoc/com/vaadin/ui/package.html
index 6b19a28fe7..6b19a28fe7 100644
--- a/server/src/com/vaadin/ui/package.html
+++ b/server/src/main/javadoc/com/vaadin/ui/package.html
diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/server/src/main/resources/VAADIN/vaadinBootstrap.js
index 89514dbcc2..89514dbcc2 100644
--- a/WebContent/VAADIN/vaadinBootstrap.js
+++ b/server/src/main/resources/VAADIN/vaadinBootstrap.js
diff --git a/server/src/com/vaadin/ui/doc-files/component_class_hierarchy.gif b/server/src/main/resources/com/vaadin/ui/doc-files/component_class_hierarchy.gif
index 936c220d11..936c220d11 100644
--- a/server/src/com/vaadin/ui/doc-files/component_class_hierarchy.gif
+++ b/server/src/main/resources/com/vaadin/ui/doc-files/component_class_hierarchy.gif
diff --git a/server/src/com/vaadin/ui/doc-files/component_interfaces.gif b/server/src/main/resources/com/vaadin/ui/doc-files/component_interfaces.gif
index 44c99826bb..44c99826bb 100644
--- a/server/src/com/vaadin/ui/doc-files/component_interfaces.gif
+++ b/server/src/main/resources/com/vaadin/ui/doc-files/component_interfaces.gif
diff --git a/server/tests/src/ClassInDefaultPackage.java b/server/src/test/java/ClassInDefaultPackage.java
index 52dc87e0e2..52dc87e0e2 100644
--- a/server/tests/src/ClassInDefaultPackage.java
+++ b/server/src/test/java/ClassInDefaultPackage.java
diff --git a/server/tests/src/com/vaadin/benchmarks/PerformanceTester8759.java b/server/src/test/java/com/vaadin/benchmarks/PerformanceTester8759.java
index 968edd4b24..968edd4b24 100644
--- a/server/tests/src/com/vaadin/benchmarks/PerformanceTester8759.java
+++ b/server/src/test/java/com/vaadin/benchmarks/PerformanceTester8759.java
diff --git a/server/tests/src/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java b/server/src/test/java/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java
index fc258ab138..fc258ab138 100644
--- a/server/tests/src/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java
+++ b/server/src/test/java/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java
diff --git a/server/tests/src/com/vaadin/data/fieldgroup/BeanFieldGroupTest.java b/server/src/test/java/com/vaadin/data/fieldgroup/BeanFieldGroupTest.java
index 3333cd7744..3333cd7744 100644
--- a/server/tests/src/com/vaadin/data/fieldgroup/BeanFieldGroupTest.java
+++ b/server/src/test/java/com/vaadin/data/fieldgroup/BeanFieldGroupTest.java
diff --git a/server/tests/src/com/vaadin/data/fieldgroup/FieldGroupDateTest.java b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java
index ce76f8427b..ce76f8427b 100644
--- a/server/tests/src/com/vaadin/data/fieldgroup/FieldGroupDateTest.java
+++ b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java
diff --git a/server/tests/src/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.java b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.java
index 636162de54..636162de54 100644
--- a/server/tests/src/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.java
+++ b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.java
diff --git a/server/tests/src/com/vaadin/data/fieldgroup/FieldGroupTests.java b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java
index dce9f656b9..f8e4d1c2d0 100644
--- a/server/tests/src/com/vaadin/data/fieldgroup/FieldGroupTests.java
+++ b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java
@@ -16,7 +16,7 @@ import com.vaadin.data.util.TransactionalPropertyWrapper;
 import com.vaadin.ui.Field;
 import com.vaadin.ui.TextField;
 
-public class FieldGroupTests {
+public class FieldGroupTest {
 
     private FieldGroup sut;
     private Field field;
diff --git a/server/tests/src/com/vaadin/data/util/AbstractBeanContainerTestBase.java b/server/src/test/java/com/vaadin/data/util/AbstractBeanContainerTestBase.java
index 3d8f08a7ef..3d8f08a7ef 100644
--- a/server/tests/src/com/vaadin/data/util/AbstractBeanContainerTestBase.java
+++ b/server/src/test/java/com/vaadin/data/util/AbstractBeanContainerTestBase.java
diff --git a/server/tests/src/com/vaadin/data/util/AbstractContainerTestBase.java b/server/src/test/java/com/vaadin/data/util/AbstractContainerTestBase.java
index 5fd4f8ae17..64f1a31399 100644
--- a/server/tests/src/com/vaadin/data/util/AbstractContainerTestBase.java
+++ b/server/src/test/java/com/vaadin/data/util/AbstractContainerTestBase.java
@@ -1,11 +1,15 @@
 package com.vaadin.data.util;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 import org.junit.Assert;
 
 import com.vaadin.data.Container;
@@ -17,7 +21,7 @@ import com.vaadin.data.Container.Sortable;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.filter.SimpleStringFilter;
 
-public abstract class AbstractContainerTestBase extends TestCase {
+public abstract class AbstractContainerTestBase {
 
     /**
      * Helper class for testing e.g. listeners expecting events to be fired.
diff --git a/server/tests/src/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java b/server/src/test/java/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java
index 9cede77162..7a07c553f7 100644
--- a/server/tests/src/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java
+++ b/server/src/test/java/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java
@@ -1,5 +1,11 @@
 package com.vaadin.data.util;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import java.util.Collection;
 
 import com.vaadin.data.Container;
diff --git a/server/tests/src/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java b/server/src/test/java/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java
index d2c1a17bf8..d2c1a17bf8 100644
--- a/server/tests/src/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java
+++ b/server/src/test/java/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java
diff --git a/server/tests/src/com/vaadin/data/util/BeanContainerTest.java b/server/src/test/java/com/vaadin/data/util/BeanContainerTest.java
index 3d755f4397..d990f3d123 100644
--- a/server/tests/src/com/vaadin/data/util/BeanContainerTest.java
+++ b/server/src/test/java/com/vaadin/data/util/BeanContainerTest.java
@@ -1,5 +1,11 @@
 package com.vaadin.data.util;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
@@ -8,6 +14,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 import com.vaadin.data.Container;
 import com.vaadin.data.Item;
@@ -41,7 +49,7 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase {
         return new BeanContainer<String, ClassName>(ClassName.class);
     }
 
-    @Override
+    @Before
     public void setUp() {
         nameToBean.clear();
 
@@ -68,6 +76,7 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase {
         return false;
     }
 
+    @Test
     public void testGetType_existingProperty_typeReturned() {
         BeanContainer<String, ClassName> container = getContainer();
         Assert.assertEquals(
@@ -75,30 +84,36 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase {
                 String.class, container.getType("simpleName"));
     }
 
+    @Test
     public void testGetType_notExistingProperty_nullReturned() {
         BeanContainer<String, ClassName> container = getContainer();
         Assert.assertNull("Not null type is returned for property ''",
                 container.getType(""));
     }
 
+    @Test
     public void testBasicOperations() {
         testBasicContainerOperations(getContainer());
     }
 
+    @Test
     public void testFiltering() {
         testContainerFiltering(getContainer());
     }
 
+    @Test
     public void testSorting() {
         testContainerSorting(getContainer());
     }
 
+    @Test
     public void testSortingAndFiltering() {
         testContainerSortingAndFiltering(getContainer());
     }
 
     // duplicated from parent class and modified - adding items to
     // BeanContainer differs from other containers
+    @Test
     public void testContainerOrdered() {
         BeanContainer<String, String> container = new BeanContainer<String, String>(
                 String.class);
@@ -175,6 +190,7 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase {
 
     // TODO test Container.Indexed interface operation - testContainerIndexed()?
 
+    @Test
     public void testAddItemAt() {
         BeanContainer<String, String> container = new BeanContainer<String, String>(
                 String.class);
@@ -198,6 +214,7 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase {
         assertEquals("id4", container.getIdByIndex(3));
     }
 
+    @Test
     public void testUnsupportedMethods() {
         BeanContainer<String, Person> container = new BeanContainer<String, Person>(
                 Person.class);
@@ -255,6 +272,7 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(1, container.size());
     }
 
+    @Test
     public void testRemoveContainerProperty() {
         BeanContainer<String, Person> container = new BeanContainer<String, Person>(
                 Person.class);
@@ -271,6 +289,7 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase {
         Assert.assertNull(container.getItem("John").getItemProperty("name"));
     }
 
+    @Test
     public void testAddNullBeans() {
         BeanContainer<String, Person> container = new BeanContainer<String, Person>(
                 Person.class);
@@ -282,6 +301,7 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(0, container.size());
     }
 
+    @Test
     public void testAddNullId() {
         BeanContainer<String, Person> container = new BeanContainer<String, Person>(
                 Person.class);
@@ -295,6 +315,7 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(0, container.size());
     }
 
+    @Test
     public void testEmptyContainer() {
         BeanContainer<String, Person> container = new BeanContainer<String, Person>(
                 Person.class);
@@ -307,6 +328,7 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase {
         // could test more about empty container
     }
 
+    @Test
     public void testAddBeanWithoutResolver() {
         BeanContainer<String, Person> container = new BeanContainer<String, Person>(
                 Person.class);
@@ -340,6 +362,7 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(0, container.size());
     }
 
+    @Test
     public void testAddAllWithNullItemId() {
         BeanContainer<String, Person> container = new BeanContainer<String, Person>(
                 Person.class);
@@ -372,6 +395,7 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(3, container.size());
     }
 
+    @Test
     public void testAddBeanWithNullResolver() {
         BeanContainer<String, Person> container = new BeanContainer<String, Person>(
                 Person.class);
@@ -400,6 +424,7 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(0, container.size());
     }
 
+    @Test
     public void testAddBeanWithResolver() {
         BeanContainer<String, Person> container = new BeanContainer<String, Person>(
                 Person.class);
@@ -422,6 +447,7 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(5, container.size());
     }
 
+    @Test
     public void testAddNullBeansWithResolver() {
         BeanContainer<String, Person> container = new BeanContainer<String, Person>(
                 Person.class);
@@ -434,6 +460,7 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(0, container.size());
     }
 
+    @Test
     public void testAddBeanWithPropertyResolver() {
         BeanContainer<String, Person> container = new BeanContainer<String, Person>(
                 Person.class);
@@ -456,6 +483,7 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(5, container.size());
     }
 
+    @Test
     public void testAddNestedContainerProperty() {
         BeanContainer<String, NestedMethodPropertyTest.Person> container = new BeanContainer<String, NestedMethodPropertyTest.Person>(
                 NestedMethodPropertyTest.Person.class);
@@ -470,6 +498,7 @@ public class BeanContainerTest extends AbstractBeanContainerTestBase {
                         .getValue());
     }
 
+    @Test
     public void testNestedContainerPropertyWithNullBean() {
         BeanContainer<String, NestedMethodPropertyTest.Person> container = new BeanContainer<String, NestedMethodPropertyTest.Person>(
                 NestedMethodPropertyTest.Person.class);
diff --git a/server/tests/src/com/vaadin/data/util/BeanItemContainerGenerator.java b/server/src/test/java/com/vaadin/data/util/BeanItemContainerGenerator.java
index a5bdcc7cf9..a5bdcc7cf9 100644
--- a/server/tests/src/com/vaadin/data/util/BeanItemContainerGenerator.java
+++ b/server/src/test/java/com/vaadin/data/util/BeanItemContainerGenerator.java
diff --git a/server/tests/src/com/vaadin/data/util/BeanItemContainerSortTest.java b/server/src/test/java/com/vaadin/data/util/BeanItemContainerSortTest.java
index 4f4e35258f..4f4e35258f 100644
--- a/server/tests/src/com/vaadin/data/util/BeanItemContainerSortTest.java
+++ b/server/src/test/java/com/vaadin/data/util/BeanItemContainerSortTest.java
diff --git a/server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java b/server/src/test/java/com/vaadin/data/util/BeanItemContainerTest.java
index 3c30b41d39..0298e57dcc 100644
--- a/server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java
+++ b/server/src/test/java/com/vaadin/data/util/BeanItemContainerTest.java
@@ -1,5 +1,11 @@
 package com.vaadin.data.util;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -11,6 +17,8 @@ import java.util.Map;
 import org.easymock.Capture;
 import org.easymock.EasyMock;
 import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 import com.vaadin.data.Container;
 import com.vaadin.data.Container.Indexed.ItemAddEvent;
@@ -35,7 +43,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         return new BeanItemContainer<ClassName>(ClassName.class);
     }
 
-    @Override
+    @Before
     public void setUp() {
         nameToBean.clear();
 
@@ -78,6 +86,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         return false;
     }
 
+    @Test
     public void testGetType_existingProperty_typeReturned() {
         BeanItemContainer<ClassName> container = getContainer();
         Assert.assertEquals(
@@ -85,30 +94,36 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
                 String.class, container.getType("simpleName"));
     }
 
+    @Test
     public void testGetType_notExistingProperty_nullReturned() {
         BeanItemContainer<ClassName> container = getContainer();
         Assert.assertNull("Not null type is returned for property ''",
                 container.getType(""));
     }
 
+    @Test
     public void testBasicOperations() {
         testBasicContainerOperations(getContainer());
     }
 
+    @Test
     public void testFiltering() {
         testContainerFiltering(getContainer());
     }
 
+    @Test
     public void testSorting() {
         testContainerSorting(getContainer());
     }
 
+    @Test
     public void testSortingAndFiltering() {
         testContainerSortingAndFiltering(getContainer());
     }
 
     // duplicated from parent class and modified - adding items to
     // BeanItemContainer differs from other containers
+    @Test
     public void testContainerOrdered() {
         BeanItemContainer<String> container = new BeanItemContainer<String>(
                 String.class);
@@ -181,12 +196,14 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
 
     }
 
+    @Test
     public void testContainerIndexed() {
         testContainerIndexed(getContainer(), nameToBean.get(sampleData[2]), 2,
                 false, new ClassName("org.vaadin.test.Test", 8888), true);
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testCollectionConstructors() {
         List<ClassName> classNames = new ArrayList<ClassName>();
         classNames.add(new ClassName("a.b.c.Def", 1));
@@ -215,6 +232,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
 
     // this only applies to the collection constructor with no type parameter
     @SuppressWarnings("deprecation")
+    @Test
     public void testEmptyCollectionConstructor() {
         try {
             new BeanItemContainer<ClassName>((Collection<ClassName>) null);
@@ -230,6 +248,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         }
     }
 
+    @Test
     public void testItemSetChangeListeners() {
         BeanItemContainer<ClassName> container = getContainer();
         ItemSetChangeCounter counter = new ItemSetChangeCounter();
@@ -328,6 +347,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
 
     }
 
+    @Test
     public void testItemSetChangeListenersFiltering() {
         BeanItemContainer<ClassName> container = getContainer();
         ItemSetChangeCounter counter = new ItemSetChangeCounter();
@@ -496,6 +516,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         counter.assertNone();
     }
 
+    @Test
     public void testAddRemoveWhileFiltering() {
         BeanItemContainer<Person> container = new BeanItemContainer<Person>(
                 Person.class);
@@ -573,6 +594,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(michael, container.lastItemId());
     }
 
+    @Test
     public void testRefilterOnPropertyModification() {
         BeanItemContainer<Person> container = new BeanItemContainer<Person>(
                 Person.class);
@@ -608,6 +630,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(3, container.size());
     }
 
+    @Test
     public void testAddAll() {
         BeanItemContainer<Person> container = new BeanItemContainer<Person>(
                 Person.class);
@@ -637,6 +660,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(michael, container.nextItemId(jack));
     }
 
+    @Test
     public void testUnsupportedMethods() {
         BeanItemContainer<Person> container = new BeanItemContainer<Person>(
                 Person.class);
@@ -673,6 +697,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(1, container.size());
     }
 
+    @Test
     public void testRemoveContainerProperty() {
         BeanItemContainer<Person> container = new BeanItemContainer<Person>(
                 Person.class);
@@ -689,6 +714,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         Assert.assertNull(container.getItem(john).getItemProperty("name"));
     }
 
+    @Test
     public void testAddNullBean() {
         BeanItemContainer<Person> container = new BeanItemContainer<Person>(
                 Person.class);
@@ -703,6 +729,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(1, container.size());
     }
 
+    @Test
     public void testBeanIdResolver() {
         BeanItemContainer<Person> container = new BeanItemContainer<Person>(
                 Person.class);
@@ -711,14 +738,12 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         assertSame(john, container.getBeanIdResolver().getIdForBean(john));
     }
 
+    @Test(expected = IllegalArgumentException.class)
     public void testNullBeanClass() {
-        try {
-            new BeanItemContainer<Object>((Class<Object>) null);
-        } catch (IllegalArgumentException e) {
-            // should get exception
-        }
+        new BeanItemContainer<Object>((Class<Object>) null);
     }
 
+    @Test
     public void testAddNestedContainerProperty() {
         BeanItemContainer<NestedMethodPropertyTest.Person> container = new BeanItemContainer<NestedMethodPropertyTest.Person>(
                 NestedMethodPropertyTest.Person.class);
@@ -734,6 +759,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
                         .getValue());
     }
 
+    @Test
     public void testNestedContainerPropertyWithNullBean() {
         BeanItemContainer<NestedMethodPropertyTest.Person> container = new BeanItemContainer<NestedMethodPropertyTest.Person>(
                 NestedMethodPropertyTest.Person.class);
@@ -748,6 +774,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
                 .getValue());
     }
 
+    @Test
     public void testItemAddedEvent() {
         BeanItemContainer<Person> container = new BeanItemContainer<Person>(
                 Person.class);
@@ -761,6 +788,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         EasyMock.verify(addListener);
     }
 
+    @Test
     public void testItemAddedEvent_AddedItem() {
         BeanItemContainer<Person> container = new BeanItemContainer<Person>(
                 Person.class);
@@ -774,6 +802,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(bean, capturedEvent.getValue().getFirstItemId());
     }
 
+    @Test
     public void testItemAddedEvent_addItemAt_IndexOfAddedItem() {
         BeanItemContainer<Person> container = new BeanItemContainer<Person>(
                 Person.class);
@@ -788,6 +817,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(1, capturedEvent.getValue().getFirstIndex());
     }
 
+    @Test
     public void testItemAddedEvent_addItemAfter_IndexOfAddedItem() {
         BeanItemContainer<Person> container = new BeanItemContainer<Person>(
                 Person.class);
@@ -802,6 +832,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(1, capturedEvent.getValue().getFirstIndex());
     }
 
+    @Test
     public void testItemAddedEvent_amountOfAddedItems() {
         BeanItemContainer<Person> container = new BeanItemContainer<Person>(
                 Person.class);
@@ -816,6 +847,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(2, capturedEvent.getValue().getAddedItemsCount());
     }
 
+    @Test
     public void testItemAddedEvent_someItemsAreFiltered_amountOfAddedItemsIsReducedByAmountOfFilteredItems() {
         BeanItemContainer<Person> container = new BeanItemContainer<Person>(
                 Person.class);
@@ -831,6 +863,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(1, capturedEvent.getValue().getAddedItemsCount());
     }
 
+    @Test
     public void testItemAddedEvent_someItemsAreFiltered_addedItemIsTheFirstVisibleItem() {
         BeanItemContainer<Person> container = new BeanItemContainer<Person>(
                 Person.class);
@@ -846,6 +879,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(bean, capturedEvent.getValue().getFirstItemId());
     }
 
+    @Test
     public void testItemRemovedEvent() {
         BeanItemContainer<Person> container = new BeanItemContainer<Person>(
                 Person.class);
@@ -861,6 +895,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         EasyMock.verify(removeListener);
     }
 
+    @Test
     public void testItemRemovedEvent_RemovedItem() {
         BeanItemContainer<Person> container = new BeanItemContainer<Person>(
                 Person.class);
@@ -875,6 +910,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(bean, capturedEvent.getValue().getFirstItemId());
     }
 
+    @Test
     public void testItemRemovedEvent_indexOfRemovedItem() {
         BeanItemContainer<Person> container = new BeanItemContainer<Person>(
                 Person.class);
@@ -890,6 +926,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         assertEquals(1, capturedEvent.getValue().getFirstIndex());
     }
 
+    @Test
     public void testItemRemovedEvent_amountOfRemovedItems() {
         BeanItemContainer<Person> container = new BeanItemContainer<Person>(
                 Person.class);
@@ -926,6 +963,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
         return listener;
     }
 
+    @Test
     public void testAddNestedContainerBeanBeforeData() {
         BeanItemContainer<NestedMethodPropertyTest.Person> container = new BeanItemContainer<NestedMethodPropertyTest.Person>(
                 NestedMethodPropertyTest.Person.class);
@@ -947,6 +985,7 @@ public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
 
     }
 
+    @Test
     public void testAddNestedContainerBeanAfterData() {
         BeanItemContainer<NestedMethodPropertyTest.Person> container = new BeanItemContainer<NestedMethodPropertyTest.Person>(
                 NestedMethodPropertyTest.Person.class);
diff --git a/server/tests/src/com/vaadin/data/util/BeanItemTest.java b/server/src/test/java/com/vaadin/data/util/BeanItemTest.java
index 89c56b1779..e78d518a25 100644
--- a/server/tests/src/com/vaadin/data/util/BeanItemTest.java
+++ b/server/src/test/java/com/vaadin/data/util/BeanItemTest.java
@@ -9,9 +9,8 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import junit.framework.TestCase;
-
 import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.Property;
 
@@ -22,7 +21,7 @@ import com.vaadin.data.Property;
  * 
  * See also {@link PropertySetItemTest}, which tests the base class.
  */
-public class BeanItemTest extends TestCase {
+public class BeanItemTest {
 
     @SuppressWarnings("unused")
     protected static class MySuperClass {
@@ -161,6 +160,7 @@ public class BeanItemTest extends TestCase {
         public void setOverride(int i);
     }
 
+    @Test
     public void testGetProperties() {
         BeanItem<MySuperClass> item = new BeanItem<MySuperClass>(
                 new MySuperClass());
@@ -172,6 +172,7 @@ public class BeanItemTest extends TestCase {
         Assert.assertTrue(itemPropertyIds.contains("superPublic"));
     }
 
+    @Test
     public void testGetSuperClassProperties() {
         BeanItem<MyClass> item = new BeanItem<MyClass>(new MyClass("bean1"));
 
@@ -185,6 +186,7 @@ public class BeanItemTest extends TestCase {
         Assert.assertTrue(itemPropertyIds.contains("name2"));
     }
 
+    @Test
     public void testOverridingProperties() {
         BeanItem<MyClass2> item = new BeanItem<MyClass2>(new MyClass2("bean2"));
 
@@ -197,6 +199,7 @@ public class BeanItemTest extends TestCase {
         Assert.assertFalse(item.getItemProperty("name2").isReadOnly());
     }
 
+    @Test
     public void testGetInterfaceProperties() throws SecurityException,
             NoSuchMethodException, IllegalArgumentException,
             IllegalAccessException, InvocationTargetException {
@@ -215,6 +218,7 @@ public class BeanItemTest extends TestCase {
         Assert.assertTrue(property.isReadOnly());
     }
 
+    @Test
     public void testGetSuperInterfaceProperties() throws SecurityException,
             NoSuchMethodException, IllegalArgumentException,
             IllegalAccessException, InvocationTargetException {
@@ -235,6 +239,7 @@ public class BeanItemTest extends TestCase {
         Assert.assertFalse(property.isReadOnly());
     }
 
+    @Test
     public void testPropertyExplicitOrder() {
         Collection<String> ids = new ArrayList<String>();
         ids.add("name");
@@ -253,6 +258,7 @@ public class BeanItemTest extends TestCase {
         Assert.assertFalse(it.hasNext());
     }
 
+    @Test
     public void testPropertyExplicitOrder2() {
         BeanItem<MyClass> item = new BeanItem<MyClass>(new MyClass("bean1"),
                 new String[] { "name", "superPublic", "name2", "noField" });
@@ -265,6 +271,7 @@ public class BeanItemTest extends TestCase {
         Assert.assertFalse(it.hasNext());
     }
 
+    @Test
     public void testPropertyBadPropertyName() {
         Collection<String> ids = new ArrayList<String>();
         ids.add("name3");
@@ -279,6 +286,7 @@ public class BeanItemTest extends TestCase {
         Assert.assertFalse(it.hasNext());
     }
 
+    @Test
     public void testRemoveProperty() {
         BeanItem<MyClass> item = new BeanItem<MyClass>(new MyClass("bean1"));
 
@@ -290,6 +298,7 @@ public class BeanItemTest extends TestCase {
         Assert.assertFalse(itemPropertyIds.contains("name2"));
     }
 
+    @Test
     public void testRemoveSuperProperty() {
         BeanItem<MyClass> item = new BeanItem<MyClass>(new MyClass("bean1"));
 
@@ -301,6 +310,7 @@ public class BeanItemTest extends TestCase {
         Assert.assertFalse(itemPropertyIds.contains("superPrivate"));
     }
 
+    @Test
     public void testPropertyTypes() {
         BeanItem<MyClass> item = new BeanItem<MyClass>(new MyClass("bean1"));
 
@@ -314,6 +324,7 @@ public class BeanItemTest extends TestCase {
                 .getType()));
     }
 
+    @Test
     public void testPropertyReadOnly() {
         BeanItem<MyClass> item = new BeanItem<MyClass>(new MyClass("bean1"));
 
@@ -321,6 +332,7 @@ public class BeanItemTest extends TestCase {
         Assert.assertTrue(item.getItemProperty("name2").isReadOnly());
     }
 
+    @Test
     public void testCustomProperties() throws Exception {
         LinkedHashMap<String, VaadinPropertyDescriptor<MyClass>> propertyDescriptors = new LinkedHashMap<String, VaadinPropertyDescriptor<MyClass>>();
         propertyDescriptors.put(
@@ -340,6 +352,7 @@ public class BeanItemTest extends TestCase {
         Assert.assertEquals("bean1", item.getItemProperty("myname").getValue());
     }
 
+    @Test
     public void testAddRemoveProperty() throws Exception {
         MethodPropertyDescriptor<BeanItemTest.MyClass> pd = new MethodPropertyDescriptor<BeanItemTest.MyClass>(
                 "myname", MyClass.class,
@@ -359,6 +372,7 @@ public class BeanItemTest extends TestCase {
         Assert.assertEquals(null, item.getItemProperty("myname"));
     }
 
+    @Test
     public void testOverridenGenericMethods() {
         BeanItem<SubClass> item = new BeanItem<SubClass>(new SubClass());
 
diff --git a/server/tests/src/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java b/server/src/test/java/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java
index 8e554d5030..a6fec6670b 100644
--- a/server/tests/src/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java
+++ b/server/src/test/java/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java
@@ -1,19 +1,23 @@
 package com.vaadin.data.util;
 
+import org.junit.Test;
 
 public class ContainerHierarchicalWrapperTest extends
         AbstractHierarchicalContainerTestBase {
 
+    @Test
     public void testBasicOperations() {
         testBasicContainerOperations(new ContainerHierarchicalWrapper(
                 new IndexedContainer()));
     }
 
+    @Test
     public void testHierarchicalContainer() {
         testHierarchicalContainer(new ContainerHierarchicalWrapper(
                 new IndexedContainer()));
     }
 
+    @Test
     public void testRemoveSubtree() {
         testRemoveHierarchicalWrapperSubtree(new ContainerHierarchicalWrapper(
                 new IndexedContainer()));
diff --git a/server/tests/src/com/vaadin/data/util/ContainerOrderedWrapperTest.java b/server/src/test/java/com/vaadin/data/util/ContainerOrderedWrapperTest.java
index 422e9756f8..7e720071be 100644
--- a/server/tests/src/com/vaadin/data/util/ContainerOrderedWrapperTest.java
+++ b/server/src/test/java/com/vaadin/data/util/ContainerOrderedWrapperTest.java
@@ -2,6 +2,8 @@ package com.vaadin.data.util;
 
 import java.util.Collection;
 
+import org.junit.Test;
+
 import com.vaadin.data.Container;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
@@ -89,11 +91,13 @@ public class ContainerOrderedWrapperTest extends AbstractContainerTestBase {
 
     }
 
+    @Test
     public void testBasicOperations() {
         testBasicContainerOperations(new ContainerOrderedWrapper(
                 new NotOrderedContainer()));
     }
 
+    @Test
     public void testOrdered() {
         testContainerOrdered(new ContainerOrderedWrapper(
                 new NotOrderedContainer()));
diff --git a/server/tests/src/com/vaadin/data/util/ContainerSizeAssertTest.java b/server/src/test/java/com/vaadin/data/util/ContainerSizeAssertTest.java
index 04fd8d3cd1..04fd8d3cd1 100644
--- a/server/tests/src/com/vaadin/data/util/ContainerSizeAssertTest.java
+++ b/server/src/test/java/com/vaadin/data/util/ContainerSizeAssertTest.java
diff --git a/server/tests/src/com/vaadin/data/util/ContainerSortingTest.java b/server/src/test/java/com/vaadin/data/util/ContainerSortingTest.java
index dd713dd7b0..dced4b4e72 100644
--- a/server/tests/src/com/vaadin/data/util/ContainerSortingTest.java
+++ b/server/src/test/java/com/vaadin/data/util/ContainerSortingTest.java
@@ -4,13 +4,13 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import com.vaadin.data.Container;
 import com.vaadin.data.Item;
 import com.vaadin.tests.util.TestUtil;
 
-public class ContainerSortingTest extends TestCase {
+public class ContainerSortingTest {
 
     private static final String ITEM_DATA_MINUS2_NULL = "Data -2 null";
     private static final String ITEM_DATA_MINUS2 = "Data -2";
@@ -26,11 +26,7 @@ public class ContainerSortingTest extends TestCase {
     private static final String PROPERTY_STRING_NULL = "string-null";
     private static final String PROPERTY_STRING_ID = "string-not-null";
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
+    @Test
     public void testEmptyFilteredIndexedContainer() {
         IndexedContainer ic = new IndexedContainer();
 
@@ -42,6 +38,7 @@ public class ContainerSortingTest extends TestCase {
 
     }
 
+    @Test
     public void testFilteredIndexedContainer() {
         IndexedContainer ic = new IndexedContainer();
 
@@ -56,6 +53,7 @@ public class ContainerSortingTest extends TestCase {
                         ITEM_DATA_MINUS2_NULL, });
     }
 
+    @Test
     public void testIndexedContainer() {
         IndexedContainer ic = new IndexedContainer();
 
@@ -83,6 +81,7 @@ public class ContainerSortingTest extends TestCase {
 
     }
 
+    @Test
     public void testHierarchicalContainer() {
         HierarchicalContainer hc = new HierarchicalContainer();
         populateContainer(hc);
diff --git a/server/tests/src/com/vaadin/data/util/FileSystemContainerTest.java b/server/src/test/java/com/vaadin/data/util/FileSystemContainerTest.java
index f4bb794e5c..f4bb794e5c 100644
--- a/server/tests/src/com/vaadin/data/util/FileSystemContainerTest.java
+++ b/server/src/test/java/com/vaadin/data/util/FileSystemContainerTest.java
diff --git a/server/tests/src/com/vaadin/data/util/GeneratedPropertyContainerBasicTest.java b/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerBasicTest.java
index 90ec893f4d..5f7f965c69 100644
--- a/server/tests/src/com/vaadin/data/util/GeneratedPropertyContainerBasicTest.java
+++ b/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerBasicTest.java
@@ -1,10 +1,16 @@
 package com.vaadin.data.util;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.util.List;
 
 import org.easymock.Capture;
 import org.easymock.EasyMock;
 import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.Container;
 import com.vaadin.data.Container.Indexed.ItemAddEvent;
@@ -17,6 +23,7 @@ import com.vaadin.data.util.filter.SimpleStringFilter;
 public class GeneratedPropertyContainerBasicTest extends
         AbstractInMemoryContainerTestBase {
 
+    @Test
     public void testBasicOperations() {
         testBasicContainerOperations(createContainer());
     }
@@ -25,27 +32,33 @@ public class GeneratedPropertyContainerBasicTest extends
         return new GeneratedPropertyContainer(new IndexedContainer());
     }
 
+    @Test
     public void testFiltering() {
         testContainerFiltering(createContainer());
     }
 
+    @Test
     public void testSorting() {
         testContainerSorting(createContainer());
     }
 
+    @Test
     public void testSortingAndFiltering() {
         testContainerSortingAndFiltering(createContainer());
     }
 
+    @Test
     public void testContainerOrdered() {
         testContainerOrdered(createContainer());
     }
 
+    @Test
     public void testContainerIndexed() {
         testContainerIndexed(createContainer(), sampleData[2], 2, true,
                 "newItemId", true);
     }
 
+    @Test
     public void testItemSetChangeListeners() {
         GeneratedPropertyContainer container = createContainer();
         ItemSetChangeCounter counter = new ItemSetChangeCounter();
@@ -117,6 +130,7 @@ public class GeneratedPropertyContainerBasicTest extends
 
     }
 
+    @Test
     public void testAddRemoveContainerFilter() {
         GeneratedPropertyContainer container = createContainer();
         ItemSetChangeCounter counter = new ItemSetChangeCounter();
@@ -142,6 +156,7 @@ public class GeneratedPropertyContainerBasicTest extends
 
     // TODO other tests should check positions after removing filter etc,
     // here concentrating on listeners
+    @Test
     public void testItemSetChangeListenersFiltering() {
         Container.Indexed container = createContainer();
         ItemSetChangeCounter counter = new ItemSetChangeCounter();
@@ -289,6 +304,7 @@ public class GeneratedPropertyContainerBasicTest extends
         counter.assertNone();
     }
 
+    @Test
     public void testItemAdd_idSequence() {
         GeneratedPropertyContainer container = createContainer();
         Object itemId;
@@ -306,6 +322,7 @@ public class GeneratedPropertyContainerBasicTest extends
         assertEquals(Integer.valueOf(4), itemId);
     }
 
+    @Test
     public void testItemAddRemove_idSequence() {
         GeneratedPropertyContainer container = createContainer();
         Object itemId;
@@ -321,6 +338,7 @@ public class GeneratedPropertyContainerBasicTest extends
                 Integer.valueOf(2), itemId);
     }
 
+    @Test
     public void testItemAddedEvent() {
         GeneratedPropertyContainer container = createContainer();
         ItemSetChangeListener addListener = createListenerMockFor(container);
@@ -332,6 +350,7 @@ public class GeneratedPropertyContainerBasicTest extends
         EasyMock.verify(addListener);
     }
 
+    @Test
     public void testItemAddedEvent_AddedItem() {
         GeneratedPropertyContainer container = createContainer();
         ItemSetChangeListener addListener = createListenerMockFor(container);
@@ -343,6 +362,7 @@ public class GeneratedPropertyContainerBasicTest extends
         assertEquals(itemId, capturedEvent.getValue().getFirstItemId());
     }
 
+    @Test
     public void testItemAddedEvent_IndexOfAddedItem() {
         GeneratedPropertyContainer container = createContainer();
         ItemSetChangeListener addListener = createListenerMockFor(container);
@@ -355,6 +375,7 @@ public class GeneratedPropertyContainerBasicTest extends
         assertEquals(1, capturedEvent.getValue().getFirstIndex());
     }
 
+    @Test
     public void testItemRemovedEvent() {
         GeneratedPropertyContainer container = createContainer();
         Object itemId = container.addItem();
@@ -368,6 +389,7 @@ public class GeneratedPropertyContainerBasicTest extends
         EasyMock.verify(removeListener);
     }
 
+    @Test
     public void testItemRemovedEvent_RemovedItem() {
         GeneratedPropertyContainer container = createContainer();
         Object itemId = container.addItem();
@@ -380,6 +402,7 @@ public class GeneratedPropertyContainerBasicTest extends
         assertEquals(itemId, capturedEvent.getValue().getFirstItemId());
     }
 
+    @Test
     public void testItemRemovedEvent_indexOfRemovedItem() {
         GeneratedPropertyContainer container = createContainer();
         container.addItem();
@@ -393,6 +416,7 @@ public class GeneratedPropertyContainerBasicTest extends
         assertEquals(1, capturedEvent.getValue().getFirstIndex());
     }
 
+    @Test
     public void testItemRemovedEvent_amountOfRemovedItems() {
         GeneratedPropertyContainer container = createContainer();
         container.addItem();
@@ -429,6 +453,7 @@ public class GeneratedPropertyContainerBasicTest extends
     }
 
     // Ticket 8028
+    @Test
     public void testGetItemIdsRangeIndexOutOfBounds() {
         GeneratedPropertyContainer ic = createContainer();
         try {
@@ -444,6 +469,7 @@ public class GeneratedPropertyContainerBasicTest extends
     }
 
     // Ticket 8028
+    @Test
     public void testGetItemIdsRangeIndexOutOfBounds2() {
         GeneratedPropertyContainer ic = createContainer();
         ic.addItem(new Object());
@@ -460,6 +486,7 @@ public class GeneratedPropertyContainerBasicTest extends
     }
 
     // Ticket 8028
+    @Test
     public void testGetItemIdsRangeZeroRange() {
         GeneratedPropertyContainer ic = createContainer();
         ic.addItem(new Object());
@@ -477,6 +504,7 @@ public class GeneratedPropertyContainerBasicTest extends
     }
 
     // Ticket 8028
+    @Test
     public void testGetItemIdsRangeNegativeRange() {
         GeneratedPropertyContainer ic = createContainer();
         ic.addItem(new Object());
@@ -497,6 +525,7 @@ public class GeneratedPropertyContainerBasicTest extends
     }
 
     // Ticket 8028
+    @Test
     public void testGetItemIdsRangeIndexOutOfBoundsDueToSizeChange() {
         GeneratedPropertyContainer ic = createContainer();
         ic.addItem(new Object());
@@ -506,6 +535,7 @@ public class GeneratedPropertyContainerBasicTest extends
     }
 
     // Ticket 8028
+    @Test
     public void testGetItemIdsRangeBaseCase() {
         GeneratedPropertyContainer ic = createContainer();
         String object1 = new String("Obj1");
@@ -534,6 +564,7 @@ public class GeneratedPropertyContainerBasicTest extends
     }
 
     // test getting non-existing property (#10445)
+    @Test
     public void testNonExistingProperty() {
         Container ic = createContainer();
         String object1 = new String("Obj1");
@@ -542,6 +573,7 @@ public class GeneratedPropertyContainerBasicTest extends
     }
 
     // test getting null property id (#10445)
+    @Test
     public void testNullPropertyId() {
         Container ic = createContainer();
         String object1 = new String("Obj1");
diff --git a/server/tests/src/com/vaadin/data/util/GeneratedPropertyContainerTest.java b/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerTest.java
index bfa77eab52..bfa77eab52 100644
--- a/server/tests/src/com/vaadin/data/util/GeneratedPropertyContainerTest.java
+++ b/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerTest.java
diff --git a/server/tests/src/com/vaadin/data/util/HierarchicalContainerOrderedWrapperTest.java b/server/src/test/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapperTest.java
index 7ecf59c309..8c7970e554 100644
--- a/server/tests/src/com/vaadin/data/util/HierarchicalContainerOrderedWrapperTest.java
+++ b/server/src/test/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapperTest.java
@@ -1,5 +1,7 @@
 package com.vaadin.data.util;
 
+import org.junit.Test;
+
 public class HierarchicalContainerOrderedWrapperTest extends
         AbstractHierarchicalContainerTestBase {
 
@@ -8,18 +10,22 @@ public class HierarchicalContainerOrderedWrapperTest extends
                 new ContainerHierarchicalWrapper(new IndexedContainer()));
     }
 
+    @Test
     public void testBasicOperations() {
         testBasicContainerOperations(createContainer());
     }
 
+    @Test
     public void testHierarchicalContainer() {
         testHierarchicalContainer(createContainer());
     }
 
+    @Test
     public void testContainerOrdered() {
         testContainerOrdered(createContainer());
     }
 
+    @Test
     public void testRemoveSubtree() {
         testRemoveHierarchicalWrapperSubtree(createContainer());
     }
diff --git a/server/tests/src/com/vaadin/data/util/HierarchicalContainerTest.java b/server/src/test/java/com/vaadin/data/util/HierarchicalContainerTest.java
index 0b71b3dff9..280c46efcc 100644
--- a/server/tests/src/com/vaadin/data/util/HierarchicalContainerTest.java
+++ b/server/src/test/java/com/vaadin/data/util/HierarchicalContainerTest.java
@@ -1,35 +1,48 @@
 package com.vaadin.data.util;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+
+import org.junit.Test;
+
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;
 
 public class HierarchicalContainerTest extends
         AbstractHierarchicalContainerTestBase {
 
+    @Test
     public void testBasicOperations() {
         testBasicContainerOperations(new HierarchicalContainer());
     }
 
+    @Test
     public void testFiltering() {
         testContainerFiltering(new HierarchicalContainer());
     }
 
+    @Test
     public void testSorting() {
         testContainerSorting(new HierarchicalContainer());
     }
 
+    @Test
     public void testOrdered() {
         testContainerOrdered(new HierarchicalContainer());
     }
 
+    @Test
     public void testHierarchicalSorting() {
         testHierarchicalSorting(new HierarchicalContainer());
     }
 
+    @Test
     public void testSortingAndFiltering() {
         testContainerSortingAndFiltering(new HierarchicalContainer());
     }
 
+    @Test
     public void testRemovingItemsFromFilteredContainer() {
         HierarchicalContainer container = new HierarchicalContainer();
         initializeContainer(container);
@@ -50,6 +63,7 @@ public class HierarchicalContainerTest extends
 
     }
 
+    @Test
     public void testParentWhenRemovingFilterFromContainer() {
         HierarchicalContainer container = new HierarchicalContainer();
         initializeContainer(container);
@@ -67,6 +81,7 @@ public class HierarchicalContainerTest extends
 
     }
 
+    @Test
     public void testChangeParentInFilteredContainer() {
         HierarchicalContainer container = new HierarchicalContainer();
         initializeContainer(container);
@@ -93,6 +108,7 @@ public class HierarchicalContainerTest extends
 
     }
 
+    @Test
     public void testHierarchicalFilteringWithParents() {
         HierarchicalContainer container = new HierarchicalContainer();
         initializeContainer(container);
@@ -144,6 +160,7 @@ public class HierarchicalContainerTest extends
 
     }
 
+    @Test
     public void testRemoveLastChild() {
         HierarchicalContainer c = new HierarchicalContainer();
 
@@ -162,6 +179,7 @@ public class HierarchicalContainerTest extends
         assertFalse(c.hasChildren("root"));
     }
 
+    @Test
     public void testRemoveLastChildFromFiltered() {
         HierarchicalContainer c = new HierarchicalContainer();
 
@@ -195,6 +213,7 @@ public class HierarchicalContainerTest extends
         assertFalse(c.hasChildren("root"));
     }
 
+    @Test
     public void testHierarchicalFilteringWithoutParents() {
         HierarchicalContainer container = new HierarchicalContainer();
 
diff --git a/server/tests/src/com/vaadin/data/util/IndexedContainerTest.java b/server/src/test/java/com/vaadin/data/util/IndexedContainerTest.java
index 5828ac88cc..27632846de 100644
--- a/server/tests/src/com/vaadin/data/util/IndexedContainerTest.java
+++ b/server/src/test/java/com/vaadin/data/util/IndexedContainerTest.java
@@ -1,10 +1,15 @@
 package com.vaadin.data.util;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import java.util.List;
 
 import org.easymock.Capture;
 import org.easymock.EasyMock;
 import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.Container.Indexed.ItemAddEvent;
 import com.vaadin.data.Container.Indexed.ItemRemoveEvent;
@@ -13,31 +18,38 @@ import com.vaadin.data.Item;
 
 public class IndexedContainerTest extends AbstractInMemoryContainerTestBase {
 
+    @Test
     public void testBasicOperations() {
         testBasicContainerOperations(new IndexedContainer());
     }
 
+    @Test
     public void testFiltering() {
         testContainerFiltering(new IndexedContainer());
     }
 
+    @Test
     public void testSorting() {
         testContainerSorting(new IndexedContainer());
     }
 
+    @Test
     public void testSortingAndFiltering() {
         testContainerSortingAndFiltering(new IndexedContainer());
     }
 
+    @Test
     public void testContainerOrdered() {
         testContainerOrdered(new IndexedContainer());
     }
 
+    @Test
     public void testContainerIndexed() {
         testContainerIndexed(new IndexedContainer(), sampleData[2], 2, true,
                 "newItemId", true);
     }
 
+    @Test
     public void testItemSetChangeListeners() {
         IndexedContainer container = new IndexedContainer();
         ItemSetChangeCounter counter = new ItemSetChangeCounter();
@@ -109,6 +121,7 @@ public class IndexedContainerTest extends AbstractInMemoryContainerTestBase {
 
     }
 
+    @Test
     public void testAddRemoveContainerFilter() {
         IndexedContainer container = new IndexedContainer();
         ItemSetChangeCounter counter = new ItemSetChangeCounter();
@@ -131,6 +144,7 @@ public class IndexedContainerTest extends AbstractInMemoryContainerTestBase {
 
     // TODO other tests should check positions after removing filter etc,
     // here concentrating on listeners
+    @Test
     public void testItemSetChangeListenersFiltering() {
         IndexedContainer container = new IndexedContainer();
         ItemSetChangeCounter counter = new ItemSetChangeCounter();
@@ -276,6 +290,7 @@ public class IndexedContainerTest extends AbstractInMemoryContainerTestBase {
         counter.assertNone();
     }
 
+    @Test
     public void testItemAdd_idSequence() {
         IndexedContainer container = new IndexedContainer();
         Object itemId;
@@ -293,6 +308,7 @@ public class IndexedContainerTest extends AbstractInMemoryContainerTestBase {
         assertEquals(Integer.valueOf(4), itemId);
     }
 
+    @Test
     public void testItemAddRemove_idSequence() {
         IndexedContainer container = new IndexedContainer();
         Object itemId;
@@ -308,6 +324,7 @@ public class IndexedContainerTest extends AbstractInMemoryContainerTestBase {
                 Integer.valueOf(2), itemId);
     }
 
+    @Test
     public void testItemAddedEvent() {
         IndexedContainer container = new IndexedContainer();
         ItemSetChangeListener addListener = createListenerMockFor(container);
@@ -319,6 +336,7 @@ public class IndexedContainerTest extends AbstractInMemoryContainerTestBase {
         EasyMock.verify(addListener);
     }
 
+    @Test
     public void testItemAddedEvent_AddedItem() {
         IndexedContainer container = new IndexedContainer();
         ItemSetChangeListener addListener = createListenerMockFor(container);
@@ -330,6 +348,7 @@ public class IndexedContainerTest extends AbstractInMemoryContainerTestBase {
         assertEquals(itemId, capturedEvent.getValue().getFirstItemId());
     }
 
+    @Test
     public void testItemAddedEvent_IndexOfAddedItem() {
         IndexedContainer container = new IndexedContainer();
         ItemSetChangeListener addListener = createListenerMockFor(container);
@@ -342,6 +361,7 @@ public class IndexedContainerTest extends AbstractInMemoryContainerTestBase {
         assertEquals(1, capturedEvent.getValue().getFirstIndex());
     }
 
+    @Test
     public void testItemRemovedEvent() {
         IndexedContainer container = new IndexedContainer();
         Object itemId = container.addItem();
@@ -355,6 +375,7 @@ public class IndexedContainerTest extends AbstractInMemoryContainerTestBase {
         EasyMock.verify(removeListener);
     }
 
+    @Test
     public void testItemRemovedEvent_RemovedItem() {
         IndexedContainer container = new IndexedContainer();
         Object itemId = container.addItem();
@@ -367,6 +388,7 @@ public class IndexedContainerTest extends AbstractInMemoryContainerTestBase {
         assertEquals(itemId, capturedEvent.getValue().getFirstItemId());
     }
 
+    @Test
     public void testItemRemovedEvent_indexOfRemovedItem() {
         IndexedContainer container = new IndexedContainer();
         container.addItem();
@@ -380,6 +402,7 @@ public class IndexedContainerTest extends AbstractInMemoryContainerTestBase {
         assertEquals(1, capturedEvent.getValue().getFirstIndex());
     }
 
+    @Test
     public void testItemRemovedEvent_amountOfRemovedItems() {
         IndexedContainer container = new IndexedContainer();
         container.addItem();
@@ -416,74 +439,46 @@ public class IndexedContainerTest extends AbstractInMemoryContainerTestBase {
     }
 
     // Ticket 8028
+    @Test(expected = IndexOutOfBoundsException.class)
     public void testGetItemIdsRangeIndexOutOfBounds() {
         IndexedContainer ic = new IndexedContainer();
-        try {
-            ic.getItemIds(-1, 10);
-            fail("Container returned items starting from index -1, something very wrong here!");
-        } catch (IndexOutOfBoundsException e) {
-            // This is expected...
-        } catch (Exception e) {
-            // Should not happen!
-            fail("Container threw unspecified exception when fetching a range of items and the range started from -1");
-        }
-
+        ic.getItemIds(-1, 10);
     }
 
     // Ticket 8028
+    @Test(expected = IndexOutOfBoundsException.class)
     public void testGetItemIdsRangeIndexOutOfBounds2() {
         IndexedContainer ic = new IndexedContainer();
         ic.addItem(new Object());
-        try {
-            ic.getItemIds(2, 1);
-            fail("Container returned items starting from index -1, something very wrong here!");
-        } catch (IndexOutOfBoundsException e) {
-            // This is expected...
-        } catch (Exception e) {
-            // Should not happen!
-            fail("Container threw unspecified exception when fetching a out of bounds range of items");
-        }
-
+        ic.getItemIds(2, 1);
     }
 
     // Ticket 8028
+    @Test
     public void testGetItemIdsRangeZeroRange() {
         IndexedContainer ic = new IndexedContainer();
         ic.addItem(new Object());
-        try {
-            List<Object> itemIds = ic.getItemIds(1, 0);
-
-            assertTrue(
-                    "Container returned actual values when asking for 0 items...",
-                    itemIds.isEmpty());
-        } catch (Exception e) {
-            // Should not happen!
-            fail("Container threw unspecified exception when fetching 0 items...");
-        }
+        List<Object> itemIds = ic.getItemIds(1, 0);
 
+        assertTrue(
+                "Container returned actual values when asking for 0 items...",
+                itemIds.isEmpty());
     }
 
     // Ticket 8028
+    @Test(expected = IllegalArgumentException.class)
     public void testGetItemIdsRangeNegativeRange() {
         IndexedContainer ic = new IndexedContainer();
         ic.addItem(new Object());
-        try {
-            List<Object> itemIds = ic.getItemIds(1, -1);
-
-            assertTrue(
-                    "Container returned actual values when asking for -1 items...",
-                    itemIds.isEmpty());
-        } catch (IllegalArgumentException e) {
-            // this is expected
-
-        } catch (Exception e) {
-            // Should not happen!
-            fail("Container threw unspecified exception when fetching -1 items...");
-        }
+        List<Object> itemIds = ic.getItemIds(1, -1);
 
+        assertTrue(
+                "Container returned actual values when asking for -1 items...",
+                itemIds.isEmpty());
     }
 
     // Ticket 8028
+    @Test
     public void testGetItemIdsRangeIndexOutOfBoundsDueToSizeChange() {
         IndexedContainer ic = new IndexedContainer();
         ic.addItem(new Object());
@@ -493,6 +488,7 @@ public class IndexedContainerTest extends AbstractInMemoryContainerTestBase {
     }
 
     // Ticket 8028
+    @Test
     public void testGetItemIdsRangeBaseCase() {
         IndexedContainer ic = new IndexedContainer();
         String object1 = new String("Obj1");
@@ -507,20 +503,15 @@ public class IndexedContainerTest extends AbstractInMemoryContainerTestBase {
         ic.addItem(object4);
         ic.addItem(object5);
 
-        try {
-            List<Object> itemIds = ic.getItemIds(1, 2);
+        List<Object> itemIds = ic.getItemIds(1, 2);
 
-            assertTrue(itemIds.contains(object2));
-            assertTrue(itemIds.contains(object3));
-            assertEquals(2, itemIds.size());
-
-        } catch (Exception e) {
-            // Should not happen!
-            fail("Container threw  exception when fetching a range of items ");
-        }
+        assertTrue(itemIds.contains(object2));
+        assertTrue(itemIds.contains(object3));
+        assertEquals(2, itemIds.size());
     }
 
     // test getting non-existing property (#10445)
+    @Test
     public void testNonExistingProperty() {
         IndexedContainer ic = new IndexedContainer();
         String object1 = new String("Obj1");
@@ -529,11 +520,11 @@ public class IndexedContainerTest extends AbstractInMemoryContainerTestBase {
     }
 
     // test getting null property id (#10445)
+    @Test
     public void testNullPropertyId() {
         IndexedContainer ic = new IndexedContainer();
         String object1 = new String("Obj1");
         ic.addItem(object1);
         assertNull(ic.getContainerProperty(object1, null));
     }
-
 }
diff --git a/server/tests/src/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java b/server/src/test/java/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java
index b4621b823a..b4621b823a 100644
--- a/server/tests/src/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java
+++ b/server/src/test/java/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java
diff --git a/server/tests/src/com/vaadin/data/util/NestedMethodPropertyTest.java b/server/src/test/java/com/vaadin/data/util/NestedMethodPropertyTest.java
index 6535ba1870..79ce425bae 100644
--- a/server/tests/src/com/vaadin/data/util/NestedMethodPropertyTest.java
+++ b/server/src/test/java/com/vaadin/data/util/NestedMethodPropertyTest.java
@@ -1,5 +1,8 @@
 package com.vaadin.data.util;
 
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -7,11 +10,11 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
-import junit.framework.TestCase;
-
 import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class NestedMethodPropertyTest extends TestCase {
+public class NestedMethodPropertyTest {
 
     public static class Address implements Serializable {
         private String street;
@@ -125,20 +128,14 @@ public class NestedMethodPropertyTest extends TestCase {
     private Person joonas;
     private Team vaadin;
 
-    @Override
+    @Before
     public void setUp() {
         oldMill = new Address("Ruukinkatu 2-4", 20540);
         joonas = new Person("Joonas", oldMill);
         vaadin = new Team("Vaadin", joonas);
     }
 
-    @Override
-    public void tearDown() {
-        vaadin = null;
-        joonas = null;
-        oldMill = null;
-    }
-
+    @Test
     public void testSingleLevelNestedSimpleProperty() {
         NestedMethodProperty<String> nameProperty = new NestedMethodProperty<String>(
                 vaadin, "name");
@@ -147,6 +144,7 @@ public class NestedMethodPropertyTest extends TestCase {
         Assert.assertEquals("Vaadin", nameProperty.getValue());
     }
 
+    @Test
     public void testSingleLevelNestedObjectProperty() {
         NestedMethodProperty<Person> managerProperty = new NestedMethodProperty<Person>(
                 vaadin, "manager");
@@ -155,6 +153,7 @@ public class NestedMethodPropertyTest extends TestCase {
         Assert.assertEquals(joonas, managerProperty.getValue());
     }
 
+    @Test
     public void testMultiLevelNestedProperty() {
         NestedMethodProperty<String> managerNameProperty = new NestedMethodProperty<String>(
                 vaadin, "manager.name");
@@ -191,6 +190,7 @@ public class NestedMethodPropertyTest extends TestCase {
         Assert.assertEquals(Boolean.TRUE, booleanProperty.getValue());
     }
 
+    @Test
     public void testEmptyPropertyName() {
         try {
             new NestedMethodProperty<Object>(vaadin, "");
@@ -207,6 +207,7 @@ public class NestedMethodPropertyTest extends TestCase {
         }
     }
 
+    @Test
     public void testInvalidPropertyName() {
         try {
             new NestedMethodProperty<Object>(vaadin, ".");
@@ -234,6 +235,7 @@ public class NestedMethodPropertyTest extends TestCase {
         }
     }
 
+    @Test
     public void testInvalidNestedPropertyName() {
         try {
             new NestedMethodProperty<Object>(vaadin, "member");
@@ -257,6 +259,7 @@ public class NestedMethodPropertyTest extends TestCase {
         }
     }
 
+    @Test
     public void testNullNestedProperty() {
         NestedMethodProperty<String> managerNameProperty = new NestedMethodProperty<String>(
                 vaadin, "manager.name");
@@ -276,6 +279,7 @@ public class NestedMethodPropertyTest extends TestCase {
 
     }
 
+    @Test
     public void testMultiLevelNestedPropertySetValue() {
         NestedMethodProperty<String> managerNameProperty = new NestedMethodProperty<String>(
                 vaadin, "manager.name");
@@ -305,6 +309,7 @@ public class NestedMethodPropertyTest extends TestCase {
         Assert.assertEquals("Other street", streetProperty.getValue());
     }
 
+    @Test
     public void testSerialization() throws IOException, ClassNotFoundException {
         NestedMethodProperty<String> streetProperty = new NestedMethodProperty<String>(
                 vaadin, "manager.address.street");
@@ -317,6 +322,7 @@ public class NestedMethodPropertyTest extends TestCase {
         Assert.assertEquals("Ruukinkatu 2-4", property2.getValue());
     }
 
+    @Test
     public void testSerializationWithIntermediateNull() throws IOException,
             ClassNotFoundException {
         vaadin.setManager(null);
@@ -331,6 +337,7 @@ public class NestedMethodPropertyTest extends TestCase {
         Assert.assertNull(property2.getValue());
     }
 
+    @Test
     public void testIsReadOnly() {
         NestedMethodProperty<String> streetProperty = new NestedMethodProperty<String>(
                 vaadin, "manager.address.street");
diff --git a/server/tests/src/com/vaadin/data/util/ObjectPropertyTest.java b/server/src/test/java/com/vaadin/data/util/ObjectPropertyTest.java
index 99ca58ba42..e0307034cf 100644
--- a/server/tests/src/com/vaadin/data/util/ObjectPropertyTest.java
+++ b/server/src/test/java/com/vaadin/data/util/ObjectPropertyTest.java
@@ -1,10 +1,9 @@
 package com.vaadin.data.util;
 
-import junit.framework.TestCase;
-
 import org.junit.Assert;
+import org.junit.Test;
 
-public class ObjectPropertyTest extends TestCase {
+public class ObjectPropertyTest {
 
     public static class TestSuperClass {
         private String name;
@@ -32,6 +31,7 @@ public class ObjectPropertyTest extends TestCase {
     private TestSuperClass super1 = new TestSuperClass("super1");
     private TestSubClass sub1 = new TestSubClass("sub1");
 
+    @Test
     public void testSimple() {
         ObjectProperty<TestSuperClass> prop1 = new ObjectProperty<TestSuperClass>(
                 super1, TestSuperClass.class);
@@ -46,6 +46,7 @@ public class ObjectPropertyTest extends TestCase {
         Assert.assertEquals("Subclass: sub1", prop2.getValue().getName());
     }
 
+    @Test
     public void testSetValueObjectSuper() {
         ObjectProperty<TestSuperClass> prop = new ObjectProperty<TestSuperClass>(
                 super1, TestSuperClass.class);
@@ -55,6 +56,7 @@ public class ObjectPropertyTest extends TestCase {
         Assert.assertEquals("super2", prop.getValue().getName());
     }
 
+    @Test
     public void testSetValueObjectSub() {
         ObjectProperty<TestSubClass> prop = new ObjectProperty<TestSubClass>(
                 sub1, TestSubClass.class);
@@ -64,6 +66,7 @@ public class ObjectPropertyTest extends TestCase {
         Assert.assertEquals("Subclass: sub2", prop.getValue().getName());
     }
 
+    @Test
     public void testSetValueStringSuper() {
         ObjectProperty<TestSuperClass> prop = new ObjectProperty<TestSuperClass>(
                 super1, TestSuperClass.class);
@@ -73,6 +76,7 @@ public class ObjectPropertyTest extends TestCase {
         Assert.assertEquals("super2", prop.getValue().getName());
     }
 
+    @Test
     public void testSetValueStringSub() {
         ObjectProperty<TestSubClass> prop = new ObjectProperty<TestSubClass>(
                 sub1, TestSubClass.class);
@@ -82,6 +86,7 @@ public class ObjectPropertyTest extends TestCase {
         Assert.assertEquals("Subclass: sub2", prop.getValue().getName());
     }
 
+    @Test
     public void testMixedGenerics() {
         ObjectProperty<TestSuperClass> prop = new ObjectProperty<TestSuperClass>(
                 sub1);
diff --git a/server/tests/src/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java b/server/src/test/java/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java
index 042f260be8..fdfc2199b6 100644
--- a/server/tests/src/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java
+++ b/server/src/test/java/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java
@@ -6,11 +6,10 @@ import java.util.Collections;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import junit.framework.TestCase;
-
 import org.junit.Assert;
+import org.junit.Test;
 
-public class PerformanceTestIndexedContainerTest extends TestCase {
+public class PerformanceTestIndexedContainerTest {
 
     private static final int REPEATS = 10;
     private final static int ITEMS = 50000;
@@ -21,6 +20,7 @@ public class PerformanceTestIndexedContainerTest extends TestCase {
     private static final long ADD_ITEM_AFTER_LAST_FAIL_THRESHOLD = 5000;
     private static final long ADD_ITEMS_CONSTRUCTOR_FAIL_THRESHOLD = 200;
 
+    @Test
     public void testAddItemPerformance() {
         Collection<Long> times = new ArrayList<Long>();
         for (int j = 0; j < REPEATS; ++j) {
@@ -35,6 +35,7 @@ public class PerformanceTestIndexedContainerTest extends TestCase {
                 ADD_ITEM_FAIL_THRESHOLD);
     }
 
+    @Test
     public void testAddItemAtPerformance() {
         Collection<Long> times = new ArrayList<Long>();
         for (int j = 0; j < REPEATS; ++j) {
@@ -49,6 +50,7 @@ public class PerformanceTestIndexedContainerTest extends TestCase {
                 ADD_ITEM_AT_FAIL_THRESHOLD);
     }
 
+    @Test
     public void testAddItemAfterPerformance() {
         Object initialId = "Item0";
         Collection<Long> times = new ArrayList<Long>();
@@ -65,6 +67,7 @@ public class PerformanceTestIndexedContainerTest extends TestCase {
                 ADD_ITEM_AFTER_FAIL_THRESHOLD);
     }
 
+    @Test
     public void testAddItemAfterLastPerformance() {
         // TODO running with less items because slow otherwise
         Collection<Long> times = new ArrayList<Long>();
@@ -81,6 +84,7 @@ public class PerformanceTestIndexedContainerTest extends TestCase {
                 ADD_ITEM_AFTER_LAST_FAIL_THRESHOLD);
     }
 
+    @Test
     public void testAddItemsConstructorPerformance() {
         Collection<Object> items = new ArrayList<Object>(50000);
         for (int i = 0; i < ITEMS; ++i) {
diff --git a/server/tests/src/com/vaadin/data/util/PropertyDescriptorTest.java b/server/src/test/java/com/vaadin/data/util/PropertyDescriptorTest.java
index 9d662b2599..86f3968116 100644
--- a/server/tests/src/com/vaadin/data/util/PropertyDescriptorTest.java
+++ b/server/src/test/java/com/vaadin/data/util/PropertyDescriptorTest.java
@@ -7,14 +7,15 @@ import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-import junit.framework.TestCase;
-
 import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.util.NestedMethodPropertyTest.Person;
 
-public class PropertyDescriptorTest extends TestCase {
+public class PropertyDescriptorTest {
+
+    @Test
     public void testMethodPropertyDescriptorSerialization() throws Exception {
         PropertyDescriptor[] pds = Introspector.getBeanInfo(Person.class)
                 .getPropertyDescriptors();
@@ -40,6 +41,7 @@ public class PropertyDescriptorTest extends TestCase {
         Assert.assertEquals("John", property.getValue());
     }
 
+    @Test
     public void testSimpleNestedPropertyDescriptorSerialization()
             throws Exception {
         NestedPropertyDescriptor<Person> pd = new NestedPropertyDescriptor<Person>(
@@ -55,6 +57,7 @@ public class PropertyDescriptorTest extends TestCase {
         Assert.assertEquals("John", property.getValue());
     }
 
+    @Test
     public void testNestedPropertyDescriptorSerialization() throws Exception {
         NestedPropertyDescriptor<Person> pd = new NestedPropertyDescriptor<Person>(
                 "address.street", Person.class);
@@ -69,6 +72,7 @@ public class PropertyDescriptorTest extends TestCase {
         Assert.assertNull(property.getValue());
     }
 
+    @Test
     public void testMethodPropertyDescriptorWithPrimitivePropertyType()
             throws Exception {
         MethodPropertyDescriptor<Person> pd = new MethodPropertyDescriptor<Person>(
diff --git a/server/tests/src/com/vaadin/data/util/PropertySetItemTest.java b/server/src/test/java/com/vaadin/data/util/PropertySetItemTest.java
index ff83db4437..b957cb7f20 100644
--- a/server/tests/src/com/vaadin/data/util/PropertySetItemTest.java
+++ b/server/src/test/java/com/vaadin/data/util/PropertySetItemTest.java
@@ -2,15 +2,16 @@ package com.vaadin.data.util;
 
 import java.util.Iterator;
 
-import junit.framework.TestCase;
-
 import org.easymock.EasyMock;
+import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 import com.vaadin.data.Item.PropertySetChangeEvent;
 import com.vaadin.data.Item.PropertySetChangeListener;
 
-public class PropertySetItemTest extends TestCase {
+public class PropertySetItemTest {
 
     private static final String ID1 = "id1";
     private static final String ID2 = "id2";
@@ -27,8 +28,8 @@ public class PropertySetItemTest extends TestCase {
     private PropertySetChangeListener propertySetListenerMock;
     private PropertySetChangeListener propertySetListenerMock2;
 
-    @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() {
         prop1 = new ObjectProperty<String>(VALUE1, String.class);
         prop2 = new ObjectProperty<String>(VALUE2, String.class);
         prop3 = new ObjectProperty<String>(VALUE3, String.class);
@@ -39,8 +40,8 @@ public class PropertySetItemTest extends TestCase {
                 .createMock(PropertySetChangeListener.class);
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() {
         prop1 = null;
         prop2 = null;
         prop3 = null;
@@ -53,12 +54,14 @@ public class PropertySetItemTest extends TestCase {
         return new PropertysetItem();
     }
 
+    @Test
     public void testEmptyItem() {
         PropertysetItem item = createPropertySetItem();
         Assert.assertNotNull(item.getItemPropertyIds());
         Assert.assertEquals(0, item.getItemPropertyIds().size());
     }
 
+    @Test
     public void testGetProperty() {
         PropertysetItem item = createPropertySetItem();
 
@@ -70,6 +73,7 @@ public class PropertySetItemTest extends TestCase {
         Assert.assertNull(item.getItemProperty(ID2));
     }
 
+    @Test
     public void testAddSingleProperty() {
         PropertysetItem item = createPropertySetItem();
 
@@ -80,6 +84,7 @@ public class PropertySetItemTest extends TestCase {
         Assert.assertEquals(prop1, item.getItemProperty(ID1));
     }
 
+    @Test
     public void testAddMultipleProperties() {
         PropertysetItem item = createPropertySetItem();
 
@@ -96,6 +101,7 @@ public class PropertySetItemTest extends TestCase {
         Assert.assertEquals(3, item.getItemPropertyIds().size());
     }
 
+    @Test
     public void testAddedPropertyOrder() {
         PropertysetItem item = createPropertySetItem();
         item.addItemProperty(ID1, prop1);
@@ -108,6 +114,7 @@ public class PropertySetItemTest extends TestCase {
         Assert.assertEquals(ID3, it.next());
     }
 
+    @Test
     public void testAddPropertyTwice() {
         PropertysetItem item = createPropertySetItem();
         Assert.assertTrue(item.addItemProperty(ID1, prop1));
@@ -117,6 +124,7 @@ public class PropertySetItemTest extends TestCase {
         Assert.assertEquals(prop1, item.getItemProperty(ID1));
     }
 
+    @Test
     public void testCannotChangeProperty() {
         PropertysetItem item = createPropertySetItem();
         Assert.assertTrue(item.addItemProperty(ID1, prop1));
@@ -129,6 +137,7 @@ public class PropertySetItemTest extends TestCase {
         Assert.assertEquals(prop1, item.getItemProperty(ID1));
     }
 
+    @Test
     public void testRemoveProperty() {
         PropertysetItem item = createPropertySetItem();
         item.addItemProperty(ID1, prop1);
@@ -138,6 +147,7 @@ public class PropertySetItemTest extends TestCase {
         Assert.assertNull(item.getItemProperty(ID1));
     }
 
+    @Test
     public void testRemovePropertyOrder() {
         PropertysetItem item = createPropertySetItem();
         item.addItemProperty(ID1, prop1);
@@ -151,11 +161,13 @@ public class PropertySetItemTest extends TestCase {
         Assert.assertEquals(ID3, it.next());
     }
 
+    @Test
     public void testRemoveNonExistentListener() {
         PropertysetItem item = createPropertySetItem();
         item.removeListener(propertySetListenerMock);
     }
 
+    @Test
     public void testRemoveListenerTwice() {
         PropertysetItem item = createPropertySetItem();
         item.addListener(propertySetListenerMock);
@@ -163,6 +175,7 @@ public class PropertySetItemTest extends TestCase {
         item.removeListener(propertySetListenerMock);
     }
 
+    @Test
     public void testAddPropertyNotification() {
         // exactly one notification each time
         PropertysetItem item = createPropertySetItem();
@@ -188,6 +201,7 @@ public class PropertySetItemTest extends TestCase {
         EasyMock.verify(propertySetListenerMock);
     }
 
+    @Test
     public void testRemovePropertyNotification() {
         // exactly one notification each time
         PropertysetItem item = createPropertySetItem();
@@ -214,12 +228,14 @@ public class PropertySetItemTest extends TestCase {
         EasyMock.verify(propertySetListenerMock);
     }
 
+    @Test
     public void testItemEqualsNull() {
         PropertysetItem item = createPropertySetItem();
 
         Assert.assertFalse(item.equals(null));
     }
 
+    @Test
     public void testEmptyItemEquals() {
         PropertysetItem item1 = createPropertySetItem();
         PropertysetItem item2 = createPropertySetItem();
@@ -227,6 +243,7 @@ public class PropertySetItemTest extends TestCase {
         Assert.assertTrue(item1.equals(item2));
     }
 
+    @Test
     public void testItemEqualsSingleProperty() {
         PropertysetItem item1 = createPropertySetItem();
         PropertysetItem item2 = createPropertySetItem();
@@ -255,6 +272,7 @@ public class PropertySetItemTest extends TestCase {
         Assert.assertFalse(item2.equals(item1));
     }
 
+    @Test
     public void testItemEqualsMultipleProperties() {
         PropertysetItem item1 = createPropertySetItem();
         item1.addItemProperty(ID1, prop1);
@@ -272,6 +290,7 @@ public class PropertySetItemTest extends TestCase {
         Assert.assertTrue(item2.equals(item3));
     }
 
+    @Test
     public void testItemEqualsPropertyOrder() {
         PropertysetItem item1 = createPropertySetItem();
         item1.addItemProperty(ID1, prop1);
@@ -284,6 +303,7 @@ public class PropertySetItemTest extends TestCase {
         Assert.assertFalse(item1.equals(item2));
     }
 
+    @Test
     public void testEqualsSingleListener() {
         PropertysetItem item1 = createPropertySetItem();
         PropertysetItem item2 = createPropertySetItem();
@@ -299,6 +319,7 @@ public class PropertySetItemTest extends TestCase {
         Assert.assertTrue(item2.equals(item1));
     }
 
+    @Test
     public void testEqualsMultipleListeners() {
         PropertysetItem item1 = createPropertySetItem();
         PropertysetItem item2 = createPropertySetItem();
@@ -317,6 +338,7 @@ public class PropertySetItemTest extends TestCase {
         Assert.assertTrue(item2.equals(item1));
     }
 
+    @Test
     public void testEqualsAddRemoveListener() {
         PropertysetItem item1 = createPropertySetItem();
         PropertysetItem item2 = createPropertySetItem();
@@ -328,6 +350,7 @@ public class PropertySetItemTest extends TestCase {
         Assert.assertTrue(item2.equals(item1));
     }
 
+    @Test
     public void testItemHashCodeEmpty() {
         PropertysetItem item1 = createPropertySetItem();
         PropertysetItem item2 = createPropertySetItem();
@@ -335,6 +358,7 @@ public class PropertySetItemTest extends TestCase {
         Assert.assertEquals(item1.hashCode(), item2.hashCode());
     }
 
+    @Test
     public void testItemHashCodeAddProperties() {
         PropertysetItem item1 = createPropertySetItem();
         PropertysetItem item2 = createPropertySetItem();
@@ -351,6 +375,7 @@ public class PropertySetItemTest extends TestCase {
         Assert.assertEquals(item1.hashCode(), item2.hashCode());
     }
 
+    @Test
     public void testItemHashCodeAddListeners() {
         PropertysetItem item1 = createPropertySetItem();
         PropertysetItem item2 = createPropertySetItem();
@@ -365,6 +390,7 @@ public class PropertySetItemTest extends TestCase {
         Assert.assertEquals(item1.hashCode(), item2.hashCode());
     }
 
+    @Test
     public void testItemHashCodeAddRemoveProperty() {
         PropertysetItem item1 = createPropertySetItem();
         PropertysetItem item2 = createPropertySetItem();
@@ -375,6 +401,7 @@ public class PropertySetItemTest extends TestCase {
         Assert.assertEquals(item1.hashCode(), item2.hashCode());
     }
 
+    @Test
     public void testItemHashCodeAddRemoveListener() {
         PropertysetItem item1 = createPropertySetItem();
         PropertysetItem item2 = createPropertySetItem();
@@ -385,6 +412,7 @@ public class PropertySetItemTest extends TestCase {
         Assert.assertEquals(item1.hashCode(), item2.hashCode());
     }
 
+    @Test
     public void testToString() {
         // toString() behavior is specified in the class javadoc
         PropertysetItem item = createPropertySetItem();
diff --git a/server/tests/src/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java b/server/src/test/java/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java
index 5f31150210..5f31150210 100644
--- a/server/tests/src/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java
+++ b/server/src/test/java/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java
diff --git a/server/tests/src/com/vaadin/data/util/TransactionalPropertyWrapperTest.java b/server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java
index 5297cd807c..5297cd807c 100644
--- a/server/tests/src/com/vaadin/data/util/TransactionalPropertyWrapperTest.java
+++ b/server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java
diff --git a/server/tests/src/com/vaadin/data/util/filter/AbstractFilterTestBase.java b/server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java
index ebd843fb53..ebd843fb53 100644
--- a/server/tests/src/com/vaadin/data/util/filter/AbstractFilterTestBase.java
+++ b/server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java
diff --git a/server/tests/src/com/vaadin/data/util/filter/AndOrFilterTest.java b/server/src/test/java/com/vaadin/data/util/filter/AndOrFilterTest.java
index 1f42f4e935..21ce685445 100644
--- a/server/tests/src/com/vaadin/data/util/filter/AndOrFilterTest.java
+++ b/server/src/test/java/com/vaadin/data/util/filter/AndOrFilterTest.java
@@ -1,6 +1,7 @@
 package com.vaadin.data.util.filter;
 
 import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;
@@ -12,12 +13,14 @@ public class AndOrFilterTest extends
     protected Item item1 = new BeanItem<Integer>(1);
     protected Item item2 = new BeanItem<Integer>(2);
 
+    @Test
     public void testNoFilterAnd() {
         Filter filter = new And();
 
         Assert.assertTrue(filter.passesFilter(null, item1));
     }
 
+    @Test
     public void testSingleFilterAnd() {
         Filter filter = new And(new SameItemFilter(item1));
 
@@ -25,6 +28,7 @@ public class AndOrFilterTest extends
         Assert.assertFalse(filter.passesFilter(null, item2));
     }
 
+    @Test
     public void testTwoFilterAnd() {
         Filter filter1 = new And(new SameItemFilter(item1), new SameItemFilter(
                 item1));
@@ -38,6 +42,7 @@ public class AndOrFilterTest extends
         Assert.assertFalse(filter2.passesFilter(null, item2));
     }
 
+    @Test
     public void testThreeFilterAnd() {
         Filter filter1 = new And(new SameItemFilter(item1), new SameItemFilter(
                 item1), new SameItemFilter(item1));
@@ -51,12 +56,14 @@ public class AndOrFilterTest extends
         Assert.assertFalse(filter2.passesFilter(null, item2));
     }
 
+    @Test
     public void testNoFilterOr() {
         Filter filter = new Or();
 
         Assert.assertFalse(filter.passesFilter(null, item1));
     }
 
+    @Test
     public void testSingleFilterOr() {
         Filter filter = new Or(new SameItemFilter(item1));
 
@@ -64,6 +71,7 @@ public class AndOrFilterTest extends
         Assert.assertFalse(filter.passesFilter(null, item2));
     }
 
+    @Test
     public void testTwoFilterOr() {
         Filter filter1 = new Or(new SameItemFilter(item1), new SameItemFilter(
                 item1));
@@ -77,6 +85,7 @@ public class AndOrFilterTest extends
         Assert.assertTrue(filter2.passesFilter(null, item2));
     }
 
+    @Test
     public void testThreeFilterOr() {
         Filter filter1 = new Or(new SameItemFilter(item1), new SameItemFilter(
                 item1), new SameItemFilter(item1));
@@ -90,6 +99,7 @@ public class AndOrFilterTest extends
         Assert.assertTrue(filter2.passesFilter(null, item2));
     }
 
+    @Test
     public void testAndEqualsHashCode() {
         Filter filter0 = new And();
         Filter filter0b = new And();
@@ -129,6 +139,7 @@ public class AndOrFilterTest extends
         Assert.assertEquals(filter2b.hashCode(), filter2b2.hashCode());
     }
 
+    @Test
     public void testOrEqualsHashCode() {
         Filter filter0 = new Or();
         Filter filter0b = new Or();
@@ -168,6 +179,7 @@ public class AndOrFilterTest extends
         Assert.assertEquals(filter2b.hashCode(), filter2b2.hashCode());
     }
 
+    @Test
     public void testAndAppliesToProperty() {
         Filter filter0 = new And();
         Filter filter1a = new And(new SameItemFilter(item1, "a"));
@@ -199,6 +211,7 @@ public class AndOrFilterTest extends
         Assert.assertFalse(filter3abc.appliesToProperty("d"));
     }
 
+    @Test
     public void testOrAppliesToProperty() {
         Filter filter0 = new Or();
         Filter filter1a = new Or(new SameItemFilter(item1, "a"));
diff --git a/server/tests/src/com/vaadin/data/util/filter/CompareFilterTest.java b/server/src/test/java/com/vaadin/data/util/filter/CompareFilterTest.java
index fc5ffb9b56..116d70e188 100644
--- a/server/tests/src/com/vaadin/data/util/filter/CompareFilterTest.java
+++ b/server/src/test/java/com/vaadin/data/util/filter/CompareFilterTest.java
@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;
@@ -65,6 +66,7 @@ public class CompareFilterTest extends AbstractFilterTestBase<Compare> {
         itemB = null;
     }
 
+    @Test
     public void testCompareString() {
         Assert.assertFalse(equalB.passesFilter(null, itemEmpty));
         Assert.assertFalse(equalB.passesFilter(null, itemA));
@@ -92,6 +94,7 @@ public class CompareFilterTest extends AbstractFilterTestBase<Compare> {
         Assert.assertFalse(lessEqualB.passesFilter(null, itemC));
     }
 
+    @Test
     public void testCompareWithNull() {
         // null comparisons: null is less than any other value
         Assert.assertFalse(equalB.passesFilter(null, itemNull));
@@ -113,6 +116,7 @@ public class CompareFilterTest extends AbstractFilterTestBase<Compare> {
         Assert.assertTrue(lessEqualNull.passesFilter(null, itemA));
     }
 
+    @Test
     public void testCompareInteger() {
         int negative = -1;
         int zero = 0;
@@ -154,6 +158,7 @@ public class CompareFilterTest extends AbstractFilterTestBase<Compare> {
         Assert.assertFalse(isNonPositive.passesFilter(null, itemPositive));
     }
 
+    @Test
     public void testCompareBigDecimal() {
         BigDecimal negative = new BigDecimal(-1);
         BigDecimal zero = new BigDecimal(0);
@@ -207,6 +212,7 @@ public class CompareFilterTest extends AbstractFilterTestBase<Compare> {
 
     }
 
+    @Test
     public void testCompareDate() {
         Date now = new Date();
         // new Date() is only accurate to the millisecond, so repeating it gives
@@ -250,6 +256,7 @@ public class CompareFilterTest extends AbstractFilterTestBase<Compare> {
         Assert.assertFalse(beforeOrNow.passesFilter(null, itemLater));
     }
 
+    @Test
     public void testCompareAppliesToProperty() {
         Filter filterA = new Equal("a", 1);
         Filter filterB = new Equal("b", 1);
@@ -260,6 +267,7 @@ public class CompareFilterTest extends AbstractFilterTestBase<Compare> {
         Assert.assertTrue(filterB.appliesToProperty("b"));
     }
 
+    @Test
     public void testCompareEqualsHashCode() {
         // most checks with Equal filter, then only some with others
         Filter equalNull2 = new Equal(PROPERTY1, null);
diff --git a/server/tests/src/com/vaadin/data/util/filter/IsNullFilterTest.java b/server/src/test/java/com/vaadin/data/util/filter/IsNullFilterTest.java
index 953bf3cd65..7a2ab3af7e 100644
--- a/server/tests/src/com/vaadin/data/util/filter/IsNullFilterTest.java
+++ b/server/src/test/java/com/vaadin/data/util/filter/IsNullFilterTest.java
@@ -1,6 +1,7 @@
 package com.vaadin.data.util.filter;
 
 import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;
@@ -9,6 +10,7 @@ import com.vaadin.data.util.PropertysetItem;
 
 public class IsNullFilterTest extends AbstractFilterTestBase<IsNull> {
 
+    @Test
     public void testIsNull() {
         Item item1 = new PropertysetItem();
         item1.addItemProperty("a", new ObjectProperty<String>(null,
@@ -30,6 +32,7 @@ public class IsNullFilterTest extends AbstractFilterTestBase<IsNull> {
         Assert.assertTrue(filter2.passesFilter(null, item2));
     }
 
+    @Test
     public void testIsNullAppliesToProperty() {
         Filter filterA = new IsNull("a");
         Filter filterB = new IsNull("b");
@@ -40,6 +43,7 @@ public class IsNullFilterTest extends AbstractFilterTestBase<IsNull> {
         Assert.assertTrue(filterB.appliesToProperty("b"));
     }
 
+    @Test
     public void testIsNullEqualsHashCode() {
         Filter filter1 = new IsNull("a");
         Filter filter1b = new IsNull("a");
diff --git a/server/tests/src/com/vaadin/data/util/filter/LikeFilterTest.java b/server/src/test/java/com/vaadin/data/util/filter/LikeFilterTest.java
index 9ba5168ac9..d43650101d 100644
--- a/server/tests/src/com/vaadin/data/util/filter/LikeFilterTest.java
+++ b/server/src/test/java/com/vaadin/data/util/filter/LikeFilterTest.java
@@ -17,6 +17,7 @@
 package com.vaadin.data.util.filter;
 
 import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.Item;
 import com.vaadin.data.util.ObjectProperty;
@@ -28,6 +29,7 @@ public class LikeFilterTest extends AbstractFilterTestBase<Like> {
     protected Item item2 = new PropertysetItem();
     protected Item item3 = new PropertysetItem();
 
+    @Test
     public void testLikeWithNulls() {
 
         Like filter = new Like("value", "a");
diff --git a/server/tests/src/com/vaadin/data/util/filter/NotFilterTest.java b/server/src/test/java/com/vaadin/data/util/filter/NotFilterTest.java
index 310b749ce2..e797b484f8 100644
--- a/server/tests/src/com/vaadin/data/util/filter/NotFilterTest.java
+++ b/server/src/test/java/com/vaadin/data/util/filter/NotFilterTest.java
@@ -1,6 +1,7 @@
 package com.vaadin.data.util.filter;
 
 import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;
@@ -11,6 +12,7 @@ public class NotFilterTest extends AbstractFilterTestBase<Not> {
     protected Item item1 = new BeanItem<Integer>(1);
     protected Item item2 = new BeanItem<Integer>(2);
 
+    @Test
     public void testNot() {
         Filter origFilter = new SameItemFilter(item1);
         Filter filter = new Not(origFilter);
@@ -21,6 +23,7 @@ public class NotFilterTest extends AbstractFilterTestBase<Not> {
         Assert.assertTrue(filter.passesFilter(null, item2));
     }
 
+    @Test
     public void testANotAppliesToProperty() {
         Filter filterA = new Not(new SameItemFilter(item1, "a"));
         Filter filterB = new Not(new SameItemFilter(item1, "b"));
@@ -31,6 +34,7 @@ public class NotFilterTest extends AbstractFilterTestBase<Not> {
         Assert.assertTrue(filterB.appliesToProperty("b"));
     }
 
+    @Test
     public void testNotEqualsHashCode() {
         Filter origFilter = new SameItemFilter(item1);
         Filter filter1 = new Not(origFilter);
diff --git a/server/tests/src/com/vaadin/data/util/filter/SimpleStringFilterTest.java b/server/src/test/java/com/vaadin/data/util/filter/SimpleStringFilterTest.java
index fcaff6f2c3..e085c934c9 100644
--- a/server/tests/src/com/vaadin/data/util/filter/SimpleStringFilterTest.java
+++ b/server/src/test/java/com/vaadin/data/util/filter/SimpleStringFilterTest.java
@@ -1,6 +1,7 @@
 package com.vaadin.data.util.filter;
 
 import org.junit.Assert;
+import org.junit.Test;
 
 public class SimpleStringFilterTest extends
         AbstractFilterTestBase<SimpleStringFilter> {
@@ -25,6 +26,7 @@ public class SimpleStringFilterTest extends
                 .passesFilter(null, getTestItem());
     }
 
+    @Test
     public void testStartsWithCaseSensitive() {
         Assert.assertTrue(passes(PROPERTY1, "ab", false, true));
         Assert.assertTrue(passes(PROPERTY1, "", false, true));
@@ -33,12 +35,14 @@ public class SimpleStringFilterTest extends
         Assert.assertFalse(passes(PROPERTY1, "AB", false, true));
     }
 
+    @Test
     public void testStartsWithCaseInsensitive() {
         Assert.assertTrue(passes(PROPERTY1, "AB", true, true));
         Assert.assertTrue(passes(PROPERTY2, "te", true, true));
         Assert.assertFalse(passes(PROPERTY2, "AB", true, true));
     }
 
+    @Test
     public void testContainsCaseSensitive() {
         Assert.assertTrue(passes(PROPERTY1, "ab", false, false));
         Assert.assertTrue(passes(PROPERTY1, "abcde", false, false));
@@ -50,6 +54,7 @@ public class SimpleStringFilterTest extends
         Assert.assertFalse(passes(PROPERTY1, "es", false, false));
     }
 
+    @Test
     public void testContainsCaseInsensitive() {
         Assert.assertTrue(passes(PROPERTY1, "AB", true, false));
         Assert.assertTrue(passes(PROPERTY1, "aBcDe", true, false));
@@ -61,6 +66,7 @@ public class SimpleStringFilterTest extends
         Assert.assertFalse(passes(PROPERTY2, "ab", true, false));
     }
 
+    @Test
     public void testAppliesToProperty() {
         SimpleStringFilter filter = f(PROPERTY1, "ab", false, true);
         Assert.assertTrue(filter.appliesToProperty(PROPERTY1));
@@ -68,6 +74,7 @@ public class SimpleStringFilterTest extends
         Assert.assertFalse(filter.appliesToProperty("other"));
     }
 
+    @Test
     public void testEqualsHashCode() {
         SimpleStringFilter filter = f(PROPERTY1, "ab", false, true);
 
@@ -115,10 +122,12 @@ public class SimpleStringFilterTest extends
         Assert.assertEquals(f4.hashCode(), f4b.hashCode());
     }
 
+    @Test
     public void testNonExistentProperty() {
         Assert.assertFalse(passes("other1", "ab", false, true));
     }
 
+    @Test
     public void testNullValueForProperty() {
         TestItem<String, String> item = createTestItem();
         item.addItemProperty("other1", new NullProperty());
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/AllTests.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/AllTests.java
index d2c7ad85ed..9c3f6c0eaa 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/AllTests.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/AllTests.java
@@ -19,6 +19,6 @@ import com.vaadin.data.util.sqlcontainer.query.TableQueryTest;
         FreeformQueryTest.class, RowIdTest.class, SQLContainerTest.class,
         SQLContainerTableQueryTest.class, ColumnPropertyTest.class,
         TableQueryTest.class, SQLGeneratorsTest.class, UtilTest.class,
-        TicketTests.class, BetweenTest.class, ReadOnlyRowIdTest.class })
+        TicketTest.class, BetweenTest.class, ReadOnlyRowIdTest.class })
 public class AllTests {
 }
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
index 7cad310d37..7cad310d37 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/DataGenerator.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java
index f6619a33b6..f6619a33b6 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/DataGenerator.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
index 288cb65fae..288cb65fae 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java
index 29968ecf94..29968ecf94 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/RowIdTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/RowIdTest.java
index 73f7be9fb2..73f7be9fb2 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/RowIdTest.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/RowIdTest.java
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
index b2cc9a5d0c..b2cc9a5d0c 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java
index a332d9d9ee..a332d9d9ee 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java
index e03e970048..e03e970048 100755
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/TicketTests.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/TicketTest.java
index e180e3f3e7..2030096e82 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/TicketTests.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/TicketTest.java
@@ -26,7 +26,7 @@ import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Window;
 
-public class TicketTests {
+public class TicketTest {
 
     private JDBCConnectionPool connectionPool;
 
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/UtilTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/UtilTest.java
index a575d649f1..a575d649f1 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/UtilTest.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/UtilTest.java
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java
index 1463a27217..1463a27217 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
index 1c70c8dad7..1c70c8dad7 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
index b786f5b2de..b786f5b2de 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
index 6daf730e25..6daf730e25 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java
index 252acd81fc..252acd81fc 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java
index f1130aad80..f1130aad80 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java
index c2dbf0f12a..c2dbf0f12a 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.java
index b89b7e747d..b89b7e747d 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.java
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java
index bbf083c158..bbf083c158 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java
index 596f28cf5e..596f28cf5e 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
index 1cb3d722c6..1cb3d722c6 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java b/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java
index f40455f1d7..f40455f1d7 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java
diff --git a/server/tests/src/com/vaadin/server/AbstractClientConnectorProxyHandlingTest.java b/server/src/test/java/com/vaadin/server/AbstractClientConnectorProxyHandlingTest.java
index c15676c18e..c15676c18e 100644
--- a/server/tests/src/com/vaadin/server/AbstractClientConnectorProxyHandlingTest.java
+++ b/server/src/test/java/com/vaadin/server/AbstractClientConnectorProxyHandlingTest.java
diff --git a/server/tests/src/com/vaadin/server/AbstractClientConnectorTest.java b/server/src/test/java/com/vaadin/server/AbstractClientConnectorTest.java
index 96ca82a0b3..96ca82a0b3 100644
--- a/server/tests/src/com/vaadin/server/AbstractClientConnectorTest.java
+++ b/server/src/test/java/com/vaadin/server/AbstractClientConnectorTest.java
diff --git a/server/tests/src/com/vaadin/server/AbstractDeploymentConfigurationTest.java b/server/src/test/java/com/vaadin/server/AbstractDeploymentConfigurationTest.java
index 0518bea650..0518bea650 100644
--- a/server/tests/src/com/vaadin/server/AbstractDeploymentConfigurationTest.java
+++ b/server/src/test/java/com/vaadin/server/AbstractDeploymentConfigurationTest.java
diff --git a/server/tests/src/com/vaadin/server/BrowserWindowOpenerTest.java b/server/src/test/java/com/vaadin/server/BrowserWindowOpenerTest.java
index 7c76f7d421..7c76f7d421 100644
--- a/server/tests/src/com/vaadin/server/BrowserWindowOpenerTest.java
+++ b/server/src/test/java/com/vaadin/server/BrowserWindowOpenerTest.java
diff --git a/server/tests/src/com/vaadin/server/ConnectorResourceHandlerTest.java b/server/src/test/java/com/vaadin/server/ConnectorResourceHandlerTest.java
index a5746065d6..a5746065d6 100644
--- a/server/tests/src/com/vaadin/server/ConnectorResourceHandlerTest.java
+++ b/server/src/test/java/com/vaadin/server/ConnectorResourceHandlerTest.java
diff --git a/server/tests/src/com/vaadin/server/DefaultDeploymentConfigurationTest.java b/server/src/test/java/com/vaadin/server/DefaultDeploymentConfigurationTest.java
index 7cbb73af17..7cbb73af17 100644
--- a/server/tests/src/com/vaadin/server/DefaultDeploymentConfigurationTest.java
+++ b/server/src/test/java/com/vaadin/server/DefaultDeploymentConfigurationTest.java
diff --git a/server/tests/src/com/vaadin/server/DownloadStreamTest.java b/server/src/test/java/com/vaadin/server/DownloadStreamTest.java
index 180b2e348b..180b2e348b 100644
--- a/server/tests/src/com/vaadin/server/DownloadStreamTest.java
+++ b/server/src/test/java/com/vaadin/server/DownloadStreamTest.java
diff --git a/server/tests/src/com/vaadin/server/DragAndDropServiceTest.java b/server/src/test/java/com/vaadin/server/DragAndDropServiceTest.java
index d0cb0ca5a6..d0cb0ca5a6 100644
--- a/server/tests/src/com/vaadin/server/DragAndDropServiceTest.java
+++ b/server/src/test/java/com/vaadin/server/DragAndDropServiceTest.java
diff --git a/server/tests/src/com/vaadin/server/JSONSerializerTest.java b/server/src/test/java/com/vaadin/server/JSONSerializerTest.java
index 6c57445564..bb0be09870 100644
--- a/server/tests/src/com/vaadin/server/JSONSerializerTest.java
+++ b/server/src/test/java/com/vaadin/server/JSONSerializerTest.java
@@ -21,8 +21,8 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.server.JsonCodec.BeanProperty;
 import com.vaadin.shared.communication.UidlValue;
@@ -40,10 +40,11 @@ import elemental.json.JsonValue;
  * @since 7.0
  * 
  */
-public class JSONSerializerTest extends TestCase {
+public class JSONSerializerTest {
     HashMap<String, AbstractSplitPanelState> stringToStateMap;
     HashMap<AbstractSplitPanelState, String> stateToStringMap;
 
+    @Test
     public void testStringToBeanMapSerialization() throws Exception {
         Type mapType = getClass().getDeclaredField("stringToStateMap")
                 .getGenericType();
@@ -63,6 +64,7 @@ public class JSONSerializerTest extends TestCase {
         ensureDecodedCorrectly(stringToStateMap, encodedMap, mapType);
     }
 
+    @Test
     public void testBeanToStringMapSerialization() throws Exception {
         Type mapType = getClass().getDeclaredField("stateToStringMap")
                 .getGenericType();
@@ -80,34 +82,30 @@ public class JSONSerializerTest extends TestCase {
         ensureDecodedCorrectly(stateToStringMap, encodedMap, mapType);
     }
 
+    @Test
     public void testNullLegacyValue() throws JsonException {
         JsonArray inputArray = Json.createArray();
         inputArray.set(0, "n");
         inputArray.set(1, Json.createNull());
         UidlValue decodedObject = (UidlValue) JsonCodec.decodeInternalType(
                 UidlValue.class, true, inputArray, null);
-        assertNull(decodedObject.getValue());
+        Assert.assertNull(decodedObject.getValue());
     }
 
+    @Test(expected = JsonException.class)
     public void testNullTypeOtherValue() {
-        try {
-            JsonArray inputArray = Json.createArray();
-            inputArray.set(0, "n");
-            inputArray.set(1, "a");
-            UidlValue decodedObject = (UidlValue) JsonCodec.decodeInternalType(
-                    UidlValue.class, true, inputArray, null);
-
-            throw new AssertionFailedError("No JsonException thrown");
-        } catch (JsonException e) {
-            // Should throw exception
-        }
+        JsonArray inputArray = Json.createArray();
+        inputArray.set(0, "n");
+        inputArray.set(1, "a");
+        UidlValue decodedObject = (UidlValue) JsonCodec.decodeInternalType(
+                UidlValue.class, true, inputArray, null);
     }
 
     private void ensureDecodedCorrectly(Object original, JsonValue encoded,
             Type type) throws Exception {
         Object serverSideDecoded = JsonCodec.decodeInternalOrCustomType(type,
                 encoded, null);
-        assertTrue("Server decoded", equals(original, serverSideDecoded));
+        Assert.assertTrue("Server decoded", equals(original, serverSideDecoded));
 
     }
 
diff --git a/server/tests/src/com/vaadin/server/JsonEqualsTest.java b/server/src/test/java/com/vaadin/server/JsonEqualsTest.java
index ca3bfced79..ca3bfced79 100644
--- a/server/tests/src/com/vaadin/server/JsonEqualsTest.java
+++ b/server/src/test/java/com/vaadin/server/JsonEqualsTest.java
diff --git a/server/tests/src/com/vaadin/server/MockServletConfig.java b/server/src/test/java/com/vaadin/server/MockServletConfig.java
index d9d0e4d773..d9d0e4d773 100644
--- a/server/tests/src/com/vaadin/server/MockServletConfig.java
+++ b/server/src/test/java/com/vaadin/server/MockServletConfig.java
diff --git a/server/tests/src/com/vaadin/server/MockServletContext.java b/server/src/test/java/com/vaadin/server/MockServletContext.java
index e9471fc9ee..e9471fc9ee 100644
--- a/server/tests/src/com/vaadin/server/MockServletContext.java
+++ b/server/src/test/java/com/vaadin/server/MockServletContext.java
diff --git a/server/tests/src/com/vaadin/server/MockUIContainingServlet.java b/server/src/test/java/com/vaadin/server/MockUIContainingServlet.java
index d54242e31f..d54242e31f 100644
--- a/server/tests/src/com/vaadin/server/MockUIContainingServlet.java
+++ b/server/src/test/java/com/vaadin/server/MockUIContainingServlet.java
diff --git a/server/tests/src/com/vaadin/server/MockVaadinSession.java b/server/src/test/java/com/vaadin/server/MockVaadinSession.java
index e1def5bcee..e1def5bcee 100644
--- a/server/tests/src/com/vaadin/server/MockVaadinSession.java
+++ b/server/src/test/java/com/vaadin/server/MockVaadinSession.java
diff --git a/server/tests/src/com/vaadin/server/PageTest.java b/server/src/test/java/com/vaadin/server/PageTest.java
index b782b1f67d..b782b1f67d 100644
--- a/server/tests/src/com/vaadin/server/PageTest.java
+++ b/server/src/test/java/com/vaadin/server/PageTest.java
diff --git a/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java b/server/src/test/java/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
index 3f940ae0a7..aba29bf9a5 100644
--- a/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
+++ b/server/src/test/java/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
@@ -9,22 +9,23 @@ import java.net.URL;
 
 import javax.servlet.http.HttpServletRequest;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class TestAbstractApplicationServletStaticFilesLocation extends TestCase {
+public class TestAbstractApplicationServletStaticFilesLocation {
 
     VaadinServlet servlet;
 
     // private Method getStaticFilesLocationMethod;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
+    @Before
+    public void setUp() throws Exception {
         servlet = new VaadinServlet();
         servlet.init(new MockServletConfig());
     }
 
+    @Test
     public void testWidgetSetLocation() throws Exception {
         String location;
 
@@ -33,30 +34,30 @@ public class TestAbstractApplicationServletStaticFilesLocation extends TestCase
         // should return . (relative url resolving to /contextpath)
         location = testLocation("http://dummy.host:8080", "/contextpath",
                 "/servlet", "");
-        assertEquals(".", location);
+        Assert.assertEquals(".", location);
 
         // http://dummy.host:8080/contextpath/servlet/
         // should return ./.. (relative url resolving to /contextpath)
         location = testLocation("http://dummy.host:8080", "/contextpath",
                 "/servlet", "/");
-        assertEquals("./..", location);
+        Assert.assertEquals("./..", location);
 
         // http://dummy.host:8080/servlet
         // should return "."
         location = testLocation("http://dummy.host:8080", "", "/servlet", "");
-        assertEquals(".", location);
+        Assert.assertEquals(".", location);
 
         // http://dummy.host/contextpath/servlet/extra/stuff
         // should return ./../.. (relative url resolving to /contextpath)
         location = testLocation("http://dummy.host", "/contextpath",
                 "/servlet", "/extra/stuff");
-        assertEquals("./../..", location);
+        Assert.assertEquals("./../..", location);
 
         // http://dummy.host/context/path/servlet/extra/stuff
         // should return ./../.. (relative url resolving to /context/path)
         location = testLocation("http://dummy.host", "/context/path",
                 "/servlet", "/extra/stuff");
-        assertEquals("./../..", location);
+        Assert.assertEquals("./../..", location);
 
         /* Include requests */
         // Include request support dropped with support for portlet1
diff --git a/server/tests/src/com/vaadin/server/UIProviderTest.java b/server/src/test/java/com/vaadin/server/UIProviderTest.java
index 579a3f1858..579a3f1858 100644
--- a/server/tests/src/com/vaadin/server/UIProviderTest.java
+++ b/server/src/test/java/com/vaadin/server/UIProviderTest.java
diff --git a/server/tests/src/com/vaadin/server/VaadinGateInRequestTest.java b/server/src/test/java/com/vaadin/server/VaadinGateInRequestTest.java
index eda2b3a006..eda2b3a006 100644
--- a/server/tests/src/com/vaadin/server/VaadinGateInRequestTest.java
+++ b/server/src/test/java/com/vaadin/server/VaadinGateInRequestTest.java
diff --git a/server/tests/src/com/vaadin/server/VaadinHttpAndPortletRequestTestBase.java b/server/src/test/java/com/vaadin/server/VaadinHttpAndPortletRequestTestBase.java
index 0f7cce5f75..0f7cce5f75 100644
--- a/server/tests/src/com/vaadin/server/VaadinHttpAndPortletRequestTestBase.java
+++ b/server/src/test/java/com/vaadin/server/VaadinHttpAndPortletRequestTestBase.java
diff --git a/server/tests/src/com/vaadin/server/VaadinLiferayRequestTest.java b/server/src/test/java/com/vaadin/server/VaadinLiferayRequestTest.java
index 3024cd652f..3024cd652f 100644
--- a/server/tests/src/com/vaadin/server/VaadinLiferayRequestTest.java
+++ b/server/src/test/java/com/vaadin/server/VaadinLiferayRequestTest.java
diff --git a/server/tests/src/com/vaadin/server/VaadinPortletRequestTests.java b/server/src/test/java/com/vaadin/server/VaadinPortletRequestTest.java
index bf2b809529..2d15826cb7 100644
--- a/server/tests/src/com/vaadin/server/VaadinPortletRequestTests.java
+++ b/server/src/test/java/com/vaadin/server/VaadinPortletRequestTest.java
@@ -13,7 +13,7 @@ import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class VaadinPortletRequestTests {
+public class VaadinPortletRequestTest {
 
     private PortletRequest request;
     private VaadinPortletRequest sut;
diff --git a/server/tests/src/com/vaadin/server/VaadinPortletServiceTests.java b/server/src/test/java/com/vaadin/server/VaadinPortletServiceTest.java
index 38f3b85043..d8c66e312f 100644
--- a/server/tests/src/com/vaadin/server/VaadinPortletServiceTests.java
+++ b/server/src/test/java/com/vaadin/server/VaadinPortletServiceTest.java
@@ -30,7 +30,7 @@ import org.mockito.Mockito;
 import com.vaadin.shared.ui.ui.UIConstants;
 import com.vaadin.ui.UI;
 
-public class VaadinPortletServiceTests {
+public class VaadinPortletServiceTest {
 
     private VaadinPortletService sut;
     private VaadinPortletRequest request;
diff --git a/server/tests/src/com/vaadin/server/VaadinPortletTests.java b/server/src/test/java/com/vaadin/server/VaadinPortletTest.java
index f92aa0dcaa..4e74f91708 100644
--- a/server/tests/src/com/vaadin/server/VaadinPortletTests.java
+++ b/server/src/test/java/com/vaadin/server/VaadinPortletTest.java
@@ -30,7 +30,7 @@ import com.vaadin.server.VaadinPortlet.VaadinGateInRequest;
 import com.vaadin.server.VaadinPortlet.VaadinLiferayRequest;
 import com.vaadin.server.VaadinPortlet.VaadinWebSpherePortalRequest;
 
-public class VaadinPortletTests {
+public class VaadinPortletTest {
 
     private VaadinPortlet sut;
     private PortletRequest portletRequest;
diff --git a/server/tests/src/com/vaadin/server/VaadinServiceTest.java b/server/src/test/java/com/vaadin/server/VaadinServiceTest.java
index bd3da6277a..bd3da6277a 100644
--- a/server/tests/src/com/vaadin/server/VaadinServiceTest.java
+++ b/server/src/test/java/com/vaadin/server/VaadinServiceTest.java
diff --git a/server/tests/src/com/vaadin/server/VaadinServletConfigurationTest.java b/server/src/test/java/com/vaadin/server/VaadinServletConfigurationTest.java
index 65698d2c44..65698d2c44 100644
--- a/server/tests/src/com/vaadin/server/VaadinServletConfigurationTest.java
+++ b/server/src/test/java/com/vaadin/server/VaadinServletConfigurationTest.java
diff --git a/server/tests/src/com/vaadin/server/VaadinServletTest.java b/server/src/test/java/com/vaadin/server/VaadinServletTest.java
index 566c4ce70a..566c4ce70a 100644
--- a/server/tests/src/com/vaadin/server/VaadinServletTest.java
+++ b/server/src/test/java/com/vaadin/server/VaadinServletTest.java
diff --git a/server/tests/src/com/vaadin/server/VaadinSessionTest.java b/server/src/test/java/com/vaadin/server/VaadinSessionTest.java
index 85c37d156c..85c37d156c 100644
--- a/server/tests/src/com/vaadin/server/VaadinSessionTest.java
+++ b/server/src/test/java/com/vaadin/server/VaadinSessionTest.java
diff --git a/server/tests/src/com/vaadin/server/VaadinWebSpherePortalRequestTest.java b/server/src/test/java/com/vaadin/server/VaadinWebSpherePortalRequestTest.java
index 3a4c5c69be..3a4c5c69be 100644
--- a/server/tests/src/com/vaadin/server/VaadinWebSpherePortalRequestTest.java
+++ b/server/src/test/java/com/vaadin/server/VaadinWebSpherePortalRequestTest.java
diff --git a/server/tests/src/com/vaadin/server/communication/AtmospherePushConnectionTest.java b/server/src/test/java/com/vaadin/server/communication/AtmospherePushConnectionTest.java
index f9e12ce75f..a1a833e8af 100644
--- a/server/tests/src/com/vaadin/server/communication/AtmospherePushConnectionTest.java
+++ b/server/src/test/java/com/vaadin/server/communication/AtmospherePushConnectionTest.java
@@ -28,9 +28,6 @@ import org.junit.Test;
 import com.vaadin.server.communication.AtmospherePushConnection.State;
 import com.vaadin.ui.UI;
 
-/**
- * @author Vaadin Ltd
- */
 public class AtmospherePushConnectionTest {
     @Test
     public void testSerialization() throws Exception {
diff --git a/server/tests/src/com/vaadin/server/communication/FileUploadHandlerTest.java b/server/src/test/java/com/vaadin/server/communication/FileUploadHandlerTest.java
index 286163541e..286163541e 100644
--- a/server/tests/src/com/vaadin/server/communication/FileUploadHandlerTest.java
+++ b/server/src/test/java/com/vaadin/server/communication/FileUploadHandlerTest.java
diff --git a/server/tests/src/com/vaadin/server/communication/MetadataWriterTest.java b/server/src/test/java/com/vaadin/server/communication/MetadataWriterTest.java
index afae14007e..afae14007e 100644
--- a/server/tests/src/com/vaadin/server/communication/MetadataWriterTest.java
+++ b/server/src/test/java/com/vaadin/server/communication/MetadataWriterTest.java
diff --git a/server/tests/src/com/vaadin/tests/CompileTransitionPropertyTest.java b/server/src/test/java/com/vaadin/tests/CompileTransitionPropertyTest.java
index d6c564a42b..337ce19a06 100644
--- a/server/tests/src/com/vaadin/tests/CompileTransitionPropertyTest.java
+++ b/server/src/test/java/com/vaadin/tests/CompileTransitionPropertyTest.java
@@ -32,7 +32,7 @@ public class CompileTransitionPropertyTest {
     @Test
     public void testCompilation() throws Exception {
         ScssStylesheet ss = ScssStylesheet
-                .get("server/tests/src/com/vaadin/tests/styles.scss");
+                .get(getClass().getResource("styles.scss").getFile());
         ss.compile();
         // extract the style rules for .my-label
         String compiled = ss.printState();
@@ -40,17 +40,17 @@ public class CompileTransitionPropertyTest {
         Matcher matcher = pattern.matcher(compiled);
         assertTrue("Could not find style rules for .my-label.", matcher.find());
         String elementStyle = matcher.group();
-        elementStyle = elementStyle.replaceFirst(
-                "(.my-label)(\\s)+(\\{)(\\s)*", "");
+        elementStyle = elementStyle.replaceFirst("(.my-label)(\\s)+(\\{)(\\s)*",
+                "");
         // Check that the correct rules are present
         Pattern p1 = Pattern
                 .compile("transition-property(\\s*):(\\s*)transform(\\s*);");
-        Pattern p2 = Pattern
-                .compile("-moz-transition-property(\\s*):(\\s*)-moz-transform(\\s*);");
-        Pattern p3 = Pattern
-                .compile("-webkit-transition-property(\\s*):(\\s*)-webkit-transform(\\s*);");
-        assertTrue("The style 'transition-property: transform' is missing.", p1
-                .matcher(elementStyle).find());
+        Pattern p2 = Pattern.compile(
+                "-moz-transition-property(\\s*):(\\s*)-moz-transform(\\s*);");
+        Pattern p3 = Pattern.compile(
+                "-webkit-transition-property(\\s*):(\\s*)-webkit-transform(\\s*);");
+        assertTrue("The style 'transition-property: transform' is missing.",
+                p1.matcher(elementStyle).find());
         assertTrue(
                 "The style '-moz-transition-property: -moz-transform' is missing.",
                 p2.matcher(elementStyle).find());
diff --git a/server/tests/src/com/vaadin/tests/VaadinClasses.java b/server/src/test/java/com/vaadin/tests/VaadinClasses.java
index b5933bbd10..b5933bbd10 100644
--- a/server/tests/src/com/vaadin/tests/VaadinClasses.java
+++ b/server/src/test/java/com/vaadin/tests/VaadinClasses.java
diff --git a/server/tests/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperDeclarativeTest.java
index a590b3ec1f..a590b3ec1f 100644
--- a/server/tests/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java
index 321d41152b..321d41152b 100644
--- a/server/tests/src/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/data/bean/Address.java b/server/src/test/java/com/vaadin/tests/data/bean/Address.java
index 15cdf34ae5..15cdf34ae5 100644
--- a/server/tests/src/com/vaadin/tests/data/bean/Address.java
+++ b/server/src/test/java/com/vaadin/tests/data/bean/Address.java
diff --git a/server/tests/src/com/vaadin/tests/data/bean/AnotherTestEnum.java b/server/src/test/java/com/vaadin/tests/data/bean/AnotherTestEnum.java
index fc8f22a947..fc8f22a947 100644
--- a/server/tests/src/com/vaadin/tests/data/bean/AnotherTestEnum.java
+++ b/server/src/test/java/com/vaadin/tests/data/bean/AnotherTestEnum.java
diff --git a/server/tests/src/com/vaadin/tests/data/bean/BeanToValidate.java b/server/src/test/java/com/vaadin/tests/data/bean/BeanToValidate.java
index 034609764f..034609764f 100644
--- a/server/tests/src/com/vaadin/tests/data/bean/BeanToValidate.java
+++ b/server/src/test/java/com/vaadin/tests/data/bean/BeanToValidate.java
diff --git a/server/tests/src/com/vaadin/tests/data/bean/BeanWithReadOnlyField.java b/server/src/test/java/com/vaadin/tests/data/bean/BeanWithReadOnlyField.java
index 77f5613f86..77f5613f86 100644
--- a/server/tests/src/com/vaadin/tests/data/bean/BeanWithReadOnlyField.java
+++ b/server/src/test/java/com/vaadin/tests/data/bean/BeanWithReadOnlyField.java
diff --git a/server/tests/src/com/vaadin/tests/data/bean/Country.java b/server/src/test/java/com/vaadin/tests/data/bean/Country.java
index afdf8dcfa1..afdf8dcfa1 100644
--- a/server/tests/src/com/vaadin/tests/data/bean/Country.java
+++ b/server/src/test/java/com/vaadin/tests/data/bean/Country.java
diff --git a/server/tests/src/com/vaadin/tests/data/bean/Person.java b/server/src/test/java/com/vaadin/tests/data/bean/Person.java
index f7bad31d0e..f7bad31d0e 100644
--- a/server/tests/src/com/vaadin/tests/data/bean/Person.java
+++ b/server/src/test/java/com/vaadin/tests/data/bean/Person.java
diff --git a/server/tests/src/com/vaadin/tests/data/bean/PersonWithBeanValidationAnnotations.java b/server/src/test/java/com/vaadin/tests/data/bean/PersonWithBeanValidationAnnotations.java
index 575730d946..575730d946 100644
--- a/server/tests/src/com/vaadin/tests/data/bean/PersonWithBeanValidationAnnotations.java
+++ b/server/src/test/java/com/vaadin/tests/data/bean/PersonWithBeanValidationAnnotations.java
diff --git a/server/tests/src/com/vaadin/tests/data/bean/Sex.java b/server/src/test/java/com/vaadin/tests/data/bean/Sex.java
index a4e3f20a11..a4e3f20a11 100644
--- a/server/tests/src/com/vaadin/tests/data/bean/Sex.java
+++ b/server/src/test/java/com/vaadin/tests/data/bean/Sex.java
diff --git a/server/tests/src/com/vaadin/tests/data/bean/TestEnum.java b/server/src/test/java/com/vaadin/tests/data/bean/TestEnum.java
index bf6f721052..bf6f721052 100644
--- a/server/tests/src/com/vaadin/tests/data/bean/TestEnum.java
+++ b/server/src/test/java/com/vaadin/tests/data/bean/TestEnum.java
diff --git a/server/tests/src/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java
index 83b4abad3f..83b4abad3f 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java
diff --git a/server/tests/src/com/vaadin/tests/data/converter/ConverterFactoryTest.java b/server/src/test/java/com/vaadin/tests/data/converter/ConverterFactoryTest.java
index a61c0c9986..766c2309a0 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/ConverterFactoryTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/ConverterFactoryTest.java
@@ -17,7 +17,8 @@ package com.vaadin.tests.data.converter;
 
 import java.util.Locale;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.util.converter.DefaultConverterFactory;
@@ -25,7 +26,7 @@ import com.vaadin.server.VaadinSession;
 import com.vaadin.tests.util.AlwaysLockedVaadinSession;
 import com.vaadin.ui.TextField;
 
-public class ConverterFactoryTest extends TestCase {
+public class ConverterFactoryTest {
 
     public static class ConvertTo42 implements Converter<String, Integer> {
 
@@ -67,6 +68,7 @@ public class ConverterFactoryTest extends TestCase {
         }
     }
 
+    @Test
     public void testApplicationConverterFactoryInBackgroundThread() {
         VaadinSession.setCurrent(null);
         final VaadinSession appWithCustomIntegerConverter = new AlwaysLockedVaadinSession(
@@ -83,9 +85,10 @@ public class ConverterFactoryTest extends TestCase {
         tf.setConverter(Integer.class);
         // The application converter always returns 42. Current application is
         // null
-        assertEquals(42, tf.getConvertedValue());
+        Assert.assertEquals(42, tf.getConvertedValue());
     }
 
+    @Test
     public void testApplicationConverterFactoryForDetachedComponent() {
         final VaadinSession appWithCustomIntegerConverter = new AlwaysLockedVaadinSession(
                 null);
@@ -97,9 +100,10 @@ public class ConverterFactoryTest extends TestCase {
         tf.setConverter(Integer.class);
         // The application converter always returns 42. Current application is
         // null
-        assertEquals(42, tf.getConvertedValue());
+        Assert.assertEquals(42, tf.getConvertedValue());
     }
 
+    @Test
     public void testApplicationConverterFactoryForDifferentThanCurrentApplication() {
         final VaadinSession fieldAppWithCustomIntegerConverter = new AlwaysLockedVaadinSession(
                 null);
@@ -117,6 +121,6 @@ public class ConverterFactoryTest extends TestCase {
 
         // The application converter always returns 42. Application.getCurrent()
         // should not be used
-        assertEquals(42, tf.getConvertedValue());
+        Assert.assertEquals(42, tf.getConvertedValue());
     }
 }
diff --git a/server/tests/src/com/vaadin/tests/data/converter/DateToLongConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java
index d767430cc1..2dbdaceb3b 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/DateToLongConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java
@@ -2,20 +2,24 @@ package com.vaadin.tests.data.converter;
 
 import java.util.Date;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.util.converter.DateToLongConverter;
 
-public class DateToLongConverterTest extends TestCase {
+public class DateToLongConverterTest {
 
     DateToLongConverter converter = new DateToLongConverter();
 
+    @Test
     public void testNullConversion() {
-        assertEquals(null, converter.convertToModel(null, Long.class, null));
+        Assert.assertEquals(null,
+                converter.convertToModel(null, Long.class, null));
     }
 
+    @Test
     public void testValueConversion() {
-        assertEquals(Long.valueOf(946677600000l),
+        Assert.assertEquals(Long.valueOf(946677600000l),
                 converter.convertToModel(new Date(100, 0, 1), Long.class, null));
     }
 }
diff --git a/server/tests/src/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java
index 46dca6d13e..dd71609d02 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java
@@ -3,23 +3,26 @@ package com.vaadin.tests.data.converter;
 import java.util.Date;
 import java.util.Locale;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.util.converter.DateToSqlDateConverter;
 
-public class DateToSqlDateConverterTest extends TestCase {
+public class DateToSqlDateConverterTest {
 
     DateToSqlDateConverter converter = new DateToSqlDateConverter();
 
+    @Test
     public void testNullConversion() {
-        assertEquals(null,
+        Assert.assertEquals(null,
                 converter.convertToModel(null, java.sql.Date.class, null));
     }
 
+    @Test
     public void testValueConversion() {
         Date testDate = new Date(100, 0, 1);
         long time = testDate.getTime();
-        assertEquals(testDate, converter.convertToModel(
+        Assert.assertEquals(testDate, converter.convertToModel(
                 new java.sql.Date(time), java.sql.Date.class, Locale.ENGLISH));
     }
 }
diff --git a/server/tests/src/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java b/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java
index 047ed8a79f..047ed8a79f 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java
diff --git a/server/tests/src/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java
index 377998db1e..377998db1e 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java
diff --git a/server/tests/src/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java
index 06d407c9f4..48ebebdaff 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java
@@ -18,36 +18,42 @@ package com.vaadin.tests.data.converter;
 import java.math.BigDecimal;
 import java.util.Locale;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.util.converter.StringToBigDecimalConverter;
 
-public class StringToBigDecimalConverterTest extends TestCase {
+public class StringToBigDecimalConverterTest {
 
     StringToBigDecimalConverter converter = new StringToBigDecimalConverter();
 
+    @Test
     public void testNullConversion() {
-        assertEquals(null,
+        Assert.assertEquals(null,
                 converter.convertToModel(null, BigDecimal.class, null));
     }
 
+    @Test
     public void testEmptyStringConversion() {
-        assertEquals(null, converter.convertToModel("", BigDecimal.class, null));
+        Assert.assertEquals(null,
+                converter.convertToModel("", BigDecimal.class, null));
     }
 
+    @Test
     public void testValueParsing() {
         BigDecimal converted = converter.convertToModel("10", BigDecimal.class,
                 null);
         BigDecimal expected = new BigDecimal(10);
-        assertEquals(expected, converted);
+        Assert.assertEquals(expected, converted);
     }
 
+    @Test
     public void testValueFormatting() {
         BigDecimal bd = new BigDecimal(12.5);
         String expected = "12,5";
 
         String converted = converter.convertToPresentation(bd, String.class,
                 Locale.GERMAN);
-        assertEquals(expected, converted);
+        Assert.assertEquals(expected, converted);
     }
 }
diff --git a/server/tests/src/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java
index 057017790d..312595746d 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java
@@ -18,40 +18,47 @@ package com.vaadin.tests.data.converter;
 import java.math.BigInteger;
 import java.util.Locale;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.util.converter.StringToBigIntegerConverter;
 
-public class StringToBigIntegerConverterTest extends TestCase {
+public class StringToBigIntegerConverterTest {
 
     StringToBigIntegerConverter converter = new StringToBigIntegerConverter();
 
+    @Test
     public void testNullConversion() {
-        assertEquals("Null value was converted incorrectly", null,
+        Assert.assertEquals("Null value was converted incorrectly", null,
                 converter.convertToModel(null, BigInteger.class, null));
     }
 
+    @Test
     public void testEmptyStringConversion() {
-        assertEquals("Empty value was converted incorrectly", null,
+        Assert.assertEquals("Empty value was converted incorrectly", null,
                 converter.convertToModel("", BigInteger.class, null));
     }
 
+    @Test
     public void testValueParsing() {
         String bigInt = "1180591620717411303424"; // 2^70 > 2^63 - 1
         BigInteger converted = converter.convertToModel(bigInt,
                 BigInteger.class, null);
         BigInteger expected = new BigInteger(bigInt);
-        assertEquals("Value bigger than max long was converted incorrectly",
+        Assert.assertEquals(
+                "Value bigger than max long was converted incorrectly",
                 expected, converted);
     }
 
+    @Test
     public void testValueFormatting() {
         BigInteger bd = new BigInteger("1000");
         String expected = "1.000";
 
         String converted = converter.convertToPresentation(bd, String.class,
                 Locale.GERMAN);
-        assertEquals("Value with specific locale was converted incorrectly",
+        Assert.assertEquals(
+                "Value with specific locale was converted incorrectly",
                 expected, converted);
     }
 }
diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java
new file mode 100644
index 0000000000..16bb5b1a64
--- /dev/null
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java
@@ -0,0 +1,75 @@
+package com.vaadin.tests.data.converter;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.data.util.converter.StringToBooleanConverter;
+
+public class StringToBooleanConverterTest {
+
+    StringToBooleanConverter converter = new StringToBooleanConverter();
+    StringToBooleanConverter yesNoConverter = new StringToBooleanConverter(
+            "yes", "no");
+    StringToBooleanConverter localeConverter = new StringToBooleanConverter() {
+        @Override
+        public String getFalseString(Locale locale) {
+            return SimpleDateFormat.getDateInstance(SimpleDateFormat.LONG,
+                    locale).format(new Date(3000000000000L));
+        }
+
+        @Override
+        public String getTrueString(Locale locale) {
+            return SimpleDateFormat.getDateInstance(SimpleDateFormat.LONG,
+                    locale).format(new Date(2000000000000L));
+        }
+    };
+
+    @Test
+    public void testNullConversion() {
+        Assert.assertEquals(null,
+                converter.convertToModel(null, Boolean.class, null));
+    }
+
+    @Test
+    public void testEmptyStringConversion() {
+        Assert.assertEquals(null,
+                converter.convertToModel("", Boolean.class, null));
+    }
+
+    @Test
+    public void testValueConversion() {
+        Assert.assertTrue(converter.convertToModel("true", Boolean.class, null));
+        Assert.assertFalse(converter.convertToModel("false", Boolean.class,
+                null));
+    }
+
+    @Test
+    public void testYesNoValueConversion() {
+        Assert.assertTrue(yesNoConverter.convertToModel("yes", Boolean.class,
+                null));
+        Assert.assertFalse(yesNoConverter.convertToModel("no", Boolean.class,
+                null));
+
+        Assert.assertEquals("yes",
+                yesNoConverter.convertToPresentation(true, String.class, null));
+        Assert.assertEquals("no",
+                yesNoConverter.convertToPresentation(false, String.class, null));
+    }
+
+    @Test
+    public void testLocale() {
+        Assert.assertEquals("May 18, 2033", localeConverter
+                .convertToPresentation(true, String.class, Locale.US));
+        Assert.assertEquals("January 24, 2065", localeConverter
+                .convertToPresentation(false, String.class, Locale.US));
+
+        Assert.assertEquals("18. Mai 2033", localeConverter
+                .convertToPresentation(true, String.class, Locale.GERMANY));
+        Assert.assertEquals("24. Januar 2065", localeConverter
+                .convertToPresentation(false, String.class, Locale.GERMANY));
+    }
+}
diff --git a/server/tests/src/com/vaadin/tests/data/converter/StringToByteConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToByteConverterTest.java
index 3859d03cc3..2de72093d8 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToByteConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToByteConverterTest.java
@@ -1,55 +1,61 @@
 package com.vaadin.tests.data.converter;
 
-import junit.framework.TestCase;
-
 import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.util.converter.Converter.ConversionException;
 import com.vaadin.data.util.converter.ReverseConverter;
 import com.vaadin.data.util.converter.StringToByteConverter;
 
-public class StringToByteConverterTest extends TestCase {
+public class StringToByteConverterTest {
 
     StringToByteConverter converter = new StringToByteConverter();
     Converter<Byte, String> reverseConverter = new ReverseConverter<Byte, String>(
             converter);
 
+    @Test
     public void testNullConversion() {
-        assertEquals("Null value was converted incorrectly", null,
+        Assert.assertEquals("Null value was converted incorrectly", null,
                 converter.convertToModel(null, Byte.class, null));
     }
 
+    @Test
     public void testReverseNullConversion() {
-        assertEquals("Null value reversely was converted incorrectly", null,
-                reverseConverter.convertToModel(null, String.class, null));
+        Assert.assertEquals("Null value reversely was converted incorrectly",
+                null, reverseConverter.convertToModel(null, String.class, null));
     }
 
+    @Test
     public void testEmptyStringConversion() {
-        assertEquals("Empty value was converted incorrectly", null,
+        Assert.assertEquals("Empty value was converted incorrectly", null,
                 converter.convertToModel("", Byte.class, null));
     }
 
+    @Test
     public void testValueConversion() {
-        assertEquals("Byte value was converted incorrectly",
+        Assert.assertEquals("Byte value was converted incorrectly",
                 Byte.valueOf((byte) 10),
                 converter.convertToModel("10", Byte.class, null));
     }
 
+    @Test
     public void testReverseValueConversion() {
-        assertEquals("Byte value reversely was converted incorrectly",
+        Assert.assertEquals("Byte value reversely was converted incorrectly",
                 reverseConverter.convertToModel((byte) 10, String.class, null),
                 "10");
     }
 
+    @Test
     public void testExtremeByteValueConversion() {
         byte b = converter.convertToModel("127", Byte.class, null);
         Assert.assertEquals(Byte.MAX_VALUE, b);
         b = converter.convertToModel("-128", Byte.class, null);
-        assertEquals("Min byte value was converted incorrectly",
+        Assert.assertEquals("Min byte value was converted incorrectly",
                 Byte.MIN_VALUE, b);
     }
 
+    @Test
     public void testValueOutOfRange() {
         Double[] values = new Double[] { Byte.MAX_VALUE * 2.0,
                 Byte.MIN_VALUE * 2.0, Long.MAX_VALUE * 2.0,
@@ -64,6 +70,6 @@ public class StringToByteConverterTest extends TestCase {
             } catch (ConversionException expected) {
             }
         }
-        assertFalse("Accepted value outside range of int", accepted);
+        Assert.assertFalse("Accepted value outside range of int", accepted);
     }
 }
diff --git a/server/tests/src/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java
index 4f2dc1df81..4f2dc1df81 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java
diff --git a/server/tests/src/com/vaadin/tests/data/converter/StringToDateConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToDateConverterTest.java
index 16008d89c2..8bac8b535b 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToDateConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToDateConverterTest.java
@@ -3,24 +3,30 @@ package com.vaadin.tests.data.converter;
 import java.util.Date;
 import java.util.Locale;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.util.converter.StringToDateConverter;
 
-public class StringToDateConverterTest extends TestCase {
+public class StringToDateConverterTest {
 
     StringToDateConverter converter = new StringToDateConverter();
 
+    @Test
     public void testNullConversion() {
-        assertEquals(null, converter.convertToModel(null, Date.class, null));
+        Assert.assertEquals(null,
+                converter.convertToModel(null, Date.class, null));
     }
 
+    @Test
     public void testEmptyStringConversion() {
-        assertEquals(null, converter.convertToModel("", Date.class, null));
+        Assert.assertEquals(null,
+                converter.convertToModel("", Date.class, null));
     }
 
+    @Test
     public void testValueConversion() {
-        assertEquals(new Date(100, 0, 1), converter.convertToModel(
+        Assert.assertEquals(new Date(100, 0, 1), converter.convertToModel(
                 "Jan 1, 2000 12:00:00 AM", Date.class, Locale.ENGLISH));
     }
 }
diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java
new file mode 100644
index 0000000000..1c983d48f6
--- /dev/null
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java
@@ -0,0 +1,29 @@
+package com.vaadin.tests.data.converter;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.data.util.converter.StringToDoubleConverter;
+
+public class StringToDoubleConverterTest {
+
+    StringToDoubleConverter converter = new StringToDoubleConverter();
+
+    @Test
+    public void testNullConversion() {
+        Assert.assertEquals(null,
+                converter.convertToModel(null, Double.class, null));
+    }
+
+    @Test
+    public void testEmptyStringConversion() {
+        Assert.assertEquals(null,
+                converter.convertToModel("", Double.class, null));
+    }
+
+    @Test
+    public void testValueConversion() {
+        Double value = converter.convertToModel("10", Double.class, null);
+        Assert.assertEquals(10.0d, value, 0.01d);
+    }
+}
diff --git a/server/tests/src/com/vaadin/tests/data/converter/StringToEnumConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToEnumConverterTest.java
index 6660ecc9d5..6660ecc9d5 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToEnumConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToEnumConverterTest.java
diff --git a/server/tests/src/com/vaadin/tests/data/converter/StringToFloatConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToFloatConverterTest.java
index 86319e641c..b99ce313b4 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToFloatConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToFloatConverterTest.java
@@ -1,23 +1,29 @@
 package com.vaadin.tests.data.converter;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.util.converter.StringToFloatConverter;
 
-public class StringToFloatConverterTest extends TestCase {
+public class StringToFloatConverterTest {
 
     StringToFloatConverter converter = new StringToFloatConverter();
 
+    @Test
     public void testNullConversion() {
-        assertEquals(null, converter.convertToModel(null, Float.class, null));
+        Assert.assertEquals(null,
+                converter.convertToModel(null, Float.class, null));
     }
 
+    @Test
     public void testEmptyStringConversion() {
-        assertEquals(null, converter.convertToModel("", Float.class, null));
+        Assert.assertEquals(null,
+                converter.convertToModel("", Float.class, null));
     }
 
+    @Test
     public void testValueConversion() {
-        assertEquals(Float.valueOf(10),
+        Assert.assertEquals(Float.valueOf(10),
                 converter.convertToModel("10", Float.class, null));
     }
 }
diff --git a/server/tests/src/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java
index 0076f2c9d1..56826b77c0 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java
@@ -1,22 +1,28 @@
 package com.vaadin.tests.data.converter;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.util.converter.Converter.ConversionException;
 import com.vaadin.data.util.converter.StringToIntegerConverter;
 
-public class StringToIntegerConverterTest extends TestCase {
+public class StringToIntegerConverterTest {
 
     StringToIntegerConverter converter = new StringToIntegerConverter();
 
+    @Test
     public void testNullConversion() {
-        assertEquals(null, converter.convertToModel(null, Integer.class, null));
+        Assert.assertEquals(null,
+                converter.convertToModel(null, Integer.class, null));
     }
 
+    @Test
     public void testEmptyStringConversion() {
-        assertEquals(null, converter.convertToModel("", Integer.class, null));
+        Assert.assertEquals(null,
+                converter.convertToModel("", Integer.class, null));
     }
 
+    @Test
     public void testValueOutOfRange() {
         Double[] values = new Double[] { Integer.MAX_VALUE * 2.0,
                 Integer.MIN_VALUE * 2.0, Long.MAX_VALUE * 2.0,
@@ -31,11 +37,12 @@ public class StringToIntegerConverterTest extends TestCase {
             } catch (ConversionException expected) {
             }
         }
-        assertFalse("Accepted value outside range of int", accepted);
+        Assert.assertFalse("Accepted value outside range of int", accepted);
     }
 
+    @Test
     public void testValueConversion() {
-        assertEquals(Integer.valueOf(10),
+        Assert.assertEquals(Integer.valueOf(10),
                 converter.convertToModel("10", Integer.class, null));
     }
 }
diff --git a/server/tests/src/com/vaadin/tests/data/converter/StringToLongConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToLongConverterTest.java
index 989dbcbbf5..9ea0cea63c 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToLongConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToLongConverterTest.java
@@ -2,51 +2,59 @@ package com.vaadin.tests.data.converter;
 
 import java.util.Locale;
 
-import junit.framework.TestCase;
-
 import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.util.converter.ReverseConverter;
 import com.vaadin.data.util.converter.StringToLongConverter;
 
-public class StringToLongConverterTest extends TestCase {
+public class StringToLongConverterTest {
 
     StringToLongConverter converter = new StringToLongConverter();
     Converter<Long, String> reverseConverter = new ReverseConverter<Long, String>(
             converter);
 
+    @Test
     public void testNullConversion() {
-        assertEquals(null, converter.convertToModel(null, Long.class, null));
+        Assert.assertEquals(null,
+                converter.convertToModel(null, Long.class, null));
     }
 
+    @Test
     public void testReverseNullConversion() {
-        assertEquals(null,
+        Assert.assertEquals(null,
                 reverseConverter.convertToModel(null, String.class, null));
     }
 
+    @Test
     public void testEmptyStringConversion() {
-        assertEquals(null, converter.convertToModel("", Long.class, null));
+        Assert.assertEquals(null,
+                converter.convertToModel("", Long.class, null));
     }
 
+    @Test
     public void testValueConversion() {
-        assertEquals(Long.valueOf(10),
+        Assert.assertEquals(Long.valueOf(10),
                 converter.convertToModel("10", Long.class, null));
     }
 
+    @Test
     public void testReverseValueConversion() {
-        assertEquals(reverseConverter.convertToModel(10L, String.class, null),
-                "10");
+        Assert.assertEquals(
+                reverseConverter.convertToModel(10L, String.class, null), "10");
     }
 
+    @Test
     public void testExtremeLongValueConversion() {
         long l = converter.convertToModel("9223372036854775807", Long.class,
                 null);
         Assert.assertEquals(Long.MAX_VALUE, l);
         l = converter.convertToModel("-9223372036854775808", Long.class, null);
-        assertEquals(Long.MIN_VALUE, l);
+        Assert.assertEquals(Long.MIN_VALUE, l);
     }
 
+    @Test
     public void testExtremeReverseLongValueConversion() {
         String str = reverseConverter.convertToModel(Long.MAX_VALUE,
                 String.class, Locale.ENGLISH);
@@ -56,6 +64,7 @@ public class StringToLongConverterTest extends TestCase {
         Assert.assertEquals("-9,223,372,036,854,775,808", str);
     }
 
+    @Test
     public void testOutOfBoundsValueConversion() {
         // Long.MAX_VALUE+1 is converted to Long.MAX_VALUE
         long l = converter.convertToModel("9223372036854775808", Long.class,
@@ -63,7 +72,7 @@ public class StringToLongConverterTest extends TestCase {
         Assert.assertEquals(Long.MAX_VALUE, l);
         // Long.MIN_VALUE-1 is converted to Long.MIN_VALUE
         l = converter.convertToModel("-9223372036854775809", Long.class, null);
-        assertEquals(Long.MIN_VALUE, l);
+        Assert.assertEquals(Long.MIN_VALUE, l);
 
     }
 }
diff --git a/server/tests/src/com/vaadin/tests/data/converter/StringToShortConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToShortConverterTest.java
index ab255bce80..3faa65c863 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToShortConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToShortConverterTest.java
@@ -1,56 +1,62 @@
 package com.vaadin.tests.data.converter;
 
-import junit.framework.TestCase;
-
 import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.util.converter.Converter.ConversionException;
 import com.vaadin.data.util.converter.ReverseConverter;
 import com.vaadin.data.util.converter.StringToShortConverter;
 
-public class StringToShortConverterTest extends TestCase {
+public class StringToShortConverterTest {
 
     StringToShortConverter converter = new StringToShortConverter();
     Converter<Short, String> reverseConverter = new ReverseConverter<Short, String>(
             converter);
 
+    @Test
     public void testNullConversion() {
-        assertEquals("Null value was converted incorrectly", null,
+        Assert.assertEquals("Null value was converted incorrectly", null,
                 converter.convertToModel(null, Short.class, null));
     }
 
+    @Test
     public void testReverseNullConversion() {
-        assertEquals("Null value reversely was converted incorrectly", null,
-                reverseConverter.convertToModel(null, String.class, null));
+        Assert.assertEquals("Null value reversely was converted incorrectly",
+                null, reverseConverter.convertToModel(null, String.class, null));
     }
 
+    @Test
     public void testEmptyStringConversion() {
-        assertEquals("Empty value was converted incorrectly", null,
+        Assert.assertEquals("Empty value was converted incorrectly", null,
                 converter.convertToModel("", Short.class, null));
     }
 
+    @Test
     public void testValueConversion() {
-        assertEquals("Short value was converted incorrectly",
+        Assert.assertEquals("Short value was converted incorrectly",
                 Short.valueOf((short) 10),
                 converter.convertToModel("10", Short.class, null));
     }
 
+    @Test
     public void testReverseValueConversion() {
-        assertEquals(
+        Assert.assertEquals(
                 "Short value reversely was converted incorrectly",
                 reverseConverter.convertToModel((short) 10, String.class, null),
                 "10");
     }
 
+    @Test
     public void testExtremeShortValueConversion() {
         short b = converter.convertToModel("32767", Short.class, null);
         Assert.assertEquals(Short.MAX_VALUE, b);
         b = converter.convertToModel("-32768", Short.class, null);
-        assertEquals("Min short value was converted incorrectly",
+        Assert.assertEquals("Min short value was converted incorrectly",
                 Short.MIN_VALUE, b);
     }
 
+    @Test
     public void testValueOutOfRange() {
         Double[] values = new Double[] { Integer.MAX_VALUE * 2.0,
                 Integer.MIN_VALUE * 2.0, Long.MAX_VALUE * 2.0,
@@ -65,6 +71,6 @@ public class StringToShortConverterTest extends TestCase {
             } catch (ConversionException expected) {
             }
         }
-        assertFalse("Accepted value outside range of int", accepted);
+        Assert.assertFalse("Accepted value outside range of int", accepted);
     }
 }
diff --git a/server/tests/src/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java
index 36f120151b..abffae9c9e 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java
@@ -2,11 +2,12 @@ package com.vaadin.tests.data.validator;
 
 import java.math.BigDecimal;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.validator.BigDecimalRangeValidator;
 
-public class BigDecimalRangeValidatorTest extends TestCase {
+public class BigDecimalRangeValidatorTest {
 
     private BigDecimalRangeValidator cleanValidator = new BigDecimalRangeValidator(
             "no values", null, null);
@@ -17,39 +18,43 @@ public class BigDecimalRangeValidatorTest extends TestCase {
     private BigDecimalRangeValidator minMaxValidator = new BigDecimalRangeValidator(
             "no values", new BigDecimal(10.5), new BigDecimal(100.5));
 
+    @Test
     public void testNullValue() {
-        assertTrue("Didn't accept null", cleanValidator.isValid(null));
-        assertTrue("Didn't accept null", minValidator.isValid(null));
-        assertTrue("Didn't accept null", maxValidator.isValid(null));
-        assertTrue("Didn't accept null", minMaxValidator.isValid(null));
+        Assert.assertTrue("Didn't accept null", cleanValidator.isValid(null));
+        Assert.assertTrue("Didn't accept null", minValidator.isValid(null));
+        Assert.assertTrue("Didn't accept null", maxValidator.isValid(null));
+        Assert.assertTrue("Didn't accept null", minMaxValidator.isValid(null));
     }
 
+    @Test
     public void testMinValue() {
-        assertTrue("Validator without ranges didn't accept value",
+        Assert.assertTrue("Validator without ranges didn't accept value",
                 cleanValidator.isValid(new BigDecimal(-15.0)));
-        assertTrue("Didn't accept valid value",
+        Assert.assertTrue("Didn't accept valid value",
                 minValidator.isValid(new BigDecimal(10.1)));
-        assertFalse("Accepted too small value",
+        Assert.assertFalse("Accepted too small value",
                 minValidator.isValid(new BigDecimal(10.0)));
     }
 
+    @Test
     public void testMaxValue() {
-        assertTrue("Validator without ranges didn't accept value",
+        Assert.assertTrue("Validator without ranges didn't accept value",
                 cleanValidator.isValid(new BigDecimal(1120.0)));
-        assertTrue("Didn't accept valid value",
+        Assert.assertTrue("Didn't accept valid value",
                 maxValidator.isValid(new BigDecimal(15.0)));
-        assertFalse("Accepted too large value",
+        Assert.assertFalse("Accepted too large value",
                 maxValidator.isValid(new BigDecimal(100.6)));
     }
 
+    @Test
     public void testMinMaxValue() {
-        assertTrue("Didn't accept valid value",
+        Assert.assertTrue("Didn't accept valid value",
                 minMaxValidator.isValid(new BigDecimal(10.5)));
-        assertTrue("Didn't accept valid value",
+        Assert.assertTrue("Didn't accept valid value",
                 minMaxValidator.isValid(new BigDecimal(100.5)));
-        assertFalse("Accepted too small value",
+        Assert.assertFalse("Accepted too small value",
                 minMaxValidator.isValid(new BigDecimal(10.4)));
-        assertFalse("Accepted too large value",
+        Assert.assertFalse("Accepted too large value",
                 minMaxValidator.isValid(new BigDecimal(100.6)));
     }
 }
diff --git a/server/tests/src/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java
index 92fabbb02a..5f15a63f59 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java
@@ -2,11 +2,12 @@ package com.vaadin.tests.data.validator;
 
 import java.math.BigInteger;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.validator.BigIntegerRangeValidator;
 
-public class BigIntegerRangeValidatorTest extends TestCase {
+public class BigIntegerRangeValidatorTest {
 
     private BigIntegerRangeValidator cleanValidator = new BigIntegerRangeValidator(
             "no values", null, null);
@@ -17,39 +18,43 @@ public class BigIntegerRangeValidatorTest extends TestCase {
     private BigIntegerRangeValidator minMaxValidator = new BigIntegerRangeValidator(
             "no values", BigInteger.valueOf(10), BigInteger.valueOf(100));
 
+    @Test
     public void testNullValue() {
-        assertTrue("Didn't accept null", cleanValidator.isValid(null));
-        assertTrue("Didn't accept null", minValidator.isValid(null));
-        assertTrue("Didn't accept null", maxValidator.isValid(null));
-        assertTrue("Didn't accept null", minMaxValidator.isValid(null));
+        Assert.assertTrue("Didn't accept null", cleanValidator.isValid(null));
+        Assert.assertTrue("Didn't accept null", minValidator.isValid(null));
+        Assert.assertTrue("Didn't accept null", maxValidator.isValid(null));
+        Assert.assertTrue("Didn't accept null", minMaxValidator.isValid(null));
     }
 
+    @Test
     public void testMinValue() {
-        assertTrue("Validator without ranges didn't accept value",
+        Assert.assertTrue("Validator without ranges didn't accept value",
                 cleanValidator.isValid(BigInteger.valueOf(-15)));
-        assertTrue("Didn't accept valid value",
+        Assert.assertTrue("Didn't accept valid value",
                 minValidator.isValid(BigInteger.valueOf(15)));
-        assertFalse("Accepted too small value",
+        Assert.assertFalse("Accepted too small value",
                 minValidator.isValid(BigInteger.valueOf(9)));
     }
 
+    @Test
     public void testMaxValue() {
-        assertTrue("Validator without ranges didn't accept value",
+        Assert.assertTrue("Validator without ranges didn't accept value",
                 cleanValidator.isValid(BigInteger.valueOf(1120)));
-        assertTrue("Didn't accept valid value",
+        Assert.assertTrue("Didn't accept valid value",
                 maxValidator.isValid(BigInteger.valueOf(15)));
-        assertFalse("Accepted too large value",
+        Assert.assertFalse("Accepted too large value",
                 maxValidator.isValid(BigInteger.valueOf(120)));
     }
 
+    @Test
     public void testMinMaxValue() {
-        assertTrue("Didn't accept valid value",
+        Assert.assertTrue("Didn't accept valid value",
                 minMaxValidator.isValid(BigInteger.valueOf(15)));
-        assertTrue("Didn't accept valid value",
+        Assert.assertTrue("Didn't accept valid value",
                 minMaxValidator.isValid(BigInteger.valueOf(99)));
-        assertFalse("Accepted too small value",
+        Assert.assertFalse("Accepted too small value",
                 minMaxValidator.isValid(BigInteger.valueOf(9)));
-        assertFalse("Accepted too large value",
+        Assert.assertFalse("Accepted too large value",
                 minMaxValidator.isValid(BigInteger.valueOf(110)));
     }
 }
diff --git a/server/tests/src/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java
index 03f35fe1bb..203c7847e9 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java
@@ -1,10 +1,13 @@
 package com.vaadin.tests.data.validator;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
 
 import com.vaadin.data.validator.ByteRangeValidator;
 
-public class ByteRangeValidatorTest extends TestCase {
+public class ByteRangeValidatorTest {
 
     private ByteRangeValidator cleanValidator = new ByteRangeValidator(
             "no values", null, null);
@@ -15,6 +18,7 @@ public class ByteRangeValidatorTest extends TestCase {
     private ByteRangeValidator minMaxValidator = new ByteRangeValidator(
             "no values", (byte) 10, (byte) 100);
 
+    @Test
     public void testNullValue() {
         assertTrue("Didn't accept null", cleanValidator.isValid(null));
         assertTrue("Didn't accept null", minValidator.isValid(null));
@@ -22,6 +26,7 @@ public class ByteRangeValidatorTest extends TestCase {
         assertTrue("Didn't accept null", minMaxValidator.isValid(null));
     }
 
+    @Test
     public void testMinValue() {
         assertTrue("Validator without ranges didn't accept value",
                 cleanValidator.isValid((byte) -15));
@@ -29,6 +34,7 @@ public class ByteRangeValidatorTest extends TestCase {
         assertFalse("Accepted too small value", minValidator.isValid((byte) 9));
     }
 
+    @Test
     public void testMaxValue() {
         assertTrue("Validator without ranges didn't accept value",
                 cleanValidator.isValid((byte) 112));
@@ -37,6 +43,7 @@ public class ByteRangeValidatorTest extends TestCase {
                 maxValidator.isValid((byte) 120));
     }
 
+    @Test
     public void testMinMaxValue() {
         assertTrue("Didn't accept valid value",
                 minMaxValidator.isValid((byte) 15));
diff --git a/server/tests/src/com/vaadin/tests/data/validator/CompositeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java
index 8199419b67..12b84e129d 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/CompositeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java
@@ -1,6 +1,12 @@
 package com.vaadin.tests.data.validator;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.junit.Before;
+import org.junit.Test;
 
 import com.vaadin.data.Validator;
 import com.vaadin.data.validator.CompositeValidator;
@@ -8,7 +14,7 @@ import com.vaadin.data.validator.CompositeValidator.CombinationMode;
 import com.vaadin.data.validator.EmailValidator;
 import com.vaadin.data.validator.RegexpValidator;
 
-public class CompositeValidatorTest extends TestCase {
+public class CompositeValidatorTest {
 
     CompositeValidator and = new CompositeValidator(CombinationMode.AND,
             "One validator not valid");
@@ -18,10 +24,8 @@ public class CompositeValidatorTest extends TestCase {
     RegexpValidator regex = new RegexpValidator("@mail.com", false,
             "Partial match validator error");
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
+    @Before
+    public void setUp() {
         and.addValidator(email);
         and.addValidator(regex);
 
@@ -29,6 +33,7 @@ public class CompositeValidatorTest extends TestCase {
         or.addValidator(regex);
     }
 
+    @Test
     public void testCorrectValue() {
         String testString = "user@mail.com";
         assertTrue(email.isValid(testString));
@@ -49,6 +54,7 @@ public class CompositeValidatorTest extends TestCase {
         }
     }
 
+    @Test
     public void testCorrectRegex() {
 
         String testString = "@mail.com";
@@ -71,6 +77,7 @@ public class CompositeValidatorTest extends TestCase {
         }
     }
 
+    @Test
     public void testCorrectEmail() {
 
         String testString = "user@gmail.com";
@@ -91,6 +98,7 @@ public class CompositeValidatorTest extends TestCase {
         }
     }
 
+    @Test
     public void testBothFaulty() {
 
         String testString = "gmail.com";
diff --git a/server/tests/src/com/vaadin/tests/data/validator/DateRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/DateRangeValidatorTest.java
index 7bb3e20160..4beea35905 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/DateRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/DateRangeValidatorTest.java
@@ -1,16 +1,20 @@
 package com.vaadin.tests.data.validator;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.Locale;
 import java.util.TimeZone;
 
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
 
 import com.vaadin.data.validator.DateRangeValidator;
 import com.vaadin.shared.ui.datefield.Resolution;
 
-public class DateRangeValidatorTest extends TestCase {
+public class DateRangeValidatorTest {
     Calendar startDate = new GregorianCalendar(TimeZone.getTimeZone("GMT"),
             Locale.ENGLISH);
     Calendar endDate = new GregorianCalendar(TimeZone.getTimeZone("GMT"),
@@ -21,9 +25,8 @@ public class DateRangeValidatorTest extends TestCase {
     private DateRangeValidator maxValidator;
     private DateRangeValidator minMaxValidator;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
         startDate.set(2000, Calendar.JANUARY, 1, 12, 0, 0);
         endDate.set(2000, Calendar.FEBRUARY, 20, 12, 0, 0);
 
@@ -37,6 +40,7 @@ public class DateRangeValidatorTest extends TestCase {
                 startDate.getTime(), endDate.getTime(), Resolution.DAY);
     }
 
+    @Test
     public void testNullValue() {
         assertTrue("Didn't accept null", cleanValidator.isValid(null));
         assertTrue("Didn't accept null", minValidator.isValid(null));
@@ -44,6 +48,7 @@ public class DateRangeValidatorTest extends TestCase {
         assertTrue("Didn't accept null", minMaxValidator.isValid(null));
     }
 
+    @Test
     public void testMinValue() {
         Calendar cal = new GregorianCalendar(TimeZone.getTimeZone("GMT"),
                 Locale.ENGLISH);
@@ -61,6 +66,7 @@ public class DateRangeValidatorTest extends TestCase {
                 minValidator.isValid(cal.getTime()));
     }
 
+    @Test
     public void testMaxValue() {
         Calendar cal = new GregorianCalendar(TimeZone.getTimeZone("GMT"),
                 Locale.ENGLISH);
@@ -77,6 +83,7 @@ public class DateRangeValidatorTest extends TestCase {
                 maxValidator.isValid(cal.getTime()));
     }
 
+    @Test
     public void testMinMaxValue() {
         Calendar cal = new GregorianCalendar(TimeZone.getTimeZone("GMT"),
                 Locale.ENGLISH);
diff --git a/server/tests/src/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java
index b096937bd2..81fb9b0ac6 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java
@@ -1,10 +1,13 @@
 package com.vaadin.tests.data.validator;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
 
 import com.vaadin.data.validator.DoubleRangeValidator;
 
-public class DoubleRangeValidatorTest extends TestCase {
+public class DoubleRangeValidatorTest {
 
     private DoubleRangeValidator cleanValidator = new DoubleRangeValidator(
             "no values", null, null);
@@ -15,6 +18,7 @@ public class DoubleRangeValidatorTest extends TestCase {
     private DoubleRangeValidator minMaxValidator = new DoubleRangeValidator(
             "no values", 10.5, 100.5);
 
+    @Test
     public void testNullValue() {
         assertTrue("Didn't accept null", cleanValidator.isValid(null));
         assertTrue("Didn't accept null", minValidator.isValid(null));
@@ -22,6 +26,7 @@ public class DoubleRangeValidatorTest extends TestCase {
         assertTrue("Didn't accept null", minMaxValidator.isValid(null));
     }
 
+    @Test
     public void testMinValue() {
         assertTrue("Validator without ranges didn't accept value",
                 cleanValidator.isValid(-15.0));
@@ -29,6 +34,7 @@ public class DoubleRangeValidatorTest extends TestCase {
         assertFalse("Accepted too small value", minValidator.isValid(10.0));
     }
 
+    @Test
     public void testMaxValue() {
         assertTrue("Validator without ranges didn't accept value",
                 cleanValidator.isValid(1120.0));
@@ -36,6 +42,7 @@ public class DoubleRangeValidatorTest extends TestCase {
         assertFalse("Accepted too large value", maxValidator.isValid(100.6));
     }
 
+    @Test
     public void testMinMaxValue() {
         assertTrue("Didn't accept valid value", minMaxValidator.isValid(10.5));
         assertTrue("Didn't accept valid value", minMaxValidator.isValid(100.5));
diff --git a/server/tests/src/com/vaadin/tests/data/validator/EmailValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/EmailValidatorTest.java
index 19fe9e6580..97d304d7df 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/EmailValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/EmailValidatorTest.java
@@ -1,26 +1,31 @@
 package com.vaadin.tests.data.validator;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.validator.EmailValidator;
 
-public class EmailValidatorTest extends TestCase {
+public class EmailValidatorTest {
 
     private EmailValidator validator = new EmailValidator("Error");
 
+    @Test
     public void testEmailValidatorWithNull() {
-        assertTrue(validator.isValid(null));
+        Assert.assertTrue(validator.isValid(null));
     }
 
+    @Test
     public void testEmailValidatorWithEmptyString() {
-        assertTrue(validator.isValid(""));
+        Assert.assertTrue(validator.isValid(""));
     }
 
+    @Test
     public void testEmailValidatorWithFaultyString() {
-        assertFalse(validator.isValid("not.an.email"));
+        Assert.assertFalse(validator.isValid("not.an.email"));
     }
 
+    @Test
     public void testEmailValidatorWithOkEmail() {
-        assertTrue(validator.isValid("my.name@email.com"));
+        Assert.assertTrue(validator.isValid("my.name@email.com"));
     }
 }
diff --git a/server/tests/src/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java
index c5a07be43f..db4b73fd1b 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java
@@ -1,10 +1,13 @@
 package com.vaadin.tests.data.validator;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
 
 import com.vaadin.data.validator.FloatRangeValidator;
 
-public class FloatRangeValidatorTest extends TestCase {
+public class FloatRangeValidatorTest {
 
     private FloatRangeValidator cleanValidator = new FloatRangeValidator(
             "no values", null, null);
@@ -15,6 +18,7 @@ public class FloatRangeValidatorTest extends TestCase {
     private FloatRangeValidator minMaxValidator = new FloatRangeValidator(
             "no values", 10.5f, 100.5f);
 
+    @Test
     public void testNullValue() {
         assertTrue("Didn't accept null", cleanValidator.isValid(null));
         assertTrue("Didn't accept null", minValidator.isValid(null));
@@ -22,6 +26,7 @@ public class FloatRangeValidatorTest extends TestCase {
         assertTrue("Didn't accept null", minMaxValidator.isValid(null));
     }
 
+    @Test
     public void testMinValue() {
         assertTrue("Validator without ranges didn't accept value",
                 cleanValidator.isValid(-15.0f));
@@ -29,6 +34,7 @@ public class FloatRangeValidatorTest extends TestCase {
         assertFalse("Accepted too small value", minValidator.isValid(10.0f));
     }
 
+    @Test
     public void testMaxValue() {
         assertTrue("Validator without ranges didn't accept value",
                 cleanValidator.isValid(1120.0f));
@@ -36,6 +42,7 @@ public class FloatRangeValidatorTest extends TestCase {
         assertFalse("Accepted too large value", maxValidator.isValid(100.6f));
     }
 
+    @Test
     public void testMinMaxValue() {
         assertTrue("Didn't accept valid value", minMaxValidator.isValid(10.5f));
         assertTrue("Didn't accept valid value", minMaxValidator.isValid(100.5f));
diff --git a/server/tests/src/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java
index 5e64d0107e..8a572cb327 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java
@@ -1,10 +1,13 @@
 package com.vaadin.tests.data.validator;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
 
 import com.vaadin.data.validator.IntegerRangeValidator;
 
-public class IntegerRangeValidatorTest extends TestCase {
+public class IntegerRangeValidatorTest {
 
     private IntegerRangeValidator cleanValidator = new IntegerRangeValidator(
             "no values", null, null);
@@ -15,6 +18,7 @@ public class IntegerRangeValidatorTest extends TestCase {
     private IntegerRangeValidator minMaxValidator = new IntegerRangeValidator(
             "no values", 10, 100);
 
+    @Test
     public void testNullValue() {
         assertTrue("Didn't accept null", cleanValidator.isValid(null));
         assertTrue("Didn't accept null", minValidator.isValid(null));
@@ -22,6 +26,7 @@ public class IntegerRangeValidatorTest extends TestCase {
         assertTrue("Didn't accept null", minMaxValidator.isValid(null));
     }
 
+    @Test
     public void testMinValue() {
         assertTrue("Validator without ranges didn't accept value",
                 cleanValidator.isValid(-15));
@@ -29,6 +34,7 @@ public class IntegerRangeValidatorTest extends TestCase {
         assertFalse("Accepted too small value", minValidator.isValid(9));
     }
 
+    @Test
     public void testMaxValue() {
         assertTrue("Validator without ranges didn't accept value",
                 cleanValidator.isValid(1120));
@@ -36,6 +42,7 @@ public class IntegerRangeValidatorTest extends TestCase {
         assertFalse("Accepted too large value", maxValidator.isValid(120));
     }
 
+    @Test
     public void testMinMaxValue() {
         assertTrue("Didn't accept valid value", minMaxValidator.isValid(15));
         assertTrue("Didn't accept valid value", minMaxValidator.isValid(99));
diff --git a/server/tests/src/com/vaadin/tests/data/validator/LongRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/LongRangeValidatorTest.java
index 440e9c3fd2..436e3224a4 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/LongRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/LongRangeValidatorTest.java
@@ -1,10 +1,13 @@
 package com.vaadin.tests.data.validator;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
 
 import com.vaadin.data.validator.LongRangeValidator;
 
-public class LongRangeValidatorTest extends TestCase {
+public class LongRangeValidatorTest {
 
     private LongRangeValidator cleanValidator = new LongRangeValidator(
             "no values", null, null);
@@ -15,6 +18,7 @@ public class LongRangeValidatorTest extends TestCase {
     private LongRangeValidator minMaxValidator = new LongRangeValidator(
             "no values", 10l, 100l);
 
+    @Test
     public void testNullValue() {
         assertTrue("Didn't accept null", cleanValidator.isValid(null));
         assertTrue("Didn't accept null", minValidator.isValid(null));
@@ -22,6 +26,7 @@ public class LongRangeValidatorTest extends TestCase {
         assertTrue("Didn't accept null", minMaxValidator.isValid(null));
     }
 
+    @Test
     public void testMinValue() {
         assertTrue("Validator without ranges didn't accept value",
                 cleanValidator.isValid(-15l));
@@ -29,6 +34,7 @@ public class LongRangeValidatorTest extends TestCase {
         assertFalse("Accepted too small value", minValidator.isValid(9l));
     }
 
+    @Test
     public void testMaxValue() {
         assertTrue("Validator without ranges didn't accept value",
                 cleanValidator.isValid(1120l));
@@ -36,6 +42,7 @@ public class LongRangeValidatorTest extends TestCase {
         assertFalse("Accepted too large value", maxValidator.isValid(120l));
     }
 
+    @Test
     public void testMinMaxValue() {
         assertTrue("Didn't accept valid value", minMaxValidator.isValid(15l));
         assertTrue("Didn't accept valid value", minMaxValidator.isValid(99l));
diff --git a/server/tests/src/com/vaadin/tests/data/validator/NullValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/NullValidatorTest.java
index 1e08ea7e2c..336df617d1 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/NullValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/NullValidatorTest.java
@@ -1,15 +1,19 @@
 package com.vaadin.tests.data.validator;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
 
 import com.vaadin.data.Validator;
 import com.vaadin.data.validator.NullValidator;
 
-public class NullValidatorTest extends TestCase {
+public class NullValidatorTest {
 
     NullValidator notNull = new NullValidator("Null not accepted", false);
     NullValidator onlyNull = new NullValidator("Only null accepted", true);
 
+    @Test
     public void testNullValue() {
         try {
             notNull.validate(null);
@@ -24,6 +28,7 @@ public class NullValidatorTest extends TestCase {
         }
     }
 
+    @Test
     public void testNonNullValue() {
         try {
             onlyNull.validate("Not a null value");
diff --git a/server/tests/src/com/vaadin/tests/data/validator/RegexpValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/RegexpValidatorTest.java
index 2a62d23059..7776d89293 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/RegexpValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/RegexpValidatorTest.java
@@ -1,40 +1,49 @@
 package com.vaadin.tests.data.validator;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
 
 import com.vaadin.data.validator.RegexpValidator;
 
-public class RegexpValidatorTest extends TestCase {
+public class RegexpValidatorTest {
 
     private RegexpValidator completeValidator = new RegexpValidator("pattern",
             true, "Complete match validator error");
     private RegexpValidator partialValidator = new RegexpValidator("pattern",
             false, "Partial match validator error");
 
+    @Test
     public void testRegexpValidatorWithNull() {
         assertTrue(completeValidator.isValid(null));
         assertTrue(partialValidator.isValid(null));
     }
 
+    @Test
     public void testRegexpValidatorWithEmptyString() {
         assertTrue(completeValidator.isValid(""));
         assertTrue(partialValidator.isValid(""));
     }
 
+    @Test
     public void testCompleteRegexpValidatorWithFaultyString() {
         assertFalse(completeValidator.isValid("mismatch"));
         assertFalse(completeValidator.isValid("pattern2"));
         assertFalse(completeValidator.isValid("1pattern"));
     }
 
+    @Test
     public void testCompleteRegexpValidatorWithOkString() {
         assertTrue(completeValidator.isValid("pattern"));
     }
 
+    @Test
     public void testPartialRegexpValidatorWithFaultyString() {
         assertFalse(partialValidator.isValid("mismatch"));
     }
 
+    @Test
     public void testPartialRegexpValidatorWithOkString() {
         assertTrue(partialValidator.isValid("pattern"));
         assertTrue(partialValidator.isValid("1pattern"));
diff --git a/server/tests/src/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java
index 69d22eb91e..d3534ebe97 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java
@@ -1,10 +1,13 @@
 package com.vaadin.tests.data.validator;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
 
 import com.vaadin.data.validator.ShortRangeValidator;
 
-public class ShortRangeValidatorTest extends TestCase {
+public class ShortRangeValidatorTest {
 
     private ShortRangeValidator cleanValidator = new ShortRangeValidator(
             "no values", null, null);
@@ -15,6 +18,7 @@ public class ShortRangeValidatorTest extends TestCase {
     private ShortRangeValidator minMaxValidator = new ShortRangeValidator(
             "no values", (short) 10, (short) 100);
 
+    @Test
     public void testNullValue() {
         assertTrue("Didn't accept null", cleanValidator.isValid(null));
         assertTrue("Didn't accept null", minValidator.isValid(null));
@@ -22,6 +26,7 @@ public class ShortRangeValidatorTest extends TestCase {
         assertTrue("Didn't accept null", minMaxValidator.isValid(null));
     }
 
+    @Test
     public void testMinValue() {
         assertTrue("Validator without ranges didn't accept value",
                 cleanValidator.isValid((short) -15));
@@ -30,6 +35,7 @@ public class ShortRangeValidatorTest extends TestCase {
         assertFalse("Accepted too small value", minValidator.isValid((short) 9));
     }
 
+    @Test
     public void testMaxValue() {
         assertTrue("Validator without ranges didn't accept value",
                 cleanValidator.isValid((short) 1120));
@@ -39,6 +45,7 @@ public class ShortRangeValidatorTest extends TestCase {
                 maxValidator.isValid((short) 120));
     }
 
+    @Test
     public void testMinMaxValue() {
         assertTrue("Didn't accept valid value",
                 minMaxValidator.isValid((short) 15));
diff --git a/server/tests/src/com/vaadin/tests/data/validator/StringLengthValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/StringLengthValidatorTest.java
index 5f12367f09..de925f479f 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/StringLengthValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/StringLengthValidatorTest.java
@@ -1,10 +1,13 @@
 package com.vaadin.tests.data.validator;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
 
 import com.vaadin.data.validator.StringLengthValidator;
 
-public class StringLengthValidatorTest extends TestCase {
+public class StringLengthValidatorTest {
 
     private StringLengthValidator validator = new StringLengthValidator("Error");
     private StringLengthValidator validatorNoNull = new StringLengthValidator(
@@ -14,15 +17,18 @@ public class StringLengthValidatorTest extends TestCase {
     private StringLengthValidator validatorMaxValue = new StringLengthValidator(
             "Error", null, 15, true);
 
+    @Test
     public void testValidatorWithNull() {
         assertTrue("Didn't accept null", validator.isValid(null));
         assertTrue("Didn't accept null", validatorMinValue.isValid(null));
     }
 
+    @Test
     public void testValidatorNotAcceptingNull() {
         assertFalse("Accepted null", validatorNoNull.isValid(null));
     }
 
+    @Test
     public void testEmptyString() {
         assertTrue("Didn't accept empty String", validator.isValid(""));
         assertTrue("Didn't accept empty String", validatorMaxValue.isValid(""));
@@ -32,6 +38,7 @@ public class StringLengthValidatorTest extends TestCase {
                 validatorMinValue.isValid(""));
     }
 
+    @Test
     public void testTooLongString() {
         assertFalse("Too long string was accepted",
                 validatorNoNull.isValid("This string is too long"));
@@ -39,6 +46,7 @@ public class StringLengthValidatorTest extends TestCase {
                 validatorMaxValue.isValid("This string is too long"));
     }
 
+    @Test
     public void testNoUpperBound() {
         assertTrue(
                 "String not accepted even though no upper bound",
@@ -46,11 +54,13 @@ public class StringLengthValidatorTest extends TestCase {
                         .isValid("This is a really long string to test that no upper bound exists"));
     }
 
+    @Test
     public void testNoLowerBound() {
         assertTrue("Didn't accept short string", validatorMaxValue.isValid(""));
         assertTrue("Didn't accept short string", validatorMaxValue.isValid("1"));
     }
 
+    @Test
     public void testStringLengthValidatorWithOkStringLength() {
         assertTrue("Didn't accept string of correct length",
                 validatorNoNull.isValid("OK!"));
@@ -58,6 +68,7 @@ public class StringLengthValidatorTest extends TestCase {
                 validatorMaxValue.isValid("OK!"));
     }
 
+    @Test
     public void testTooShortStringLength() {
         assertFalse("Accepted a string that was too short.",
                 validatorMinValue.isValid("shot"));
diff --git a/server/tests/src/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.java b/server/src/test/java/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.java
index 175a03cd78..175a03cd78 100644
--- a/server/tests/src/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.java
diff --git a/server/tests/src/com/vaadin/tests/design/ComponentFactoryTest.java b/server/src/test/java/com/vaadin/tests/design/ComponentFactoryTest.java
index 472c079e42..472c079e42 100644
--- a/server/tests/src/com/vaadin/tests/design/ComponentFactoryTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/ComponentFactoryTest.java
diff --git a/server/tests/src/com/vaadin/tests/design/ComponentMapperTest.java b/server/src/test/java/com/vaadin/tests/design/ComponentMapperTest.java
index c6e8c15109..c6e8c15109 100644
--- a/server/tests/src/com/vaadin/tests/design/ComponentMapperTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/ComponentMapperTest.java
diff --git a/server/tests/src/com/vaadin/tests/design/DeclarativeTestBase.java b/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBase.java
index 7e8b5c7767..7e8b5c7767 100644
--- a/server/tests/src/com/vaadin/tests/design/DeclarativeTestBase.java
+++ b/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBase.java
diff --git a/server/tests/src/com/vaadin/tests/design/DeclarativeTestBaseBase.java b/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBaseBase.java
index a7ff7174b2..a7ff7174b2 100644
--- a/server/tests/src/com/vaadin/tests/design/DeclarativeTestBaseBase.java
+++ b/server/src/test/java/com/vaadin/tests/design/DeclarativeTestBaseBase.java
diff --git a/server/tests/src/com/vaadin/tests/design/DesignContextLocalIdTest.java b/server/src/test/java/com/vaadin/tests/design/DesignContextLocalIdTest.java
index f8fb1249b9..d488b9fc08 100644
--- a/server/tests/src/com/vaadin/tests/design/DesignContextLocalIdTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/DesignContextLocalIdTest.java
@@ -17,7 +17,6 @@ package com.vaadin.tests.design;
 
 import static org.junit.Assert.assertEquals;
 
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 
 import org.jsoup.nodes.Element;
@@ -53,24 +52,24 @@ public class DesignContextLocalIdTest {
 
     @Test
     public void testSetLocalId() throws FileNotFoundException {
-        DesignContext ctx = Design.read(new FileInputStream(
-                "server/tests/src/com/vaadin/tests/design/local-ids.html"),
+        DesignContext ctx = Design.read(
+                getClass().getResourceAsStream("local-ids.html"),
                 new VerticalLayout());
         TextField tf = (TextField) ctx.getComponentByLocalId("foo");
         Button b = (Button) ctx.getComponentByLocalId("bar");
         // A duplicate id should be handled by removing the id from the old
         // component.
         ctx.setComponentLocalId(b, "foo");
-        assertEquals("Found the wrong component by local id.", ctx
-                .getComponentByLocalId("foo").getClass(), Button.class);
+        assertEquals("Found the wrong component by local id.",
+                ctx.getComponentByLocalId("foo").getClass(), Button.class);
         assertEquals("Found the wrong component by local id.",
                 ctx.getComponentByLocalId("bar"), null);
         // Set an id also for the text field.
         ctx.setComponentLocalId(tf, "bar");
-        assertEquals("Found the wrong component by local id.", ctx
-                .getComponentByLocalId("foo").getClass(), Button.class);
-        assertEquals("Found the wrong component by local id.", ctx
-                .getComponentByLocalId("bar").getClass(), TextField.class);
+        assertEquals("Found the wrong component by local id.",
+                ctx.getComponentByLocalId("foo").getClass(), Button.class);
+        assertEquals("Found the wrong component by local id.",
+                ctx.getComponentByLocalId("bar").getClass(), TextField.class);
     }
 
     @Test
@@ -99,9 +98,11 @@ public class DesignContextLocalIdTest {
         for (ComponentContainer ctr : ctrs) {
             ctr.addComponent(b);
             Element e = ctx.createElement(ctr);
-            assertEquals("Unexpected child local id for "
-                    + ctr.getClass().getSimpleName(), "button-id", e
-                    .getElementsByTag("vaadin-button").first().attr("_id"));
+            assertEquals(
+                    "Unexpected child local id for "
+                            + ctr.getClass().getSimpleName(),
+                    "button-id",
+                    e.getElementsByTag("vaadin-button").first().attr("_id"));
         }
 
         SingleComponentContainer[] sctrs = { new Window(), new Panel() };
@@ -109,9 +110,11 @@ public class DesignContextLocalIdTest {
         for (SingleComponentContainer ctr : sctrs) {
             ctr.setContent(b);
             Element e = ctx.createElement(ctr);
-            assertEquals("Unexpected child local id for "
-                    + ctr.getClass().getSimpleName(), "button-id", e
-                    .getElementsByTag("vaadin-button").first().attr("_id"));
+            assertEquals(
+                    "Unexpected child local id for "
+                            + ctr.getClass().getSimpleName(),
+                    "button-id",
+                    e.getElementsByTag("vaadin-button").first().attr("_id"));
         }
     }
 
diff --git a/server/tests/src/com/vaadin/tests/design/DesignFormatterTest.java b/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.java
index e2a91000c1..e62d5c17c8 100644
--- a/server/tests/src/com/vaadin/tests/design/DesignFormatterTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.java
@@ -280,7 +280,7 @@ public class DesignFormatterTest {
         String themePath = "icons/icon.png";
         String fontAwesomeUrl = "fonticon://FontAwesome/f0f9";
         String someOtherFontUrl = "fonticon://SomeOther/F0F9";
-        String fileSystemPath = "c:\\app\\resources\\icon.png";
+        String fileSystemPath = "c:/app/resources/icon.png";
 
         assertEquals(httpUrl, formatter.format(new ExternalResource(httpUrl)));
         assertEquals(httpsUrl, formatter.format(new ExternalResource(httpsUrl)));
diff --git a/server/tests/src/com/vaadin/tests/design/DesignReadInConstructor.java b/server/src/test/java/com/vaadin/tests/design/DesignReadInConstructor.java
index 6eccaf6a2c..6eccaf6a2c 100644
--- a/server/tests/src/com/vaadin/tests/design/DesignReadInConstructor.java
+++ b/server/src/test/java/com/vaadin/tests/design/DesignReadInConstructor.java
diff --git a/server/tests/src/com/vaadin/tests/design/DesignReadInConstructorTest.java b/server/src/test/java/com/vaadin/tests/design/DesignReadInConstructorTest.java
index 539595762d..539595762d 100644
--- a/server/tests/src/com/vaadin/tests/design/DesignReadInConstructorTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/DesignReadInConstructorTest.java
diff --git a/server/tests/src/com/vaadin/tests/design/DesignTest.java b/server/src/test/java/com/vaadin/tests/design/DesignTest.java
index a5ccef0d2c..cf19aecb87 100644
--- a/server/tests/src/com/vaadin/tests/design/DesignTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/DesignTest.java
@@ -17,7 +17,6 @@ package com.vaadin.tests.design;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Iterator;
@@ -41,24 +40,23 @@ public class DesignTest {
 
     @Test
     public void readStream() throws FileNotFoundException {
-        Component root = Design
-                .read(new FileInputStream(
-                        "server/tests/src/com/vaadin/tests/design/verticallayout-two-children.html"));
+        Component root = Design.read(getClass()
+                .getResourceAsStream("verticallayout-two-children.html"));
         VerticalLayout rootLayout = (VerticalLayout) root;
         Assert.assertEquals(VerticalLayout.class, root.getClass());
 
         Assert.assertEquals(2, rootLayout.getComponentCount());
-        Assert.assertEquals(TextField.class, rootLayout.getComponent(0)
-                .getClass());
-        Assert.assertEquals(Button.class, rootLayout.getComponent(1).getClass());
+        Assert.assertEquals(TextField.class,
+                rootLayout.getComponent(0).getClass());
+        Assert.assertEquals(Button.class,
+                rootLayout.getComponent(1).getClass());
     }
 
     @Test(expected = DesignException.class)
     @Ignore("Feature needs to be fixed")
     public void readWithIncorrectRoot() throws FileNotFoundException {
         Design.read(
-                new FileInputStream(
-                        "server/tests/src/com/vaadin/tests/design/verticallayout-one-child.html"),
+                getClass().getResourceAsStream("verticallayout-one-child.html"),
                 new Panel());
     }
 
@@ -69,8 +67,7 @@ public class DesignTest {
     @Test
     public void readWithSubClassRoot() throws FileNotFoundException {
         Design.read(
-                new FileInputStream(
-                        "server/tests/src/com/vaadin/tests/design/verticallayout-one-child.html"),
+                getClass().getResourceAsStream("verticallayout-one-child.html"),
                 new MyVerticalLayout());
     }
 
@@ -80,37 +77,33 @@ public class DesignTest {
                 new Button("Cancel"));
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         Design.write(root, baos);
-        Component newRoot = Design.read(new ByteArrayInputStream(baos
-                .toByteArray()));
+        Component newRoot = Design
+                .read(new ByteArrayInputStream(baos.toByteArray()));
 
         assertHierarchyEquals(root, newRoot);
     }
 
     @Test
     public void writeDesignContextToStream() throws IOException {
-        DesignContext dc = Design
-                .read(new FileInputStream(
-                        "server/tests/src/com/vaadin/tests/design/verticallayout-two-children.html"),
-                        null);
+        DesignContext dc = Design.read(getClass()
+                .getResourceAsStream("verticallayout-two-children.html"), null);
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         Design.write(dc, baos);
-        Component newRoot = Design.read(new ByteArrayInputStream(baos
-                .toByteArray()));
+        Component newRoot = Design
+                .read(new ByteArrayInputStream(baos.toByteArray()));
 
         assertHierarchyEquals(dc.getRootComponent(), newRoot);
     }
 
     @Test(expected = DesignException.class)
     public void testDuplicateIds() throws FileNotFoundException {
-        Design.read(new FileInputStream(
-                "server/tests/src/com/vaadin/tests/design/duplicate-ids.html"));
+        Design.read(getClass().getResourceAsStream("duplicate-ids.html"));
     }
 
     @Test(expected = DesignException.class)
     public void testDuplicateLocalIds() throws FileNotFoundException {
-        Design.read(new FileInputStream(
-                "server/tests/src/com/vaadin/tests/design/duplicate-local-ids.html"));
+        Design.read(getClass().getResourceAsStream("duplicate-local-ids.html"));
     }
 
     private void assertHierarchyEquals(Component expected, Component actual) {
diff --git a/server/tests/src/com/vaadin/tests/design/EmbeddedsTest.java b/server/src/test/java/com/vaadin/tests/design/EmbeddedsTest.java
index 4c9e323948..4c9e323948 100644
--- a/server/tests/src/com/vaadin/tests/design/EmbeddedsTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/EmbeddedsTest.java
diff --git a/server/tests/src/com/vaadin/tests/design/FieldNameWhichConflictsWithGettersTest.java b/server/src/test/java/com/vaadin/tests/design/FieldNameWhichConflictsWithGettersTest.java
index 8c8d7b78b1..8c8d7b78b1 100644
--- a/server/tests/src/com/vaadin/tests/design/FieldNameWhichConflictsWithGettersTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/FieldNameWhichConflictsWithGettersTest.java
diff --git a/server/tests/src/com/vaadin/tests/design/InvalidLayoutTemplate.java b/server/src/test/java/com/vaadin/tests/design/InvalidLayoutTemplate.java
index 8a2dec5a35..8a2dec5a35 100644
--- a/server/tests/src/com/vaadin/tests/design/InvalidLayoutTemplate.java
+++ b/server/src/test/java/com/vaadin/tests/design/InvalidLayoutTemplate.java
diff --git a/server/tests/src/com/vaadin/tests/design/InvalidTagNames.java b/server/src/test/java/com/vaadin/tests/design/InvalidTagNamesTest.java
index 9f405f4e56..1b5bfcca4e 100644
--- a/server/tests/src/com/vaadin/tests/design/InvalidTagNames.java
+++ b/server/src/test/java/com/vaadin/tests/design/InvalidTagNamesTest.java
@@ -26,7 +26,7 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.declarative.Design;
 import com.vaadin.ui.declarative.DesignException;
 
-public class InvalidTagNames {
+public class InvalidTagNamesTest {
 
     @Test(expected = DesignException.class)
     public void tagWithoutDash() {
diff --git a/server/tests/src/com/vaadin/tests/design/LayoutTemplate.java b/server/src/test/java/com/vaadin/tests/design/LayoutTemplate.java
index fdfddf5c08..fdfddf5c08 100644
--- a/server/tests/src/com/vaadin/tests/design/LayoutTemplate.java
+++ b/server/src/test/java/com/vaadin/tests/design/LayoutTemplate.java
diff --git a/server/tests/src/com/vaadin/tests/design/LocaleTest.java b/server/src/test/java/com/vaadin/tests/design/LocaleTest.java
index 6cb288db23..6cb288db23 100644
--- a/server/tests/src/com/vaadin/tests/design/LocaleTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/LocaleTest.java
diff --git a/server/tests/src/com/vaadin/tests/design/ParseAllSupportedComponentsTest.java b/server/src/test/java/com/vaadin/tests/design/ParseAllSupportedComponentsTest.java
index d944826f10..54902c29fe 100644
--- a/server/tests/src/com/vaadin/tests/design/ParseAllSupportedComponentsTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/ParseAllSupportedComponentsTest.java
@@ -15,19 +15,17 @@
  */
 package com.vaadin.tests.design;
 
-import java.io.FileInputStream;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
 import java.io.FileNotFoundException;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import com.vaadin.ui.declarative.Design;
 import com.vaadin.ui.declarative.DesignContext;
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
 
 /**
  * Just top level test case that contains all synchronizable components
@@ -38,10 +36,8 @@ public class ParseAllSupportedComponentsTest {
 
     @Test
     public void allComponentsAreParsed() throws FileNotFoundException {
-        DesignContext ctx = Design
-                .read(new FileInputStream(
-                        "server/tests/src/com/vaadin/tests/design/all-components.html"),
-                        null);
+        DesignContext ctx = Design.read(
+                getClass().getResourceAsStream("all-components.html"), null);
 
         assertThat(ctx, is(not(nullValue())));
         assertThat(ctx.getRootComponent(), is(not(nullValue())));
diff --git a/server/tests/src/com/vaadin/tests/design/ParseLayoutTest.java b/server/src/test/java/com/vaadin/tests/design/ParseLayoutTest.java
index 20903512d1..784c986e1c 100644
--- a/server/tests/src/com/vaadin/tests/design/ParseLayoutTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/ParseLayoutTest.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertThat;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -46,8 +45,8 @@ import com.vaadin.ui.declarative.DesignException;
 
 /**
  * A test for checking that parsing a layout preserves the IDs and the mapping
- * from prefixes to package names (for example <meta name=”package-mapping”
- * content=”my:com.addon.mypackage” />)
+ * from prefixes to package names (for example
+ * <meta name=”package-mapping” content=”my:com.addon.mypackage” />)
  * 
  * @since
  * @author Vaadin Ltd
@@ -58,10 +57,8 @@ public class ParseLayoutTest {
 
     @Before
     public void setUp() throws Exception {
-        ctx = Design
-                .read(new FileInputStream(
-                        "server/tests/src/com/vaadin/tests/design/testFile.html"),
-                        null);
+        ctx = Design.read(getClass().getResourceAsStream("testFile.html"),
+                null);
     }
 
     @Test
@@ -155,8 +152,7 @@ public class ParseLayoutTest {
     @Test
     public void fieldsAreBoundToATemplate() throws IOException {
         LayoutTemplate template = new LayoutTemplate();
-        InputStream htmlFile = new FileInputStream(
-                "server/tests/src/com/vaadin/tests/design/testFile.html");
+        InputStream htmlFile = getClass().getResourceAsStream("testFile.html");
         Design.read(htmlFile, template);
         assertNotNull(template.getFirstButton());
         assertNotNull(template.getSecondButton());
@@ -168,8 +164,7 @@ public class ParseLayoutTest {
     @Test(expected = DesignException.class)
     public void fieldsCannotBeBoundToAnInvalidTemplate() throws IOException {
         InvalidLayoutTemplate template = new InvalidLayoutTemplate();
-        InputStream htmlFile = new FileInputStream(
-                "server/tests/src/com/vaadin/tests/design/testFile.html");
+        InputStream htmlFile = getClass().getResourceAsStream("testFile.html");
 
         Design.read(htmlFile, template);
     }
diff --git a/server/tests/src/com/vaadin/tests/design/ParseLegacyPrefixTest.java b/server/src/test/java/com/vaadin/tests/design/ParseLegacyPrefixTest.java
index feaf73af3c..76e15aae17 100644
--- a/server/tests/src/com/vaadin/tests/design/ParseLegacyPrefixTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/ParseLegacyPrefixTest.java
@@ -20,7 +20,6 @@ import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 
 import org.junit.Test;
@@ -35,10 +34,9 @@ public class ParseLegacyPrefixTest {
 
     @Test
     public void allComponentsAreParsed() throws FileNotFoundException {
-        DesignContext ctx = Design
-                .read(new FileInputStream(
-                        "server/tests/src/com/vaadin/tests/design/all-components-legacy.html"),
-                        null);
+        DesignContext ctx = Design.read(
+                getClass().getResourceAsStream("all-components-legacy.html"),
+                null);
 
         assertThat(ctx, is(not(nullValue())));
         assertThat(ctx.getRootComponent(), is(not(nullValue())));
diff --git a/server/tests/src/com/vaadin/tests/design/ParseMixedLegacyAndNewPrefixTest.java b/server/src/test/java/com/vaadin/tests/design/ParseMixedLegacyAndNewPrefixTest.java
index 2996cb23c1..2996cb23c1 100644
--- a/server/tests/src/com/vaadin/tests/design/ParseMixedLegacyAndNewPrefixTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/ParseMixedLegacyAndNewPrefixTest.java
diff --git a/server/tests/src/com/vaadin/tests/design/WriteLegacyDesignTest.java b/server/src/test/java/com/vaadin/tests/design/WriteLegacyDesignTest.java
index e57a03c232..facb5e9862 100644
--- a/server/tests/src/com/vaadin/tests/design/WriteLegacyDesignTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/WriteLegacyDesignTest.java
@@ -18,7 +18,6 @@ package com.vaadin.tests.design;
 import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Properties;
 
@@ -50,8 +49,8 @@ public class WriteLegacyDesignTest {
     @Before
     public void setUp() throws Exception {
         Properties properties = new Properties();
-        properties
-                .put(Constants.SERVLET_PARAMETER_LEGACY_DESIGN_PREFIX, "true");
+        properties.put(Constants.SERVLET_PARAMETER_LEGACY_DESIGN_PREFIX,
+                "true");
         final DeploymentConfiguration configuration = new DefaultDeploymentConfiguration(
                 WriteLegacyDesignTest.class, properties);
 
@@ -59,10 +58,8 @@ public class WriteLegacyDesignTest {
 
         CurrentInstance.set(VaadinService.class, service);
 
-        ctx = Design
-                .read(new FileInputStream(
-                        "server/tests/src/com/vaadin/tests/design/testFile-legacy.html"),
-                        null);
+        ctx = Design.read(
+                getClass().getResourceAsStream("testFile-legacy.html"), null);
     }
 
     @After
@@ -91,8 +88,8 @@ public class WriteLegacyDesignTest {
 
     private void checkNode(Node node) {
         if (node instanceof Element) {
-            assertTrue("Wrong design element prefix", node.nodeName()
-                    .startsWith("v-"));
+            assertTrue("Wrong design element prefix",
+                    node.nodeName().startsWith("v-"));
             for (Node child : node.childNodes()) {
                 checkNode(child);
             }
diff --git a/server/tests/src/com/vaadin/tests/design/designroot/DesignRootTest.java b/server/src/test/java/com/vaadin/tests/design/designroot/DesignRootTest.java
index 682da30344..682da30344 100644
--- a/server/tests/src/com/vaadin/tests/design/designroot/DesignRootTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/designroot/DesignRootTest.java
diff --git a/server/tests/src/com/vaadin/tests/design/designroot/DesignWithAnnotation.java b/server/src/test/java/com/vaadin/tests/design/designroot/DesignWithAnnotation.java
index ef9de9dcb0..ef9de9dcb0 100644
--- a/server/tests/src/com/vaadin/tests/design/designroot/DesignWithAnnotation.java
+++ b/server/src/test/java/com/vaadin/tests/design/designroot/DesignWithAnnotation.java
diff --git a/server/tests/src/com/vaadin/tests/design/designroot/DesignWithEmptyAnnotation.java b/server/src/test/java/com/vaadin/tests/design/designroot/DesignWithEmptyAnnotation.java
index 55fd571ee2..55fd571ee2 100644
--- a/server/tests/src/com/vaadin/tests/design/designroot/DesignWithEmptyAnnotation.java
+++ b/server/src/test/java/com/vaadin/tests/design/designroot/DesignWithEmptyAnnotation.java
diff --git a/server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithAnnotation.java b/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithAnnotation.java
index d47b4540df..d47b4540df 100644
--- a/server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithAnnotation.java
+++ b/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithAnnotation.java
diff --git a/server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java b/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java
index ea513f6d3e..ea513f6d3e 100644
--- a/server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java
+++ b/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java
diff --git a/server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotationUI.java b/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotationUI.java
index 1d0e8de4eb..1d0e8de4eb 100644
--- a/server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotationUI.java
+++ b/server/src/test/java/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotationUI.java
diff --git a/server/tests/src/com/vaadin/tests/design/nested/MyChildDesign.java b/server/src/test/java/com/vaadin/tests/design/nested/MyChildDesign.java
index 3b0d80c32c..3b0d80c32c 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/MyChildDesign.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/MyChildDesign.java
diff --git a/server/tests/src/com/vaadin/tests/design/nested/MyChildDesignCustomComponent.java b/server/src/test/java/com/vaadin/tests/design/nested/MyChildDesignCustomComponent.java
index 8402224cf9..8402224cf9 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/MyChildDesignCustomComponent.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/MyChildDesignCustomComponent.java
diff --git a/server/tests/src/com/vaadin/tests/design/nested/MyDesignRoot.java b/server/src/test/java/com/vaadin/tests/design/nested/MyDesignRoot.java
index abde002ef8..abde002ef8 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/MyDesignRoot.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/MyDesignRoot.java
diff --git a/server/tests/src/com/vaadin/tests/design/nested/MyExtendedChildDesign.java b/server/src/test/java/com/vaadin/tests/design/nested/MyExtendedChildDesign.java
index 579fdfb869..579fdfb869 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/MyExtendedChildDesign.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/MyExtendedChildDesign.java
diff --git a/server/tests/src/com/vaadin/tests/design/nested/NestedCustomLayoutsTest.java b/server/src/test/java/com/vaadin/tests/design/nested/NestedCustomLayoutsTest.java
index beaa9519cb..beaa9519cb 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/NestedCustomLayoutsTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/NestedCustomLayoutsTest.java
diff --git a/server/tests/src/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.java b/server/src/test/java/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.java
index dc95306cd3..dc95306cd3 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.java
diff --git a/server/tests/src/com/vaadin/tests/design/nested/WriteNestedTemplatesTest.java b/server/src/test/java/com/vaadin/tests/design/nested/WriteNestedTemplatesTest.java
index 5c78802472..5c78802472 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/WriteNestedTemplatesTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/WriteNestedTemplatesTest.java
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomAbsoluteLayout.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomAbsoluteLayout.java
index 8eef3b07a6..8eef3b07a6 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomAbsoluteLayout.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomAbsoluteLayout.java
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomAccordion.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomAccordion.java
index 93606f296c..93606f296c 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomAccordion.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomAccordion.java
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomCssLayout.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomCssLayout.java
index b2aaa2c015..b2aaa2c015 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomCssLayout.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomCssLayout.java
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomFormLayout.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomFormLayout.java
index 66ac083c0d..66ac083c0d 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomFormLayout.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomFormLayout.java
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomGridLayout.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomGridLayout.java
index 1059ea0e14..1059ea0e14 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomGridLayout.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomGridLayout.java
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalLayout.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalLayout.java
index 482a9feb95..482a9feb95 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalLayout.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalLayout.java
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalSplitPanel.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalSplitPanel.java
index 21c8745796..21c8745796 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalSplitPanel.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalSplitPanel.java
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomPanel.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomPanel.java
index 5841fbcfee..5841fbcfee 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomPanel.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomPanel.java
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomTabSheet.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomTabSheet.java
index 128de7de1f..128de7de1f 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomTabSheet.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomTabSheet.java
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomVerticalLayout.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomVerticalLayout.java
index 3bc8fba7de..3bc8fba7de 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomVerticalLayout.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomVerticalLayout.java
diff --git a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomVerticalSplitPanel.java b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomVerticalSplitPanel.java
index 486d71ea75..486d71ea75 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomVerticalSplitPanel.java
+++ b/server/src/test/java/com/vaadin/tests/design/nested/customlayouts/CustomVerticalSplitPanel.java
diff --git a/server/tests/src/com/vaadin/tests/event/EventRouterTest.java b/server/src/test/java/com/vaadin/tests/event/EventRouterTest.java
index aeb460c49e..aeb460c49e 100644
--- a/server/tests/src/com/vaadin/tests/event/EventRouterTest.java
+++ b/server/src/test/java/com/vaadin/tests/event/EventRouterTest.java
diff --git a/server/tests/src/com/vaadin/tests/event/ShortcutActionTest.java b/server/src/test/java/com/vaadin/tests/event/ShortcutActionTest.java
index 9af23b86b1..9af23b86b1 100644
--- a/server/tests/src/com/vaadin/tests/event/ShortcutActionTest.java
+++ b/server/src/test/java/com/vaadin/tests/event/ShortcutActionTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/AbstractBeanContainerListenersTest.java b/server/src/test/java/com/vaadin/tests/server/AbstractBeanContainerListenersTest.java
index b9b4f8025d..b9b4f8025d 100644
--- a/server/tests/src/com/vaadin/tests/server/AbstractBeanContainerListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/AbstractBeanContainerListenersTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/AbstractContainerListenersTest.java b/server/src/test/java/com/vaadin/tests/server/AbstractContainerListenersTest.java
index 91036c03ed..cb7b91226e 100644
--- a/server/tests/src/com/vaadin/tests/server/AbstractContainerListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/AbstractContainerListenersTest.java
@@ -1,5 +1,7 @@
 package com.vaadin.tests.server;
 
+import org.junit.Test;
+
 import com.vaadin.data.Container.ItemSetChangeEvent;
 import com.vaadin.data.Container.ItemSetChangeListener;
 import com.vaadin.data.Container.PropertySetChangeEvent;
@@ -10,11 +12,13 @@ import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 public class AbstractContainerListenersTest extends
         AbstractListenerMethodsTestBase {
 
+    @Test
     public void testItemSetChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(IndexedContainer.class,
                 ItemSetChangeEvent.class, ItemSetChangeListener.class);
     }
 
+    @Test
     public void testPropertySetChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(IndexedContainer.class,
                 PropertySetChangeEvent.class, PropertySetChangeListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/AbstractInMemoryContainerListenersTest.java b/server/src/test/java/com/vaadin/tests/server/AbstractInMemoryContainerListenersTest.java
index 072998b8e1..072998b8e1 100644
--- a/server/tests/src/com/vaadin/tests/server/AbstractInMemoryContainerListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/AbstractInMemoryContainerListenersTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/AbstractPropertyListenersTest.java b/server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java
index fd38b52a37..71a84eea6e 100644
--- a/server/tests/src/com/vaadin/tests/server/AbstractPropertyListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java
@@ -1,5 +1,7 @@
 package com.vaadin.tests.server;
 
+import org.junit.Test;
+
 import com.vaadin.data.Property.ReadOnlyStatusChangeEvent;
 import com.vaadin.data.Property.ReadOnlyStatusChangeListener;
 import com.vaadin.data.Property.ValueChangeEvent;
@@ -10,12 +12,15 @@ import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 
 public class AbstractPropertyListenersTest extends
         AbstractListenerMethodsTestBase {
+
+    @Test
     public void testValueChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(AbstractProperty.class,
                 ValueChangeEvent.class, ValueChangeListener.class,
                 new ObjectProperty<String>(""));
     }
 
+    @Test
     public void testReadOnlyStatusChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(AbstractProperty.class,
                 ReadOnlyStatusChangeEvent.class,
diff --git a/server/tests/src/com/vaadin/tests/server/AssertionsEnabledTest.java b/server/src/test/java/com/vaadin/tests/server/AssertionsEnabledTest.java
index 087a7fb0f5..f09db0ea99 100644
--- a/server/tests/src/com/vaadin/tests/server/AssertionsEnabledTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/AssertionsEnabledTest.java
@@ -16,9 +16,13 @@
 
 package com.vaadin.tests.server;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertTrue;
 
-public class AssertionsEnabledTest extends TestCase {
+import org.junit.Test;
+
+public class AssertionsEnabledTest {
+
+    @Test
     public void testAssertionsEnabled() {
         boolean assertFailed = false;
         try {
diff --git a/server/tests/src/com/vaadin/tests/server/AtmosphereVersionTest.java b/server/src/test/java/com/vaadin/tests/server/AtmosphereVersionTest.java
index 90a0283cda..ef5420229a 100644
--- a/server/tests/src/com/vaadin/tests/server/AtmosphereVersionTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/AtmosphereVersionTest.java
@@ -1,16 +1,19 @@
 package com.vaadin.tests.server;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
 
 import org.atmosphere.util.Version;
+import org.junit.Test;
 
 import com.vaadin.server.Constants;
 
-public class AtmosphereVersionTest extends TestCase {
+public class AtmosphereVersionTest {
+
     /**
      * Test that the atmosphere version constant matches the version on our
      * classpath
      */
+    @Test
     public void testAtmosphereVersion() {
         assertEquals(Constants.REQUIRED_ATMOSPHERE_RUNTIME_VERSION,
                 Version.getRawVersion());
diff --git a/server/tests/src/com/vaadin/tests/server/ClassesSerializableTest.java b/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java
index c22e289bc4..2aef09fa2a 100644
--- a/server/tests/src/com/vaadin/tests/server/ClassesSerializableTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java
@@ -14,11 +14,10 @@ import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-import junit.framework.TestCase;
-
+import org.junit.Assert;
 import org.junit.Test;
 
-public class ClassesSerializableTest extends TestCase {
+public class ClassesSerializableTest {
 
     /**
      * JARs that will be scanned for classes to test, in addition to classpath
@@ -89,6 +88,7 @@ public class ClassesSerializableTest extends TestCase {
      * 
      * @throws Exception
      */
+    @Test
     public void testClassesSerializable() throws Exception {
         List<String> rawClasspathEntries = getRawClasspathEntries();
 
@@ -149,7 +149,7 @@ public class ClassesSerializableTest extends TestCase {
                     nonSerializableString += ")";
                 }
             }
-            fail("Serializable not implemented by the following classes and interfaces: "
+            Assert.fail("Serializable not implemented by the following classes and interfaces: "
                     + nonSerializableString);
         }
     }
diff --git a/server/tests/src/com/vaadin/tests/server/ClientMethodSerializationTest.java b/server/src/test/java/com/vaadin/tests/server/ClientMethodSerializationTest.java
index 1ec19724d8..33f6e1f90a 100644
--- a/server/tests/src/com/vaadin/tests/server/ClientMethodSerializationTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/ClientMethodSerializationTest.java
@@ -15,6 +15,9 @@
  */
 package com.vaadin.tests.server;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
@@ -22,7 +25,7 @@ import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.lang.reflect.Method;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import com.vaadin.server.ClientConnector;
 import com.vaadin.server.ClientMethodInvocation;
@@ -36,7 +39,7 @@ import elemental.json.JsonArray;
 import elemental.json.JsonValue;
 import elemental.json.impl.JsonUtil;
 
-public class ClientMethodSerializationTest extends TestCase {
+public class ClientMethodSerializationTest {
 
     private static final Method JAVASCRIPT_CALLBACK_METHOD = ReflectTools
             .findMethod(JavaScriptCallbackRpc.class, "call", String.class,
@@ -62,6 +65,7 @@ public class ClientMethodSerializationTest extends TestCase {
      * {@link JavaScriptCallbackHelper#invokeCallback(String, Object...)}.
      * #12532
      */
+    @Test
     public void testClientMethodSerialization_WithJSONArray_ContentStaysSame()
             throws Exception {
         JsonArray originalArray = Json.createArray();
@@ -78,6 +82,7 @@ public class ClientMethodSerializationTest extends TestCase {
                 JsonUtil.stringify(copyArray));
     }
 
+    @Test
     public void testClientMethodSerialization_WithBasicParams_NoChanges()
             throws Exception {
         String stringParam = "a string 123";
@@ -92,6 +97,7 @@ public class ClientMethodSerializationTest extends TestCase {
         assertEquals(copyInteger, integerParam);
     }
 
+    @Test
     public void testClientMethodSerialization_NoParams_NoExceptions() {
         ClientMethodInvocation original = new ClientMethodInvocation(null,
                 "interfaceName", NO_PARAMS_CALL_METHOD, null);
@@ -115,6 +121,7 @@ public class ClientMethodSerializationTest extends TestCase {
         return output;
     }
 
+    @Test
     public void testSerializeTwice() {
         String name = "javascriptFunctionName";
         String[] arguments = { "1", "2", "3" };
diff --git a/server/tests/src/com/vaadin/tests/server/ContextClickListenerTest.java b/server/src/test/java/com/vaadin/tests/server/ContextClickListenerTest.java
index 58d4d8d831..58d4d8d831 100644
--- a/server/tests/src/com/vaadin/tests/server/ContextClickListenerTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/ContextClickListenerTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTest.java b/server/src/test/java/com/vaadin/tests/server/CsrfTokenMissingTest.java
index cd9beafa10..cd9beafa10 100644
--- a/server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/CsrfTokenMissingTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/EventRouterTest.java b/server/src/test/java/com/vaadin/tests/server/EventRouterTest.java
index 67f39d301d..e7d8749c85 100644
--- a/server/tests/src/com/vaadin/tests/server/EventRouterTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/EventRouterTest.java
@@ -1,15 +1,16 @@
 package com.vaadin.tests.server;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.ui.TextField;
 
-public class EventRouterTest extends TestCase {
+public class EventRouterTest {
 
     int innerListenerCalls = 0;
 
+    @Test
     public void testAddInEventListener() {
         final TextField tf = new TextField();
 
diff --git a/server/tests/src/com/vaadin/tests/server/ExtensionTest.java b/server/src/test/java/com/vaadin/tests/server/ExtensionTest.java
index 8f8e8dcb59..8f8e8dcb59 100644
--- a/server/tests/src/com/vaadin/tests/server/ExtensionTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/ExtensionTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/FileResourceTest.java b/server/src/test/java/com/vaadin/tests/server/FileResourceTest.java
index 4798fb9f05..4798fb9f05 100644
--- a/server/tests/src/com/vaadin/tests/server/FileResourceTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/FileResourceTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/FileTypeResolverTest.java b/server/src/test/java/com/vaadin/tests/server/FileTypeResolverTest.java
index 3c68e86afa..a8af915cdc 100644
--- a/server/tests/src/com/vaadin/tests/server/FileTypeResolverTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/FileTypeResolverTest.java
@@ -1,17 +1,20 @@
 package com.vaadin.tests.server;
 
+import static org.junit.Assert.assertEquals;
+
 import java.io.File;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import com.vaadin.util.FileTypeResolver;
 
-public class FileTypeResolverTest extends TestCase {
+public class FileTypeResolverTest {
 
     private static final String FLASH_MIME_TYPE = "application/x-shockwave-flash";
     private static final String TEXT_MIME_TYPE = "text/plain";
     private static final String HTML_MIME_TYPE = "text/html";
 
+    @Test
     public void testMimeTypes() {
         File plainFlash = new File("MyFlash.swf");
         File plainText = new File("/a/b/MyFlash.txt");
@@ -56,6 +59,7 @@ public class FileTypeResolverTest extends TestCase {
 
     }
 
+    @Test
     public void testExtensionCase() {
         assertEquals("image/jpeg", FileTypeResolver.getMIMEType("abc.jpg"));
         assertEquals("image/jpeg", FileTypeResolver.getMIMEType("abc.jPg"));
@@ -65,6 +69,7 @@ public class FileTypeResolverTest extends TestCase {
         assertEquals("image/jpeg", FileTypeResolver.getMIMEType("abc.JPE"));
     }
 
+    @Test
     public void testCustomMimeType() {
         assertEquals(FileTypeResolver.DEFAULT_MIME_TYPE,
                 FileTypeResolver.getMIMEType("vaadin.foo"));
diff --git a/server/tests/src/com/vaadin/tests/server/IndexedContainerListenersTest.java b/server/src/test/java/com/vaadin/tests/server/IndexedContainerListenersTest.java
index 594f5627dd..bc2c5e3558 100644
--- a/server/tests/src/com/vaadin/tests/server/IndexedContainerListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/IndexedContainerListenersTest.java
@@ -1,5 +1,7 @@
 package com.vaadin.tests.server;
 
+import org.junit.Test;
+
 import com.vaadin.data.Container.PropertySetChangeEvent;
 import com.vaadin.data.Container.PropertySetChangeListener;
 import com.vaadin.data.Property.ValueChangeEvent;
@@ -9,11 +11,14 @@ import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 
 public class IndexedContainerListenersTest extends
         AbstractListenerMethodsTestBase {
+
+    @Test
     public void testValueChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(IndexedContainer.class,
                 ValueChangeEvent.class, ValueChangeListener.class);
     }
 
+    @Test
     public void testPropertySetChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(IndexedContainer.class,
                 PropertySetChangeEvent.class, PropertySetChangeListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/KeyMapperTest.java b/server/src/test/java/com/vaadin/tests/server/KeyMapperTest.java
index d632e65c9f..7ca3c61a55 100644
--- a/server/tests/src/com/vaadin/tests/server/KeyMapperTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/KeyMapperTest.java
@@ -1,14 +1,19 @@
 package com.vaadin.tests.server;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.fail;
+
 import java.lang.reflect.Field;
 import java.util.HashMap;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import com.vaadin.server.KeyMapper;
 
-public class KeyMapperTest extends TestCase {
+public class KeyMapperTest {
 
+    @Test
     public void testAdd() {
         KeyMapper<Object> mapper = new KeyMapper<Object>();
         Object o1 = new Object();
@@ -40,6 +45,7 @@ public class KeyMapperTest extends TestCase {
 
     }
 
+    @Test
     public void testRemoveAll() {
         KeyMapper<Object> mapper = new KeyMapper<Object>();
         Object o1 = new Object();
@@ -57,6 +63,7 @@ public class KeyMapperTest extends TestCase {
 
     }
 
+    @Test
     public void testRemove() {
         KeyMapper<Object> mapper = new KeyMapper<Object>();
         Object o1 = new Object();
diff --git a/server/tests/src/com/vaadin/tests/server/MimeTypesTest.java b/server/src/test/java/com/vaadin/tests/server/MimeTypesTest.java
index 36007fae17..825c8b22ad 100644
--- a/server/tests/src/com/vaadin/tests/server/MimeTypesTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/MimeTypesTest.java
@@ -1,12 +1,15 @@
 package com.vaadin.tests.server;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
 
 import com.vaadin.server.ClassResource;
 import com.vaadin.ui.Embedded;
 
-public class MimeTypesTest extends TestCase {
+public class MimeTypesTest {
 
+    @Test
     public void testEmbeddedPDF() {
         Embedded e = new Embedded("A pdf", new ClassResource("file.pddf"));
         assertEquals("Invalid mimetype", "application/octet-stream",
diff --git a/server/tests/src/com/vaadin/tests/server/PropertyFormatterTest.java b/server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java
index 6563556a4e..14da1171c6 100644
--- a/server/tests/src/com/vaadin/tests/server/PropertyFormatterTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.server;
 
-import java.util.Date;
+import static org.junit.Assert.assertTrue;
 
-import junit.framework.TestCase;
+import java.util.Date;
 
 import org.junit.Test;
 
@@ -10,7 +10,7 @@ import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.data.util.PropertyFormatter;
 
 @SuppressWarnings("unchecked")
-public class PropertyFormatterTest extends TestCase {
+public class PropertyFormatterTest {
 
     class TestFormatter extends PropertyFormatter {
 
diff --git a/server/tests/src/com/vaadin/tests/server/PropertysetItemListenersTest.java b/server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java
index 8a91ea1868..8a91ea1868 100644
--- a/server/tests/src/com/vaadin/tests/server/PropertysetItemListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/SerializationTest.java b/server/src/test/java/com/vaadin/tests/server/SerializationTest.java
index 4de30e579e..349a2c525e 100644
--- a/server/tests/src/com/vaadin/tests/server/SerializationTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/SerializationTest.java
@@ -1,5 +1,7 @@
 package com.vaadin.tests.server;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -7,7 +9,7 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
@@ -17,8 +19,9 @@ import com.vaadin.data.validator.RegexpValidator;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.ui.Form;
 
-public class SerializationTest extends TestCase {
+public class SerializationTest {
 
+    @Test
     public void testValidators() throws Exception {
         RegexpValidator validator = new RegexpValidator(".*", "Error");
         validator.validate("aaa");
@@ -26,6 +29,7 @@ public class SerializationTest extends TestCase {
         validator2.validate("aaa");
     }
 
+    @Test
     public void testForm() throws Exception {
         Form f = new Form();
         String propertyId = "My property";
@@ -38,6 +42,7 @@ public class SerializationTest extends TestCase {
 
     }
 
+    @Test
     public void testIndedexContainerItemIds() throws Exception {
         IndexedContainer ic = new IndexedContainer();
         ic.addContainerProperty("prop1", String.class, null);
@@ -50,24 +55,28 @@ public class SerializationTest extends TestCase {
         serializeAndDeserialize(ic);
     }
 
+    @Test
     public void testMethodPropertyGetter() throws Exception {
         MethodProperty<?> mp = new MethodProperty<Object>(new Data(),
                 "dummyGetter");
         serializeAndDeserialize(mp);
     }
 
+    @Test
     public void testMethodPropertyGetterAndSetter() throws Exception {
         MethodProperty<?> mp = new MethodProperty<Object>(new Data(),
                 "dummyGetterAndSetter");
         serializeAndDeserialize(mp);
     }
 
+    @Test
     public void testMethodPropertyInt() throws Exception {
         MethodProperty<?> mp = new MethodProperty<Object>(new Data(),
                 "dummyInt");
         serializeAndDeserialize(mp);
     }
 
+    @Test
     public void testVaadinSession() throws Exception {
         VaadinSession session = new VaadinSession(null);
 
diff --git a/server/tests/src/com/vaadin/tests/server/SimpleMultiPartInputStreamTest.java b/server/src/test/java/com/vaadin/tests/server/SimpleMultiPartInputStreamTest.java
index 04e621d5d2..70a18d1fa6 100644
--- a/server/tests/src/com/vaadin/tests/server/SimpleMultiPartInputStreamTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/SimpleMultiPartInputStreamTest.java
@@ -5,11 +5,11 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import com.vaadin.server.communication.FileUploadHandler.SimpleMultiPartInputStream;
 
-public class SimpleMultiPartInputStreamTest extends TestCase {
+public class SimpleMultiPartInputStreamTest {
 
     /**
      * Check that the output for a given stream until boundary is as expected.
@@ -46,28 +46,34 @@ public class SimpleMultiPartInputStreamTest extends TestCase {
         checkBoundaryDetection(input.getBytes(), boundary, expected.getBytes());
     }
 
+    @Test
     public void testSingleByteBoundaryAtEnd() throws Exception {
         checkBoundaryDetection("xyz123" + getFullBoundary("a"), "a", "xyz123");
     }
 
+    @Test
     public void testSingleByteBoundaryInMiddle() throws Exception {
         checkBoundaryDetection("xyz" + getFullBoundary("a") + "123", "a", "xyz");
     }
 
+    @Test
     public void testCorrectBoundaryAtEnd() throws Exception {
         checkBoundaryDetection("xyz123" + getFullBoundary("abc"), "abc",
                 "xyz123");
     }
 
+    @Test
     public void testCorrectBoundaryNearEnd() throws Exception {
         checkBoundaryDetection("xyz123" + getFullBoundary("abc") + "de", "abc",
                 "xyz123");
     }
 
+    @Test
     public void testCorrectBoundaryAtBeginning() throws Exception {
         checkBoundaryDetection(getFullBoundary("abc") + "xyz123", "abc", "");
     }
 
+    @Test
     public void testRepeatingCharacterBoundary() throws Exception {
         checkBoundaryDetection(getFullBoundary("aa") + "xyz123", "aa", "");
         checkBoundaryDetection("axyz" + getFullBoundary("aa") + "123", "aa",
@@ -85,6 +91,7 @@ public class SimpleMultiPartInputStreamTest extends TestCase {
     // + "1234567890", "\n\n", "");
     // }
 
+    @Test
     public void testRepeatingStringBoundary() throws Exception {
         checkBoundaryDetection(getFullBoundary("abab") + "xyz123", "abab", "");
         checkBoundaryDetection("abaxyz" + getFullBoundary("abab") + "123",
@@ -93,6 +100,7 @@ public class SimpleMultiPartInputStreamTest extends TestCase {
                 "xyz123");
     }
 
+    @Test
     public void testOverlappingBoundary() throws Exception {
         checkBoundaryDetection("abc" + getFullBoundary("abcabd") + "xyz123",
                 "abcabd", "abc");
diff --git a/server/tests/src/com/vaadin/tests/server/StreamResourceTest.java b/server/src/test/java/com/vaadin/tests/server/StreamResourceTest.java
index 4971f556db..4971f556db 100644
--- a/server/tests/src/com/vaadin/tests/server/StreamResourceTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/StreamResourceTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/StreamVariableMappingTest.java b/server/src/test/java/com/vaadin/tests/server/StreamVariableMappingTest.java
index b430c7cf84..f93d6095c1 100644
--- a/server/tests/src/com/vaadin/tests/server/StreamVariableMappingTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/StreamVariableMappingTest.java
@@ -1,8 +1,13 @@
 package com.vaadin.tests.server;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
 import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
 
 import com.vaadin.server.LegacyCommunicationManager;
 import com.vaadin.server.MockServletConfig;
@@ -17,7 +22,7 @@ import com.vaadin.ui.ConnectorTracker;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.Upload;
 
-public class StreamVariableMappingTest extends TestCase {
+public class StreamVariableMappingTest {
     private static final String variableName = "myName";
 
     private Upload owner;
@@ -25,8 +30,8 @@ public class StreamVariableMappingTest extends TestCase {
 
     private LegacyCommunicationManager cm;
 
-    @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() throws Exception {
         final VaadinSession application = new AlwaysLockedVaadinSession(null);
         final UI uI = new UI() {
             @Override
@@ -46,10 +51,9 @@ public class StreamVariableMappingTest extends TestCase {
         };
         streamVariable = EasyMock.createMock(StreamVariable.class);
         cm = createCommunicationManager();
-
-        super.setUp();
     }
 
+    @Test
     public void testAddStreamVariable() {
         owner.getUI().getConnectorTracker().registerConnector(owner);
         String targetUrl = cm.getStreamVariableTargetUrl(owner, variableName,
@@ -63,6 +67,7 @@ public class StreamVariableMappingTest extends TestCase {
         assertSame(streamVariable, streamVariable2);
     }
 
+    @Test
     public void testRemoveVariable() {
         ConnectorTracker tracker = owner.getUI().getConnectorTracker();
         tracker.registerConnector(owner);
diff --git a/server/tests/src/com/vaadin/tests/server/clientconnector/AttachDetachListenersTest.java b/server/src/test/java/com/vaadin/tests/server/clientconnector/AttachDetachListenersTest.java
index 28c5be29cb..28c5be29cb 100644
--- a/server/tests/src/com/vaadin/tests/server/clientconnector/AttachDetachListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/clientconnector/AttachDetachListenersTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/AbstractListenerMethodsTestBase.java b/server/src/test/java/com/vaadin/tests/server/component/AbstractListenerMethodsTestBase.java
index 4e8f987def..24201ce51d 100644
--- a/server/tests/src/com/vaadin/tests/server/component/AbstractListenerMethodsTestBase.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/AbstractListenerMethodsTestBase.java
@@ -6,15 +6,13 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import junit.framework.TestCase;
-
 import org.easymock.EasyMock;
 import org.junit.Assert;
 
 import com.vaadin.tests.VaadinClasses;
 import com.vaadin.ui.Component;
 
-public abstract class AbstractListenerMethodsTestBase extends TestCase {
+public abstract class AbstractListenerMethodsTestBase {
 
     public static void main(String[] args) {
         findAllListenerMethods();
@@ -163,7 +161,7 @@ public abstract class AbstractListenerMethodsTestBase extends TestCase {
             SecurityException, IllegalAccessException,
             InvocationTargetException, NoSuchMethodException {
         Collection<?> registeredListeners = getListeners(c, eventClass);
-        assertEquals("Number of listeners", expectedListeners.length,
+        Assert.assertEquals("Number of listeners", expectedListeners.length,
                 registeredListeners.size());
 
         Assert.assertArrayEquals(expectedListeners,
diff --git a/server/tests/src/com/vaadin/tests/server/component/ComponentSizeParseTest.java b/server/src/test/java/com/vaadin/tests/server/component/ComponentSizeParseTest.java
index 2083d1f473..335963ec1b 100644
--- a/server/tests/src/com/vaadin/tests/server/component/ComponentSizeParseTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/ComponentSizeParseTest.java
@@ -16,15 +16,14 @@
 
 package com.vaadin.tests.server.component;
 
-import junit.framework.TestCase;
-
 import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.server.Sizeable.Unit;
 import com.vaadin.shared.ui.label.LabelState;
 import com.vaadin.ui.Label;
 
-public class ComponentSizeParseTest extends TestCase {
+public class ComponentSizeParseTest {
 
     private final class LabelWithPublicState extends Label {
         @Override
@@ -33,6 +32,7 @@ public class ComponentSizeParseTest extends TestCase {
         }
     }
 
+    @Test
     public void testAllTheUnit() {
         testUnit("10.0px", 10, Unit.PIXELS);
         testUnit("10.0pt", 10, Unit.POINTS);
diff --git a/server/tests/src/com/vaadin/tests/server/component/DeclarativeMarginTestBase.java b/server/src/test/java/com/vaadin/tests/server/component/DeclarativeMarginTestBase.java
index faaf8ebfc2..faaf8ebfc2 100644
--- a/server/tests/src/com/vaadin/tests/server/component/DeclarativeMarginTestBase.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/DeclarativeMarginTestBase.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/FieldDefaultValues.java b/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java
index 16bbd7008f..32f5ef8850 100644
--- a/server/tests/src/com/vaadin/tests/server/component/FieldDefaultValues.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java
@@ -25,7 +25,7 @@ import com.vaadin.tests.VaadinClasses;
 import com.vaadin.ui.Field;
 import com.vaadin.ui.Slider;
 
-public class FieldDefaultValues {
+public class FieldDefaultValuesTest {
 
     @Test
     public void testFieldsHaveDefaultValueAfterClear() throws Exception {
diff --git a/server/tests/src/com/vaadin/tests/server/component/FinalMethodTest.java b/server/src/test/java/com/vaadin/tests/server/component/FinalMethodTest.java
index ad80007882..6dd451ac2a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/FinalMethodTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/FinalMethodTest.java
@@ -4,12 +4,12 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.HashSet;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import com.vaadin.tests.VaadinClasses;
 import com.vaadin.ui.Component;
 
-public class FinalMethodTest extends TestCase {
+public class FinalMethodTest {
 
     // public void testThatContainersHaveNoFinalMethods() {
     // HashSet<Class<?>> tested = new HashSet<Class<?>>();
@@ -20,6 +20,7 @@ public class FinalMethodTest extends TestCase {
     // }
     // }
 
+    @Test
     public void testThatComponentsHaveNoFinalMethods() {
         HashSet<Class<?>> tested = new HashSet<Class<?>>();
         for (Class<? extends Component> c : VaadinClasses.getComponents()) {
diff --git a/server/tests/src/com/vaadin/tests/server/component/ReadEmptyDesignTest.java b/server/src/test/java/com/vaadin/tests/server/component/ReadEmptyDesignTest.java
index 5cf3b9700e..146c633789 100644
--- a/server/tests/src/com/vaadin/tests/server/component/ReadEmptyDesignTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/ReadEmptyDesignTest.java
@@ -15,14 +15,18 @@
  */
 package com.vaadin.tests.server.component;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
-import junit.framework.TestCase;
-
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.DocumentType;
 import org.jsoup.nodes.Element;
+import org.junit.Before;
+import org.junit.Test;
 
 import com.vaadin.ui.Component;
 import com.vaadin.ui.VerticalLayout;
@@ -34,27 +38,29 @@ import com.vaadin.ui.declarative.DesignException;
  * Test cases for checking that reading a design with no elements in the html
  * body produces null as the root component.
  */
-public class ReadEmptyDesignTest extends TestCase {
+public class ReadEmptyDesignTest {
     InputStream is;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
         String html = createDesign().toString();
         is = new ByteArrayInputStream(html.getBytes());
     }
 
+    @Test
     public void testReadComponent() {
         Component root = Design.read(is);
         assertNull("The root component should be null.", root);
     }
 
+    @Test
     public void testReadContext() {
         DesignContext ctx = Design.read(is, null);
         assertNotNull("The design context should not be null.", ctx);
         assertNull("The root component should be null.", ctx.getRootComponent());
     }
 
+    @Test
     public void testReadContextWithRootParameter() {
         try {
             Component rootComponent = new VerticalLayout();
diff --git a/server/tests/src/com/vaadin/tests/server/component/StateGetDoesNotMarkDirtyTest.java b/server/src/test/java/com/vaadin/tests/server/component/StateGetDoesNotMarkDirtyTest.java
index da4d8a92d4..2ae845716d 100644
--- a/server/tests/src/com/vaadin/tests/server/component/StateGetDoesNotMarkDirtyTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/StateGetDoesNotMarkDirtyTest.java
@@ -7,8 +7,8 @@ import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
 
-import junit.framework.TestCase;
-
+import org.junit.Before;
+import org.junit.Test;
 import org.mockito.Mockito;
 
 import com.vaadin.tests.VaadinClasses;
@@ -17,16 +17,17 @@ import com.vaadin.ui.ConnectorTracker;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
 
-public class StateGetDoesNotMarkDirtyTest extends TestCase {
+public class StateGetDoesNotMarkDirtyTest {
 
     private Set<String> excludedMethods = new HashSet<String>();
 
-    @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() {
         excludedMethods.add(Label.class.getName() + "getDataSourceValue");
         excludedMethods.add("getConnectorId");
     }
 
+    @Test
     public void testGetDoesntMarkStateDirty() throws Exception {
         for (Class<? extends Component> c : VaadinClasses.getComponents()) {
             Component newInstance = construct(c);
diff --git a/server/tests/src/com/vaadin/tests/server/component/WriteEmptyDesignTest.java b/server/src/test/java/com/vaadin/tests/server/component/WriteEmptyDesignTest.java
index a535de2b24..85d25aec79 100644
--- a/server/tests/src/com/vaadin/tests/server/component/WriteEmptyDesignTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/WriteEmptyDesignTest.java
@@ -19,11 +19,11 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import junit.framework.TestCase;
-
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
+import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.ui.Component;
 import com.vaadin.ui.declarative.Design;
@@ -33,14 +33,16 @@ import com.vaadin.ui.declarative.DesignContext;
  * Test cases for checking that writing a component hierarchy with null root
  * produces an html document that has no elements in the html body.
  */
-public class WriteEmptyDesignTest extends TestCase {
+public class WriteEmptyDesignTest {
 
+    @Test
     public void testWriteComponent() throws IOException {
         OutputStream os = new ByteArrayOutputStream();
         Design.write((Component) null, os);
         checkHtml(os.toString());
     }
 
+    @Test
     public void testWriteContext() throws IOException {
         OutputStream os = new ByteArrayOutputStream();
         DesignContext ctx = new DesignContext();
@@ -52,7 +54,7 @@ public class WriteEmptyDesignTest extends TestCase {
     private void checkHtml(String html) {
         Document doc = Jsoup.parse(html);
         Element body = doc.body();
-        assertEquals("There should be no elements in the html body.", "",
-                body.html());
+        Assert.assertEquals("There should be no elements in the html body.",
+                "", body.html());
     }
 }
\ No newline at end of file
diff --git a/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutDeclarativeTest.java
index f00eb91c50..f00eb91c50 100644
--- a/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListenersTest.java
index ece4b5f380..ece4b5f380 100644
--- a/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListenersTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AddComponentsTest.java b/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AddComponentsTest.java
index 96f27851cf..96f27851cf 100644
--- a/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AddComponentsTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/AddComponentsTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/absolutelayout/ComponentPositionTest.java b/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/ComponentPositionTest.java
index eac7ff4d8a..20a85edea5 100644
--- a/server/tests/src/com/vaadin/tests/server/component/absolutelayout/ComponentPositionTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/absolutelayout/ComponentPositionTest.java
@@ -1,13 +1,16 @@
 package com.vaadin.tests.server.component.absolutelayout;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import org.junit.Test;
 
 import com.vaadin.server.Sizeable;
 import com.vaadin.server.Sizeable.Unit;
 import com.vaadin.ui.AbsoluteLayout;
 import com.vaadin.ui.Button;
 
-public class ComponentPositionTest extends TestCase {
+public class ComponentPositionTest {
 
     private static final String CSS = "top:7.0px;right:7.0%;bottom:7.0pc;left:7.0em;z-index:7;";
     private static final String PARTIAL_CSS = "top:7.0px;left:7.0em;";
@@ -18,6 +21,7 @@ public class ComponentPositionTest extends TestCase {
     /**
      * Add component w/o giving positions, assert that everything is unset
      */
+    @Test
     public void testNoPosition() {
         AbsoluteLayout layout = new AbsoluteLayout();
         Button b = new Button();
@@ -42,6 +46,7 @@ public class ComponentPositionTest extends TestCase {
     /**
      * Add component, setting all attributes using CSS, assert getter agree
      */
+    @Test
     public void testFullCss() {
         AbsoluteLayout layout = new AbsoluteLayout();
         Button b = new Button();
@@ -68,6 +73,7 @@ public class ComponentPositionTest extends TestCase {
     /**
      * Add component, setting some attributes using CSS, assert getters agree
      */
+    @Test
     public void testPartialCss() {
         AbsoluteLayout layout = new AbsoluteLayout();
         Button b = new Button();
@@ -93,6 +99,7 @@ public class ComponentPositionTest extends TestCase {
      * Add component setting all attributes using CSS, then reset using partial
      * CSS; assert getters agree and the appropriate attributes are unset.
      */
+    @Test
     public void testPartialCssReset() {
         AbsoluteLayout layout = new AbsoluteLayout();
         Button b = new Button();
@@ -120,6 +127,7 @@ public class ComponentPositionTest extends TestCase {
      * Add component, then set all position attributes with individual setters
      * for value and units; assert getters agree.
      */
+    @Test
     public void testSetPosition() {
         final Float SIZE = Float.valueOf(12);
 
@@ -153,6 +161,7 @@ public class ComponentPositionTest extends TestCase {
      * Add component, then set all position attributes with combined setters for
      * value and units; assert getters agree.
      */
+    @Test
     public void testSetPosition2() {
         final Float SIZE = Float.valueOf(12);
         AbsoluteLayout layout = new AbsoluteLayout();
@@ -180,6 +189,7 @@ public class ComponentPositionTest extends TestCase {
      * Add component, set all attributes using CSS, unset some using method
      * calls, assert getters agree.
      */
+    @Test
     public void testUnsetPosition() {
         AbsoluteLayout layout = new AbsoluteLayout();
         Button b = new Button();
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java
index fc97c84952..fc97c84952 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentStyleNamesTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentStyleNamesTest.java
index 18eb79aadc..77c2fef7e8 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentStyleNamesTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentStyleNamesTest.java
@@ -1,17 +1,21 @@
 package com.vaadin.tests.server.component.abstractcomponent;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
 
 import com.vaadin.ui.AbstractComponent;
 
-public class AbstractComponentStyleNamesTest extends TestCase {
+public class AbstractComponentStyleNamesTest {
 
+    @Test
     public void testSetMultiple() {
         AbstractComponent component = getComponent();
         component.setStyleName("style1 style2");
         assertEquals(component.getStyleName(), "style1 style2");
     }
 
+    @Test
     public void testSetAdd() {
         AbstractComponent component = getComponent();
         component.setStyleName("style1");
@@ -19,6 +23,7 @@ public class AbstractComponentStyleNamesTest extends TestCase {
         assertEquals(component.getStyleName(), "style1 style2");
     }
 
+    @Test
     public void testAddSame() {
         AbstractComponent component = getComponent();
         component.setStyleName("style1 style2");
@@ -26,6 +31,7 @@ public class AbstractComponentStyleNamesTest extends TestCase {
         assertEquals(component.getStyleName(), "style1 style2");
     }
 
+    @Test
     public void testSetRemove() {
         AbstractComponent component = getComponent();
         component.setStyleName("style1 style2");
@@ -33,6 +39,7 @@ public class AbstractComponentStyleNamesTest extends TestCase {
         assertEquals(component.getStyleName(), "style2");
     }
 
+    @Test
     public void testAddRemove() {
         AbstractComponent component = getComponent();
         component.addStyleName("style1");
@@ -41,6 +48,7 @@ public class AbstractComponentStyleNamesTest extends TestCase {
         assertEquals(component.getStyleName(), "style2");
     }
 
+    @Test
     public void testRemoveMultipleWithExtraSpaces() {
         AbstractComponent component = getComponent();
         component.setStyleName("style1 style2 style3");
@@ -48,6 +56,7 @@ public class AbstractComponentStyleNamesTest extends TestCase {
         assertEquals(component.getStyleName(), "style2");
     }
 
+    @Test
     public void testSetWithExtraSpaces() {
         AbstractComponent component = getComponent();
         component.setStyleName(" style1  style2 ");
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/AbstractComponentContainerListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractcomponentcontainer/AbstractComponentContainerListenersTest.java
index 3a2150b700..76fe3c1681 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/AbstractComponentContainerListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractcomponentcontainer/AbstractComponentContainerListenersTest.java
@@ -1,5 +1,7 @@
 package com.vaadin.tests.server.component.abstractcomponentcontainer;
 
+import org.junit.Test;
+
 import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.HasComponents.ComponentAttachEvent;
 import com.vaadin.ui.HasComponents.ComponentAttachListener;
@@ -10,11 +12,14 @@ import com.vaadin.ui.VerticalLayout;
 
 public class AbstractComponentContainerListenersTest extends
         AbstractListenerMethodsTestBase {
+
+    @Test
     public void testComponentDetachListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(HorizontalLayout.class,
                 ComponentDetachEvent.class, ComponentDetachListener.class);
     }
 
+    @Test
     public void testComponentAttachListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(VerticalLayout.class,
                 ComponentAttachEvent.class, ComponentAttachListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/AddParentAsChildTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractcomponentcontainer/AddParentAsChildTest.java
index 176d178112..176d178112 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/AddParentAsChildTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractcomponentcontainer/AddParentAsChildTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java
index 59831d92e1..59831d92e1 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java
index 02aa6afe07..e428155ccd 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java
@@ -1,8 +1,9 @@
 package com.vaadin.tests.server.component.abstractfield;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.fail;
 
 import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.data.Validator.InvalidValueException;
 import com.vaadin.data.util.MethodProperty;
@@ -14,12 +15,13 @@ import com.vaadin.tests.data.bean.Person;
 import com.vaadin.tests.data.bean.Sex;
 import com.vaadin.ui.TextField;
 
-public class AbsFieldValueConversionErrorTest extends TestCase {
+public class AbsFieldValueConversionErrorTest {
 
     Person paulaBean = new Person("Paula", "Brilliant", "paula@brilliant.com",
             34, Sex.FEMALE, new Address("Paula street 1", 12345, "P-town",
                     Country.FINLAND));
 
+    @Test
     public void testValidateConversionErrorParameters() {
         TextField tf = new TextField();
         tf.setConverter(new StringToIntegerConverter());
@@ -37,6 +39,7 @@ public class AbsFieldValueConversionErrorTest extends TestCase {
 
     }
 
+    @Test
     public void testConvertToModelConversionErrorParameters() {
         TextField tf = new TextField();
         tf.setConverter(new StringToIntegerConverter());
@@ -54,6 +57,7 @@ public class AbsFieldValueConversionErrorTest extends TestCase {
 
     }
 
+    @Test
     public void testNullConversionMessages() {
         TextField tf = new TextField();
         tf.setConverter(new StringToIntegerConverter());
@@ -69,6 +73,7 @@ public class AbsFieldValueConversionErrorTest extends TestCase {
 
     }
 
+    @Test
     public void testDefaultConversionErrorMessage() {
         TextField tf = new TextField();
         tf.setConverter(new StringToIntegerConverter());
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java
index 94ff10926f..3456e7c09e 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java
@@ -1,8 +1,10 @@
 package com.vaadin.tests.server.component.abstractfield;
 
-import java.util.Locale;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
-import junit.framework.TestCase;
+import java.util.Locale;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -21,7 +23,7 @@ import com.vaadin.tests.util.AlwaysLockedVaadinSession;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.TextField;
 
-public class AbsFieldValueConversionsTest extends TestCase {
+public class AbsFieldValueConversionsTest {
 
     Person paulaBean = new Person("Paula", "Brilliant", "paula@brilliant.com",
             34, Sex.FEMALE, new Address("Paula street 1", 12345, "P-town",
@@ -33,6 +35,7 @@ public class AbsFieldValueConversionsTest extends TestCase {
      */
     private static final char FORMATTED_SPACE = 160;
 
+    @Test
     public void testWithoutConversion() {
         TextField tf = new TextField();
         tf.setPropertyDataSource(new MethodProperty<String>(paulaBean,
@@ -45,6 +48,7 @@ public class AbsFieldValueConversionsTest extends TestCase {
         assertEquals("abc", paulaBean.getFirstName());
     }
 
+    @Test
     public void testNonmodifiedBufferedFieldConversion() {
         VaadinSession.setCurrent(new AlwaysLockedVaadinSession(null));
         TextField tf = new TextField("salary");
@@ -61,6 +65,7 @@ public class AbsFieldValueConversionsTest extends TestCase {
 
     }
 
+    @Test
     public void testModifiedBufferedFieldConversion() {
         VaadinSession.setCurrent(new AlwaysLockedVaadinSession(null));
         TextField tf = new TextField("salary");
@@ -80,6 +85,7 @@ public class AbsFieldValueConversionsTest extends TestCase {
         assertEquals("123,123", tf.getValue());
     }
 
+    @Test
     public void testStringIdentityConversion() {
         TextField tf = new TextField();
         tf.setConverter(new Converter<String, String>() {
@@ -116,6 +122,7 @@ public class AbsFieldValueConversionsTest extends TestCase {
         assertEquals("abc", paulaBean.getFirstName());
     }
 
+    @Test
     public void testIntegerStringConversion() {
         TextField tf = new TextField();
 
@@ -131,6 +138,7 @@ public class AbsFieldValueConversionsTest extends TestCase {
         assertEquals("42", tf.getValue());
     }
 
+    @Test
     public void testChangeReadOnlyFieldLocale() {
         VaadinSession.setCurrent(new AlwaysLockedVaadinSession(null));
 
@@ -147,6 +155,7 @@ public class AbsFieldValueConversionsTest extends TestCase {
                 tf.getValue());
     }
 
+    @Test
     public void testBooleanNullConversion() {
         CheckBox cb = new CheckBox();
         cb.setConverter(new Converter<Boolean, Boolean>() {
@@ -219,6 +228,7 @@ public class AbsFieldValueConversionsTest extends TestCase {
 
     }
 
+    @Test
     public void testNumberDoubleConverterChange() {
         final VaadinSession a = new AlwaysLockedVaadinSession(null);
         VaadinSession.setCurrent(a);
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.java
index 96ed8b6f1e..96ed8b6f1e 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldListenersTest.java
index def3ceb643..d23d63e3e9 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldListenersTest.java
@@ -1,5 +1,7 @@
 package com.vaadin.tests.server.component.abstractfield;
 
+import org.junit.Test;
+
 import com.vaadin.data.Property.ReadOnlyStatusChangeEvent;
 import com.vaadin.data.Property.ReadOnlyStatusChangeListener;
 import com.vaadin.data.Property.ValueChangeEvent;
@@ -8,12 +10,15 @@ import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.CheckBox;
 
 public class AbstractFieldListenersTest extends AbstractListenerMethodsTestBase {
+
+    @Test
     public void testReadOnlyStatusChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(CheckBox.class,
                 ReadOnlyStatusChangeEvent.class,
                 ReadOnlyStatusChangeListener.class);
     }
 
+    @Test
     public void testValueChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(CheckBox.class, ValueChangeEvent.class,
                 ValueChangeListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java
index 68e198c37a..31158b1f09 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java
@@ -1,9 +1,11 @@
 package com.vaadin.tests.server.component.abstractfield;
 
+import static org.junit.Assert.assertEquals;
+
 import java.math.BigDecimal;
 import java.util.Locale;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import com.vaadin.data.util.MethodProperty;
 import com.vaadin.server.VaadinSession;
@@ -14,7 +16,7 @@ import com.vaadin.tests.data.bean.Sex;
 import com.vaadin.tests.util.AlwaysLockedVaadinSession;
 import com.vaadin.ui.TextField;
 
-public class DefaultConverterFactoryTest extends TestCase {
+public class DefaultConverterFactoryTest {
 
     public static class FloatBean {
         float f1;
@@ -80,6 +82,7 @@ public class DefaultConverterFactoryTest extends TestCase {
         paulaBean.setRent(rent);
     }
 
+    @Test
     public void testFloatConversion() {
         VaadinSession sess = new AlwaysLockedVaadinSession(null);
         VaadinSession.setCurrent(sess);
@@ -95,6 +98,7 @@ public class DefaultConverterFactoryTest extends TestCase {
         assertEquals(24f, tf.getPropertyDataSource().getValue());
     }
 
+    @Test
     public void testLongConversion() {
         VaadinSession sess = new AlwaysLockedVaadinSession(null);
         VaadinSession.setCurrent(sess);
@@ -110,6 +114,7 @@ public class DefaultConverterFactoryTest extends TestCase {
         assertEquals(1982739187239L, tf.getPropertyDataSource().getValue());
     }
 
+    @Test
     public void testDefaultNumberConversion() {
         VaadinSession app = new AlwaysLockedVaadinSession(null);
         VaadinSession.setCurrent(app);
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java
index f547f2c66b..f547f2c66b 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java
index 87f810d562..87f810d562 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutListenersTest.java
index e7393e5f7d..e7393e5f7d 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutListenersTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java
index 36e54a2826..36e54a2826 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/LayoutSettingsOnReplaceTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/LayoutSettingsOnReplaceTest.java
index 9d1972c232..9d1972c232 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/LayoutSettingsOnReplaceTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractorderedlayout/LayoutSettingsOnReplaceTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java
index 6800320753..6800320753 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractselect/AbstractSelectListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectListenersTest.java
index ee806cb5f7..cedc582b57 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractselect/AbstractSelectListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectListenersTest.java
@@ -1,5 +1,7 @@
 package com.vaadin.tests.server.component.abstractselect;
 
+import org.junit.Test;
+
 import com.vaadin.data.Container.ItemSetChangeEvent;
 import com.vaadin.data.Container.ItemSetChangeListener;
 import com.vaadin.data.Container.PropertySetChangeEvent;
@@ -9,11 +11,14 @@ import com.vaadin.ui.ComboBox;
 
 public class AbstractSelectListenersTest extends
         AbstractListenerMethodsTestBase {
+
+    @Test
     public void testItemSetChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(ComboBox.class, ItemSetChangeEvent.class,
                 ItemSetChangeListener.class);
     }
 
+    @Test
     public void testPropertySetChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(ComboBox.class, PropertySetChangeEvent.class,
                 PropertySetChangeListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractselect/AbstractSelectStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectStateTest.java
index 52b215f4c8..52b215f4c8 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractselect/AbstractSelectStateTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectStateTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTests.java b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java
index 509e46c278..1b8b2f3bef 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTests.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java
@@ -22,7 +22,7 @@ import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.design.DeclarativeTestBase;
 import com.vaadin.ui.OptionGroup;
 
-public class OptionGroupDeclarativeTests extends
+public class OptionGroupDeclarativeTest extends
         DeclarativeTestBase<OptionGroup> {
 
     private OptionGroup og;
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractselect/OptionGroupTests.java b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupTest.java
index c4a3d73652..9a20d2fd79 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractselect/OptionGroupTests.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupTest.java
@@ -10,7 +10,7 @@ import org.junit.Test;
 
 import com.vaadin.ui.OptionGroup;
 
-public class OptionGroupTests {
+public class OptionGroupTest {
 
     private OptionGroup optionGroup;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/RemoveFromParentLockingTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/RemoveFromParentLockingTest.java
index 2334542676..c8db6ac292 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/RemoveFromParentLockingTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/RemoveFromParentLockingTest.java
@@ -18,7 +18,9 @@ package com.vaadin.tests.server.component.abstractsinglecomponentcontainer;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
+import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.server.VaadinRequest;
@@ -28,6 +30,13 @@ import com.vaadin.ui.VerticalLayout;
 
 public class RemoveFromParentLockingTest {
 
+    @Before
+    @After
+    public void cleanCurrentSession()
+    {
+        VaadinSession.setCurrent(null);
+    }
+
     private static VerticalLayout createTestComponent() {
         VaadinSession session = new VaadinSession(null) {
             private final ReentrantLock lock = new ReentrantLock();
@@ -102,8 +111,6 @@ public class RemoveFromParentLockingTest {
                     "Cannot remove from parent when the session is not locked."
                             + " Furthermore, there is another locked session, indicating that the component might be about to be moved from one session to another.",
                     e.getMessage());
-        } finally {
-            VaadinSession.setCurrent(null);
         }
     }
 
@@ -121,8 +128,6 @@ public class RemoveFromParentLockingTest {
             notLockedComponent.addComponent(lockedComponent);
         } catch (AssertionError e) {
             // All is fine, don't care about the exact wording in this case
-        } finally {
-            VaadinSession.setCurrent(null);
         }
     }
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/SetParentAsContentTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/SetParentAsContentTest.java
index b84794d58a..b84794d58a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/SetParentAsContentTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/SetParentAsContentTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java
index 02094cb611..02094cb611 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelListenersTest.java
index 5dd2f406bc..5dd2f406bc 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelListenersTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldDeclarativeTest.java
index 275cca33a0..275cca33a0 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java
index 0896b5d649..0641489e0e 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java
@@ -1,5 +1,7 @@
 package com.vaadin.tests.server.component.abstracttextfield;
 
+import org.junit.Test;
+
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
@@ -11,16 +13,20 @@ import com.vaadin.ui.TextField;
 
 public class AbstractTextFieldListenersTest extends
         AbstractListenerMethodsTestBase {
+
+    @Test
     public void testTextChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(TextField.class, TextChangeEvent.class,
                 TextChangeListener.class);
     }
 
+    @Test
     public void testFocusListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(TextField.class, FocusEvent.class,
                 FocusListener.class);
     }
 
+    @Test
     public void testBlurListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(TextField.class, BlurEvent.class,
                 BlurListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/audio/AudioDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/audio/AudioDeclarativeTest.java
index f9bfd2d316..f9bfd2d316 100644
--- a/server/tests/src/com/vaadin/tests/server/component/audio/AudioDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/audio/AudioDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/audio/AudioStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/audio/AudioStateTest.java
index d18127791e..d18127791e 100644
--- a/server/tests/src/com/vaadin/tests/server/component/audio/AudioStateTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/audio/AudioStateTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/audio/VideoDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/audio/VideoDeclarativeTest.java
index dafff32be2..dafff32be2 100644
--- a/server/tests/src/com/vaadin/tests/server/component/audio/VideoDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/audio/VideoDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/browserframe/BrowserFrameDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/browserframe/BrowserFrameDeclarativeTest.java
index b62499a28e..b62499a28e 100644
--- a/server/tests/src/com/vaadin/tests/server/component/browserframe/BrowserFrameDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/browserframe/BrowserFrameDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/button/ButtonClickTest.java b/server/src/test/java/com/vaadin/tests/server/component/button/ButtonClickTest.java
index 6283ccf6af..6283ccf6af 100644
--- a/server/tests/src/com/vaadin/tests/server/component/button/ButtonClickTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/button/ButtonClickTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/button/ButtonDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/button/ButtonDeclarativeTest.java
index 439a0d5be0..439a0d5be0 100644
--- a/server/tests/src/com/vaadin/tests/server/component/button/ButtonDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/button/ButtonDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/button/ButtonListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/button/ButtonListenersTest.java
index 4478048b12..ad90883baa 100644
--- a/server/tests/src/com/vaadin/tests/server/component/button/ButtonListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/button/ButtonListenersTest.java
@@ -1,5 +1,7 @@
 package com.vaadin.tests.server.component.button;
 
+import org.junit.Test;
+
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
@@ -10,16 +12,20 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 
 public class ButtonListenersTest extends AbstractListenerMethodsTestBase {
+
+    @Test
     public void testFocusListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Button.class, FocusEvent.class,
                 FocusListener.class);
     }
 
+    @Test
     public void testBlurListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Button.class, BlurEvent.class,
                 BlurListener.class);
     }
 
+    @Test
     public void testClickListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Button.class, ClickEvent.class,
                 ClickListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java b/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java
index 1592fb6c38..1592fb6c38 100644
--- a/server/tests/src/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.java
index f0ee8f7298..f0ee8f7298 100644
--- a/server/tests/src/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java b/server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java
index 8a066497cd..4bcd5c7192 100644
--- a/server/tests/src/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java
@@ -15,11 +15,13 @@
  */
 package com.vaadin.tests.server.component.calendar;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.util.Date;
 import java.util.List;
 
-import junit.framework.TestCase;
-
+import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.data.Container.Indexed;
@@ -33,11 +35,11 @@ import com.vaadin.ui.components.calendar.ContainerEventProvider;
 import com.vaadin.ui.components.calendar.event.BasicEvent;
 import com.vaadin.ui.components.calendar.event.CalendarEvent;
 
-public class ContainerDataSourceTest extends TestCase {
+public class ContainerDataSourceTest {
 
     private Calendar calendar;
 
-    @Override
+    @Before
     public void setUp() {
         calendar = new Calendar();
     }
diff --git a/server/tests/src/com/vaadin/tests/server/component/calendar/ContainerEventProviderTest.java b/server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerEventProviderTest.java
index 63749a2fc9..63749a2fc9 100644
--- a/server/tests/src/com/vaadin/tests/server/component/calendar/ContainerEventProviderTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerEventProviderTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/checkbox/CheckboxDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/checkbox/CheckboxDeclarativeTest.java
index 760d8d2548..760d8d2548 100644
--- a/server/tests/src/com/vaadin/tests/server/component/checkbox/CheckboxDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/checkbox/CheckboxDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java
index 717ba1f45a..717ba1f45a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/colorpicker/ColorConversionsTest.java b/server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorConversionsTest.java
index 8c05e58b9c..8c05e58b9c 100644
--- a/server/tests/src/com/vaadin/tests/server/component/colorpicker/ColorConversionsTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorConversionsTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java
index fcc7eb97a1..fcc7eb97a1 100644
--- a/server/tests/src/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/combobox/ComboBoxStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxStateTest.java
index 0908a355de..0908a355de 100644
--- a/server/tests/src/com/vaadin/tests/server/component/combobox/ComboBoxStateTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxStateTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java b/server/src/test/java/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java
index 441f743214..441f743214 100644
--- a/server/tests/src/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/csslayout/CssLayoutDeclarativeTest.java
index 31ee1a05f5..31ee1a05f5 100644
--- a/server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/csslayout/CssLayoutDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/csslayout/CssLayoutListenersTest.java
index e000df593b..e000df593b 100644
--- a/server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/csslayout/CssLayoutListenersTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/customlayout/CustomLayoutDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/customlayout/CustomLayoutDeclarativeTest.java
index 6ee3490c05..6ee3490c05 100644
--- a/server/tests/src/com/vaadin/tests/server/component/customlayout/CustomLayoutDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/customlayout/CustomLayoutDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/customlayout/CustomLayoutTest.java b/server/src/test/java/com/vaadin/tests/server/component/customlayout/CustomLayoutTest.java
index 4d327e70a6..4d327e70a6 100644
--- a/server/tests/src/com/vaadin/tests/server/component/customlayout/CustomLayoutTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/customlayout/CustomLayoutTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java b/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java
index f5467b2d18..4fcf1766fe 100644
--- a/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java
@@ -19,7 +19,8 @@ package com.vaadin.tests.server.component.datefield;
 import java.util.Date;
 import java.util.Locale;
 
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.util.ObjectProperty;
@@ -27,12 +28,12 @@ import com.vaadin.data.util.converter.Converter;
 import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.DateField;
 
-public class DateFieldConverterTest extends TestCase {
+public class DateFieldConverterTest {
 
     private Property<Long> date;
     private DateField datefield;
 
-    @Override
+    @Before
     public void setUp() {
         date = new ObjectProperty<Long>(0L);
         datefield = new DateField();
@@ -69,6 +70,7 @@ public class DateFieldConverterTest extends TestCase {
     /*
      * See #12193.
      */
+    @Test
     public void testResolution() {
         datefield.setValue(new Date(110, 0, 1));
         datefield.setResolution(Resolution.MINUTE);
diff --git a/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.java
index 54ac9a3a4b..54ac9a3a4b 100644
--- a/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldListenersTest.java
index 6d774366a9..8885573bd8 100644
--- a/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldListenersTest.java
@@ -1,5 +1,7 @@
 package com.vaadin.tests.server.component.datefield;
 
+import org.junit.Test;
+
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
@@ -8,11 +10,14 @@ import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.DateField;
 
 public class DateFieldListenersTest extends AbstractListenerMethodsTestBase {
+
+    @Test
     public void testFocusListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(DateField.class, FocusEvent.class,
                 FocusListener.class);
     }
 
+    @Test
     public void testBlurListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(DateField.class, BlurEvent.class,
                 BlurListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/datefield/InlineDateFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/datefield/InlineDateFieldDeclarativeTest.java
index 04468c658a..04468c658a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/datefield/InlineDateFieldDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/datefield/InlineDateFieldDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java
index b637d10c9e..b637d10c9e 100644
--- a/server/tests/src/com/vaadin/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/datefield/ResolutionTest.java b/server/src/test/java/com/vaadin/tests/server/component/datefield/ResolutionTest.java
index ae72f9c743..a23c60b106 100644
--- a/server/tests/src/com/vaadin/tests/server/component/datefield/ResolutionTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/datefield/ResolutionTest.java
@@ -2,13 +2,14 @@ package com.vaadin.tests.server.component.datefield;
 
 import java.util.ArrayList;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.util.TestUtil;
 
-public class ResolutionTest extends TestCase {
+public class ResolutionTest {
 
+    @Test
     public void testResolutionHigherOrEqualToYear() {
         Iterable<Resolution> higherOrEqual = Resolution
                 .getResolutionsHigherOrEqualTo(Resolution.YEAR);
@@ -17,6 +18,7 @@ public class ResolutionTest extends TestCase {
         TestUtil.assertIterableEquals(expected, higherOrEqual);
     }
 
+    @Test
     public void testResolutionHigherOrEqualToDay() {
         Iterable<Resolution> higherOrEqual = Resolution
                 .getResolutionsHigherOrEqualTo(Resolution.DAY);
@@ -28,6 +30,7 @@ public class ResolutionTest extends TestCase {
 
     }
 
+    @Test
     public void testResolutionLowerThanDay() {
         Iterable<Resolution> higherOrEqual = Resolution
                 .getResolutionsLowerThan(Resolution.DAY);
@@ -39,6 +42,7 @@ public class ResolutionTest extends TestCase {
 
     }
 
+    @Test
     public void testResolutionLowerThanSecond() {
         Iterable<Resolution> higherOrEqual = Resolution
                 .getResolutionsLowerThan(Resolution.SECOND);
@@ -46,6 +50,7 @@ public class ResolutionTest extends TestCase {
         TestUtil.assertIterableEquals(expected, higherOrEqual);
     }
 
+    @Test
     public void testResolutionLowerThanYear() {
         Iterable<Resolution> higherOrEqual = Resolution
                 .getResolutionsLowerThan(Resolution.YEAR);
diff --git a/server/tests/src/com/vaadin/tests/server/component/embedded/EmbeddedListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/embedded/EmbeddedListenersTest.java
index b41d5e9e13..b41d5e9e13 100644
--- a/server/tests/src/com/vaadin/tests/server/component/embedded/EmbeddedListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/embedded/EmbeddedListenersTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java
index 90c079b35c..90c079b35c 100644
--- a/server/tests/src/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java
index cb29a84aa8..cb29a84aa8 100644
--- a/server/tests/src/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java
index d77a2e190b..d77a2e190b 100644
--- a/server/tests/src/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java
index 60a92d7d73..60a92d7d73 100644
--- a/server/tests/src/com/vaadin/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java
index 029dcc66a3..029dcc66a3 100644
--- a/server/tests/src/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/flash/FlashDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/flash/FlashDeclarativeTest.java
index 0c2deaaf0a..0c2deaaf0a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/flash/FlashDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/flash/FlashDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/form/FormTest.java b/server/src/test/java/com/vaadin/tests/server/component/form/FormTest.java
index 2075f7b115..2075f7b115 100644
--- a/server/tests/src/com/vaadin/tests/server/component/form/FormTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/form/FormTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.java
index 70c73eb516..70c73eb516 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/GridChildren.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java
index 7af1cfef69..65a4cfe564 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/GridChildren.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java
@@ -26,7 +26,7 @@ import com.vaadin.ui.Grid.FooterCell;
 import com.vaadin.ui.Grid.HeaderCell;
 import com.vaadin.ui.Label;
 
-public class GridChildren {
+public class GridChildrenTest {
 
     @Test
     public void componentsInMergedHeader() {
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java
index 97f0355b4b..97f0355b4b 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/GridColumns.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java
index 83e9f21756..30db0e9fbe 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/GridColumns.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java
@@ -50,7 +50,7 @@ import com.vaadin.ui.Grid.ColumnResizeEvent;
 import com.vaadin.ui.Grid.ColumnResizeListener;
 import com.vaadin.ui.TextField;
 
-public class GridColumns {
+public class GridColumnsTest {
 
     private Grid grid;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java
index cdfd2328dc..cdfd2328dc 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/GridContainerTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java
index 079487d01f..079487d01f 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/GridContainerTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/GridEditorTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java
index b70f17779a..b70f17779a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/GridEditorTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/GridExtensionTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java
index d9db217aa3..d9db217aa3 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/GridExtensionTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/GridSelection.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java
index dc641965ba..85f51c35fb 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/GridSelection.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java
@@ -31,7 +31,7 @@ import com.vaadin.ui.Grid;
 import com.vaadin.ui.Grid.SelectionMode;
 import com.vaadin.ui.Grid.SelectionModel;
 
-public class GridSelection {
+public class GridSelectionTest {
 
     private static class MockSelectionChangeListener implements
             SelectionListener {
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/GridStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridStateTest.java
index 567fad52af..567fad52af 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/GridStateTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridStateTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java
index 4031886e7a..4031886e7a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java
index 9b327a2f22..9b327a2f22 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.java
index c217efb935..c217efb935 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/TestGrid.java b/server/src/test/java/com/vaadin/tests/server/component/grid/TestGrid.java
index 97fb2d8309..97fb2d8309 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/TestGrid.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/TestGrid.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java
index 21892634a0..21892634a0 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
index 41f967ac16..41f967ac16 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java
index 9424d89ecf..9424d89ecf 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java
index d64a877d81..d64a877d81 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java
index df8e864309..df8e864309 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java
index d60df4c23b..d60df4c23b 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/sort/SortTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/sort/SortTest.java
index 2a682df2e5..2a682df2e5 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/sort/SortTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/sort/SortTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/gridlayout/DefaultAlignmentTest.java b/server/src/test/java/com/vaadin/tests/server/component/gridlayout/DefaultAlignmentTest.java
index 9b6368474f..9b6368474f 100644
--- a/server/tests/src/com/vaadin/tests/server/component/gridlayout/DefaultAlignmentTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/gridlayout/DefaultAlignmentTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/gridlayout/GridLayoutDeclarativeTest.java
index e3975e41a8..e3975e41a8 100644
--- a/server/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/gridlayout/GridLayoutDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/gridlayout/GridLayoutListenersTest.java
index ed18a24608..ed18a24608 100644
--- a/server/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/gridlayout/GridLayoutListenersTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutTest.java b/server/src/test/java/com/vaadin/tests/server/component/gridlayout/GridLayoutTest.java
index 1eabf2fb62..1eabf2fb62 100644
--- a/server/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/gridlayout/GridLayoutTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/image/ImageDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/image/ImageDeclarativeTest.java
index 562c629209..562c629209 100644
--- a/server/tests/src/com/vaadin/tests/server/component/image/ImageDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/image/ImageDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/label/LabelConvertersTest.java b/server/src/test/java/com/vaadin/tests/server/component/label/LabelConvertersTest.java
index 26961dc372..26961dc372 100644
--- a/server/tests/src/com/vaadin/tests/server/component/label/LabelConvertersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/label/LabelConvertersTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/label/LabelDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/label/LabelDeclarativeTest.java
index 7a7f4bd844..7a7f4bd844 100644
--- a/server/tests/src/com/vaadin/tests/server/component/label/LabelDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/label/LabelDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/label/LabelListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java
index 4287d58d9c..51cf7bf1ff 100644
--- a/server/tests/src/com/vaadin/tests/server/component/label/LabelListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java
@@ -7,6 +7,7 @@ import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
 import org.easymock.EasyMock;
+import org.junit.Test;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeListener;
@@ -15,11 +16,14 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Label.ValueChangeEvent;
 
 public class LabelListenersTest extends AbstractListenerMethodsTestBase {
+
+    @Test
     public void testValueChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Label.class, ValueChangeEvent.class,
                 ValueChangeListener.class);
     }
 
+    @Test
     public void testValueChangeFiredWhenSettingValue() {
         Label underTest = new Label();
 
@@ -39,6 +43,7 @@ public class LabelListenersTest extends AbstractListenerMethodsTestBase {
 
     }
 
+    @Test
     public void testValueChangeFiredWhenSettingPropertyDataSource() {
         // setup
         Label underTest = new Label();
@@ -63,6 +68,7 @@ public class LabelListenersTest extends AbstractListenerMethodsTestBase {
 
     }
 
+    @Test
     public void testValueChangeNotFiredWhenNotSettingValue() {
         Label underTest = new Label();
         // setup the mock listener
@@ -75,6 +81,7 @@ public class LabelListenersTest extends AbstractListenerMethodsTestBase {
         verify(mockListener);
     }
 
+    @Test
     public void testNoValueChangeFiredWhenSettingPropertyDataSourceToNull() {
         Label underTest = new Label();
         // setup the mock Listener
diff --git a/server/tests/src/com/vaadin/tests/server/component/link/LinkDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/link/LinkDeclarativeTest.java
index da7227224d..da7227224d 100644
--- a/server/tests/src/com/vaadin/tests/server/component/link/LinkDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/link/LinkDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/listselect/ListSelectDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectDeclarativeTest.java
index d0fa400d31..d0fa400d31 100644
--- a/server/tests/src/com/vaadin/tests/server/component/listselect/ListSelectDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/listselect/ListSelectStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectStateTest.java
index 01dc71d96a..01dc71d96a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/listselect/ListSelectStateTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectStateTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/loginform/LoginFormListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/loginform/LoginFormListenersTest.java
index 1c06d2652a..1c06d2652a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/loginform/LoginFormListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/loginform/LoginFormListenersTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/menubar/MenuBarIdsTest.java b/server/src/test/java/com/vaadin/tests/server/component/menubar/MenuBarIdsTest.java
index 68007bd870..105cf6660a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/menubar/MenuBarIdsTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/menubar/MenuBarIdsTest.java
@@ -3,13 +3,15 @@ package com.vaadin.tests.server.component.menubar;
 import java.util.HashSet;
 import java.util.Set;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 import com.vaadin.ui.MenuBar;
 import com.vaadin.ui.MenuBar.Command;
 import com.vaadin.ui.MenuBar.MenuItem;
 
-public class MenuBarIdsTest extends TestCase implements Command {
+public class MenuBarIdsTest implements Command {
 
     private MenuItem lastSelectedItem;
     private MenuItem menuFile;
@@ -25,7 +27,7 @@ public class MenuBarIdsTest extends TestCase implements Command {
 
     private MenuBar menuBar;
 
-    @Override
+    @Before
     public void setUp() {
         menuBar = new MenuBar();
         menuFile = menuBar.addItem("File", this);
@@ -51,6 +53,7 @@ public class MenuBarIdsTest extends TestCase implements Command {
         menuItems.add(menuFileExit);
     }
 
+    @Test
     public void testMenubarIdUniqueness() {
         // Ids within a menubar must be unique
         assertUniqueIds(menuBar);
@@ -78,7 +81,7 @@ public class MenuBarIdsTest extends TestCase implements Command {
     private static void assertUniqueIds(Set<Object> ids, MenuItem item) {
         int id = item.getId();
         System.out.println("Item " + item.getText() + ", id: " + id);
-        assertFalse(ids.contains(id));
+        Assert.assertFalse(ids.contains(id));
         ids.add(id);
         if (item.getChildren() != null) {
             for (MenuItem subItem : item.getChildren()) {
@@ -89,7 +92,8 @@ public class MenuBarIdsTest extends TestCase implements Command {
 
     @Override
     public void menuSelected(MenuItem selectedItem) {
-        assertNull("lastSelectedItem was not cleared before selecting an item",
+        Assert.assertNull(
+                "lastSelectedItem was not cleared before selecting an item",
                 lastSelectedItem);
 
         lastSelectedItem = selectedItem;
diff --git a/server/tests/src/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java
index 511f411a93..511f411a93 100644
--- a/server/tests/src/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/optiongroup/OptionGroupListenersTest.java
index c2dc175c75..2c2a8a81fb 100644
--- a/server/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/optiongroup/OptionGroupListenersTest.java
@@ -1,5 +1,7 @@
 package com.vaadin.tests.server.component.optiongroup;
 
+import org.junit.Test;
+
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
@@ -8,11 +10,14 @@ import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.OptionGroup;
 
 public class OptionGroupListenersTest extends AbstractListenerMethodsTestBase {
+
+    @Test
     public void testFocusListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(OptionGroup.class, FocusEvent.class,
                 FocusListener.class);
     }
 
+    @Test
     public void testBlurListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(OptionGroup.class, BlurEvent.class,
                 BlurListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/optiongroup/OptionGroupStateTest.java
index 59ff432cad..59ff432cad 100644
--- a/server/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupStateTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/optiongroup/OptionGroupStateTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/orderedlayout/DefaultAlignmentTest.java b/server/src/test/java/com/vaadin/tests/server/component/orderedlayout/DefaultAlignmentTest.java
index 7560c21adb..7560c21adb 100644
--- a/server/tests/src/com/vaadin/tests/server/component/orderedlayout/DefaultAlignmentTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/orderedlayout/DefaultAlignmentTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/orderedlayout/OrderedLayoutTest.java b/server/src/test/java/com/vaadin/tests/server/component/orderedlayout/OrderedLayoutTest.java
index 3b3dfb94d8..b3bca12521 100644
--- a/server/tests/src/com/vaadin/tests/server/component/orderedlayout/OrderedLayoutTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/orderedlayout/OrderedLayoutTest.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.server.component.orderedlayout;
 
 import java.util.Iterator;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Component;
@@ -10,12 +10,14 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 
-public class OrderedLayoutTest extends TestCase {
+public class OrderedLayoutTest {
 
+    @Test
     public void testVLIteration() {
         testIndexing(new VerticalLayout(), 10);
     }
 
+    @Test
     public void testHLIteration() {
         testIndexing(new HorizontalLayout(), 12);
     }
diff --git a/server/tests/src/com/vaadin/tests/server/component/panel/PanelDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/panel/PanelDeclarativeTest.java
index 39191f0665..39191f0665 100644
--- a/server/tests/src/com/vaadin/tests/server/component/panel/PanelDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/panel/PanelDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/panel/PanelListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/panel/PanelListenersTest.java
index 929553a682..929553a682 100644
--- a/server/tests/src/com/vaadin/tests/server/component/panel/PanelListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/panel/PanelListenersTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java
index fcb2453057..fcb2453057 100644
--- a/server/tests/src/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/popupview/PopupViewDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/popupview/PopupViewDeclarativeTest.java
index 300a993064..300a993064 100644
--- a/server/tests/src/com/vaadin/tests/server/component/popupview/PopupViewDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/popupview/PopupViewDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/popupview/PopupViewListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/popupview/PopupViewListenersTest.java
index 06782818a8..06782818a8 100644
--- a/server/tests/src/com/vaadin/tests/server/component/popupview/PopupViewListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/popupview/PopupViewListenersTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java
index 36ede0a321..36ede0a321 100644
--- a/server/tests/src/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java
index 37d27af197..37d27af197 100644
--- a/server/tests/src/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/richtextarea/RichTextAreaStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaStateTest.java
index d1c0f8fa1e..d1c0f8fa1e 100644
--- a/server/tests/src/com/vaadin/tests/server/component/richtextarea/RichTextAreaStateTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaStateTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/select/SelectListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/select/SelectListenersTest.java
index 9a2a5f1f50..1b0ff1caff 100644
--- a/server/tests/src/com/vaadin/tests/server/component/select/SelectListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/select/SelectListenersTest.java
@@ -1,5 +1,7 @@
 package com.vaadin.tests.server.component.select;
 
+import org.junit.Test;
+
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
@@ -8,11 +10,14 @@ import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.Select;
 
 public class SelectListenersTest extends AbstractListenerMethodsTestBase {
+
+    @Test
     public void testFocusListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Select.class, FocusEvent.class,
                 FocusListener.class);
     }
 
+    @Test
     public void testBlurListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Select.class, BlurEvent.class,
                 BlurListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/slider/SliderDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/slider/SliderDeclarativeTest.java
index dcfb415810..dcfb415810 100644
--- a/server/tests/src/com/vaadin/tests/server/component/slider/SliderDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/slider/SliderDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/slider/SliderTest.java b/server/src/test/java/com/vaadin/tests/server/component/slider/SliderTest.java
index 8c093fdf72..8c093fdf72 100644
--- a/server/tests/src/com/vaadin/tests/server/component/slider/SliderTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/slider/SliderTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java
index 03f50c6b5f..03f50c6b5f 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/FooterTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/FooterTest.java
index f9d373e864..d13a4a287e 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/FooterTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/FooterTest.java
@@ -1,6 +1,12 @@
 package com.vaadin.tests.server.component.table;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
 
 import com.vaadin.data.Container;
 import com.vaadin.data.Item;
@@ -11,11 +17,12 @@ import com.vaadin.ui.Table;
  * Test case for testing the footer API
  * 
  */
-public class FooterTest extends TestCase {
+public class FooterTest {
 
     /**
      * Tests if setting the footer visibility works properly
      */
+    @Test
     public void testFooterVisibility() {
         Table table = new Table("Test table", createContainer());
 
@@ -31,6 +38,7 @@ public class FooterTest extends TestCase {
     /**
      * Tests adding footers to the columns
      */
+    @Test
     public void testAddingFooters() {
         Table table = new Table("Test table", createContainer());
 
@@ -54,6 +62,7 @@ public class FooterTest extends TestCase {
     /**
      * Test removing footers
      */
+    @Test
     public void testRemovingFooters() {
         Table table = new Table("Test table", createContainer());
         table.setColumnFooter("col1", "Footer1");
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/MultipleSelectionTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/MultipleSelectionTest.java
index ceb4c865d2..a7973b45f0 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/MultipleSelectionTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/MultipleSelectionTest.java
@@ -1,20 +1,24 @@
 package com.vaadin.tests.server.component.table;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.util.Arrays;
 import java.util.Set;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import com.vaadin.data.Container;
 import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.shared.ui.MultiSelectMode;
 import com.vaadin.ui.Table;
 
-public class MultipleSelectionTest extends TestCase {
+public class MultipleSelectionTest {
 
     /**
      * Tests weather the multiple select mode is set when using Table.set
      */
+    @Test
     @SuppressWarnings("unchecked")
     public void testSetMultipleItems() {
         Table table = new Table("", createTestContainer());
@@ -33,6 +37,7 @@ public class MultipleSelectionTest extends TestCase {
      * Tests setting the multiselect mode of the Table. The multiselect mode
      * affects how mouse selection is made in the table by the user.
      */
+    @Test
     public void testSetMultiSelectMode() {
         Table table = new Table("", createTestContainer());
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TableColumnAlignmentsTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableColumnAlignmentsTest.java
index 69aaf2e3a9..69aaf2e3a9 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableColumnAlignmentsTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableColumnAlignmentsTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TableContextClickTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableContextClickTest.java
index d96a5d626a..d96a5d626a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableContextClickTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableContextClickTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TableDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java
index 7de6eaf2ef..7de6eaf2ef 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.java
index 1f0b3d924c..1f0b3d924c 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TableGeneratorTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableGeneratorTest.java
index f3c2589f4a..f3c2589f4a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableGeneratorTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableGeneratorTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TableListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableListenersTest.java
index fce514954a..ac6fb171e3 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableListenersTest.java
@@ -1,5 +1,7 @@
 package com.vaadin.tests.server.component.table;
 
+import org.junit.Test;
+
 import com.vaadin.event.ItemClickEvent;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
@@ -14,26 +16,32 @@ import com.vaadin.ui.Table.HeaderClickEvent;
 import com.vaadin.ui.Table.HeaderClickListener;
 
 public class TableListenersTest extends AbstractListenerMethodsTestBase {
+
+    @Test
     public void testColumnResizeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Table.class, ColumnResizeEvent.class,
                 ColumnResizeListener.class);
     }
 
+    @Test
     public void testItemClickListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Table.class, ItemClickEvent.class,
                 ItemClickListener.class);
     }
 
+    @Test
     public void testFooterClickListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Table.class, FooterClickEvent.class,
                 FooterClickListener.class);
     }
 
+    @Test
     public void testHeaderClickListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Table.class, HeaderClickEvent.class,
                 HeaderClickListener.class);
     }
 
+    @Test
     public void testColumnReorderListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Table.class, ColumnReorderEvent.class,
                 ColumnReorderListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java
index 7fd5bc67f6..0bcc71630e 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java
@@ -15,6 +15,10 @@
  */
 package com.vaadin.tests.server.component.table;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.lang.reflect.Field;
 import java.util.Collection;
 import java.util.HashMap;
@@ -23,8 +27,7 @@ import java.util.Locale;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import junit.framework.TestCase;
-
+import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.data.Container;
@@ -34,12 +37,7 @@ import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.data.util.converter.Converter;
 import com.vaadin.ui.Table;
 
-/**
- * 
- * @since
- * @author Vaadin Ltd
- */
-public class TablePropertyValueConverterTest extends TestCase {
+public class TablePropertyValueConverterTest {
     protected TestableTable table;
     protected Collection<?> initialProperties;
 
@@ -227,7 +225,7 @@ public class TablePropertyValueConverterTest extends TestCase {
                 DerivedClass.class.isAssignableFrom(BaseClass.class));
     }
 
-    @Override
+    @Before
     public void setUp() {
         table = new TestableTable("Test table", createContainer(new String[] {
                 "col1", "col2", "col3" }));
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TableSelectable.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableSelectableTest.java
index 1af99a08eb..2ec8ccec81 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableSelectable.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableSelectableTest.java
@@ -27,7 +27,7 @@ import com.vaadin.ui.Table;
  * 
  * @author Vaadin Ltd
  */
-public class TableSelectable {
+public class TableSelectableTest {
 
     @Test
     public void setSelectable_explicitSelectable_tableIsSelectable() {
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TableSerializationTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableSerializationTest.java
index 3f3c52d6c0..22f2381980 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableSerializationTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableSerializationTest.java
@@ -1,13 +1,13 @@
 package com.vaadin.tests.server.component.table;
 
-import junit.framework.TestCase;
-
 import org.apache.commons.lang.SerializationUtils;
+import org.junit.Test;
 
 import com.vaadin.ui.Table;
 
-public class TableSerializationTest extends TestCase {
+public class TableSerializationTest {
 
+    @Test
     public void testSerialization() {
         Table t = new Table();
         byte[] ser = SerializationUtils.serialize(t);
@@ -15,6 +15,7 @@ public class TableSerializationTest extends TestCase {
 
     }
 
+    @Test
     public void testSerializationWithRowHeaders() {
         Table t = new Table();
         t.setRowHeaderMode(Table.ROW_HEADER_MODE_EXPLICIT);
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TableStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableStateTest.java
index 7f951e0835..7f951e0835 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableStateTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableStateTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/table/TableVisibleColumnsTest.java b/server/src/test/java/com/vaadin/tests/server/component/table/TableVisibleColumnsTest.java
index e4f229590f..e4f229590f 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableVisibleColumnsTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableVisibleColumnsTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/tabsheet/TabSheetDeclarativeTest.java
index 22472850f6..22472850f6 100644
--- a/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/tabsheet/TabSheetDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/tabsheet/TabSheetListenersTest.java
index b1acf05d63..b1acf05d63 100644
--- a/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/tabsheet/TabSheetListenersTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetTest.java b/server/src/test/java/com/vaadin/tests/server/component/tabsheet/TabSheetTest.java
index a45b2c5587..a45b2c5587 100644
--- a/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/tabsheet/TabSheetTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/textarea/TextAreaDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/textarea/TextAreaDeclarativeTest.java
index fdf2599370..fdf2599370 100644
--- a/server/tests/src/com/vaadin/tests/server/component/textarea/TextAreaDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/textarea/TextAreaDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldDeclarativeTest.java
index 63ea493344..63ea493344 100644
--- a/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java b/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java
index 83c45f94db..76cd1c7a39 100644
--- a/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java
@@ -1,25 +1,25 @@
 package com.vaadin.tests.server.component.textfield;
 
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
 
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.data.validator.RangeValidator;
 import com.vaadin.tests.data.converter.ConverterFactoryTest.ConvertTo42;
 import com.vaadin.ui.TextField;
 
-public class TextFieldWithConverterAndValidatorTest extends TestCase {
+public class TextFieldWithConverterAndValidatorTest {
 
     private TextField field;
     private ObjectProperty<Integer> property;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
+    @Before
+    public void setUp() {
         field = new TextField();
         field.setInvalidAllowed(false);
     }
 
+    @Test
     public void testConvert42AndValidator() {
         property = new ObjectProperty<Integer>(123);
         field.setConverter(new ConvertTo42());
diff --git a/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatterTest.java b/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatterTest.java
index 8f2bec455b..68b9a2d2ce 100644
--- a/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatterTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatterTest.java
@@ -1,8 +1,12 @@
 package com.vaadin.tests.server.component.textfield;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.util.Collections;
 
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
@@ -11,7 +15,7 @@ import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.data.util.PropertyFormatter;
 import com.vaadin.ui.TextField;
 
-public class TextFieldWithPropertyFormatterTest extends TestCase {
+public class TextFieldWithPropertyFormatterTest {
 
     private static final String INPUT_VALUE = "foo";
     private static final String PARSED_VALUE = "BAR";
@@ -24,9 +28,8 @@ public class TextFieldWithPropertyFormatterTest extends TestCase {
     private int listenerCalled;
     private int repainted;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
 
         field = new TextField() {
             @Override
@@ -70,6 +73,7 @@ public class TextFieldWithPropertyFormatterTest extends TestCase {
         repainted = 0;
     }
 
+    @Test
     public void testWithServerApi() {
         checkInitialState();
 
@@ -93,6 +97,7 @@ public class TextFieldWithPropertyFormatterTest extends TestCase {
         assertEquals(FORMATTED_VALUE, field.getValue());
     }
 
+    @Test
     public void testWithSimulatedClientSideChange() {
         checkInitialState();
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java b/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java
index b2a51aad8b..859d69d26e 100644
--- a/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java
@@ -1,6 +1,9 @@
 package com.vaadin.tests.server.component.textfield;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.fail;
+
+import org.junit.Before;
+import org.junit.Test;
 
 import com.vaadin.data.Validator;
 import com.vaadin.data.Validator.InvalidValueException;
@@ -10,14 +13,13 @@ import com.vaadin.data.validator.RegexpValidator;
 import com.vaadin.data.validator.StringLengthValidator;
 import com.vaadin.ui.TextField;
 
-public class TextFieldWithValidatorTest extends TestCase {
+public class TextFieldWithValidatorTest {
 
     private TextField field;
     private ObjectProperty<String> property;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
 
         field = new TextField();
         field.setInvalidAllowed(false);
@@ -25,6 +27,7 @@ public class TextFieldWithValidatorTest extends TestCase {
         field.setPropertyDataSource(property);
     }
 
+    @Test
     public void testMultipleValidators() {
         field.addValidator(new StringLengthValidator(
                 "Length not between 1 and 3", 1, 3, false));
@@ -49,6 +52,7 @@ public class TextFieldWithValidatorTest extends TestCase {
         }
     }
 
+    @Test
     public void testRemoveValidator() {
         Validator validator1 = new StringLengthValidator(
                 "Length not between 1 and 3", 1, 3, false);
@@ -72,6 +76,7 @@ public class TextFieldWithValidatorTest extends TestCase {
         field.setValue("abcd");
     }
 
+    @Test
     public void testRemoveAllValidators() {
         Validator validator1 = new StringLengthValidator(
                 "Length not between 1 and 3", 1, 3, false);
@@ -88,6 +93,7 @@ public class TextFieldWithValidatorTest extends TestCase {
         field.setValue("abcd");
     }
 
+    @Test
     public void testEmailValidator() {
         field.addValidator(new EmailValidator("Invalid e-mail address"));
 
@@ -144,6 +150,7 @@ public class TextFieldWithValidatorTest extends TestCase {
         }
     }
 
+    @Test
     public void testRegexpValidator() {
         field.addValidator(new RegexpValidator("pattern", true,
                 "Validation failed"));
diff --git a/server/tests/src/com/vaadin/tests/server/component/tree/ListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/tree/ListenersTest.java
index c327fe8c5f..359aa8d480 100644
--- a/server/tests/src/com/vaadin/tests/server/component/tree/ListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/tree/ListenersTest.java
@@ -1,9 +1,12 @@
 package com.vaadin.tests.server.component.tree;
 
+import static org.junit.Assert.assertEquals;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
 
 import com.vaadin.ui.Tree;
 import com.vaadin.ui.Tree.CollapseEvent;
@@ -11,18 +14,18 @@ import com.vaadin.ui.Tree.CollapseListener;
 import com.vaadin.ui.Tree.ExpandEvent;
 import com.vaadin.ui.Tree.ExpandListener;
 
-public class ListenersTest extends TestCase implements ExpandListener,
-        CollapseListener {
+public class ListenersTest implements ExpandListener, CollapseListener {
     private int expandCalled;
     private int collapseCalled;
     private Object lastExpanded;
     private Object lastCollapsed;
 
-    @Override
-    protected void setUp() {
+    @Before
+    public void setUp() {
         expandCalled = 0;
     }
 
+    @Test
     public void testExpandListener() {
         Tree tree = createTree(10, 20, false);
         tree.addListener((ExpandListener) this);
@@ -93,6 +96,7 @@ public class ListenersTest extends TestCase implements ExpandListener,
         return tree;
     }
 
+    @Test
     public void testCollapseListener() {
         Tree tree = createTree(7, 15, true);
         tree.addListener((CollapseListener) this);
diff --git a/server/tests/src/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.java
index 8577ed1af8..8577ed1af8 100644
--- a/server/tests/src/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/tree/TreeListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/tree/TreeListenersTest.java
index 449f418596..ec10c4fe39 100644
--- a/server/tests/src/com/vaadin/tests/server/component/tree/TreeListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/tree/TreeListenersTest.java
@@ -1,5 +1,7 @@
 package com.vaadin.tests.server.component.tree;
 
+import org.junit.Test;
+
 import com.vaadin.event.ItemClickEvent;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
@@ -10,16 +12,20 @@ import com.vaadin.ui.Tree.ExpandEvent;
 import com.vaadin.ui.Tree.ExpandListener;
 
 public class TreeListenersTest extends AbstractListenerMethodsTestBase {
+
+    @Test
     public void testExpandListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Tree.class, ExpandEvent.class,
                 ExpandListener.class);
     }
 
+    @Test
     public void testItemClickListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Tree.class, ItemClickEvent.class,
                 ItemClickListener.class);
     }
 
+    @Test
     public void testCollapseListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Tree.class, CollapseEvent.class,
                 CollapseListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/tree/TreeTest.java b/server/src/test/java/com/vaadin/tests/server/component/tree/TreeTest.java
index 3e5425a875..3e5425a875 100644
--- a/server/tests/src/com/vaadin/tests/server/component/tree/TreeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/tree/TreeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/treetable/EmptyTreeTableTest.java b/server/src/test/java/com/vaadin/tests/server/component/treetable/EmptyTreeTableTest.java
index a886b74f57..2a667bea72 100644
--- a/server/tests/src/com/vaadin/tests/server/component/treetable/EmptyTreeTableTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/treetable/EmptyTreeTableTest.java
@@ -1,10 +1,14 @@
 package com.vaadin.tests.server.component.treetable;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+
+import org.junit.Test;
 
 import com.vaadin.ui.TreeTable;
 
-public class EmptyTreeTableTest extends TestCase {
+public class EmptyTreeTableTest {
+
+    @Test
     public void testLastId() {
         TreeTable treeTable = new TreeTable();
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java
index 9d614eccc9..9d614eccc9 100644
--- a/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableSetContainerNullTest.java b/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableSetContainerNullTest.java
index 4a34094da1..9718d24f8c 100644
--- a/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableSetContainerNullTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableSetContainerNullTest.java
@@ -1,11 +1,12 @@
 package com.vaadin.tests.server.component.treetable;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import com.vaadin.ui.TreeTable;
 
-public class TreeTableSetContainerNullTest extends TestCase {
+public class TreeTableSetContainerNullTest {
 
+    @Test
     public void testNullContainer() {
         TreeTable treeTable = new TreeTable();
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableTest.java b/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableTest.java
index 33f41d84ea..33f41d84ea 100644
--- a/server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java
index 146d1f1ad1..146d1f1ad1 100644
--- a/server/tests/src/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.java b/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.java
index b2e2c0a65b..b2e2c0a65b 100644
--- a/server/tests/src/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/ui/CustomUIClassLoaderTest.java b/server/src/test/java/com/vaadin/tests/server/component/ui/CustomUIClassLoaderTest.java
index 470f04c15c..6ff6c1a71c 100644
--- a/server/tests/src/com/vaadin/tests/server/component/ui/CustomUIClassLoaderTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/ui/CustomUIClassLoaderTest.java
@@ -1,12 +1,13 @@
 package com.vaadin.tests.server.component.ui;
 
+import static org.junit.Assert.assertEquals;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import junit.framework.TestCase;
-
 import org.easymock.EasyMock;
+import org.junit.Test;
 
 import com.vaadin.server.DefaultDeploymentConfiguration;
 import com.vaadin.server.DefaultUIProvider;
@@ -18,7 +19,7 @@ import com.vaadin.server.VaadinSession;
 import com.vaadin.tests.util.AlwaysLockedVaadinSession;
 import com.vaadin.ui.UI;
 
-public class CustomUIClassLoaderTest extends TestCase {
+public class CustomUIClassLoaderTest {
 
     /**
      * Stub root
@@ -53,6 +54,7 @@ public class CustomUIClassLoaderTest extends TestCase {
      * @throws Exception
      *             if thrown
      */
+    @Test
     public void testWithDefaultClassLoader() throws Exception {
         VaadinSession application = createStubApplication();
         application.setConfiguration(createConfigurationMock());
@@ -98,6 +100,7 @@ public class CustomUIClassLoaderTest extends TestCase {
      * @throws Exception
      *             if thrown
      */
+    @Test
     public void testWithClassLoader() throws Exception {
         LoggingClassLoader loggingClassLoader = new LoggingClassLoader();
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponentsTest.java b/server/src/test/java/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponentsTest.java
index 2a88bb3208..2a88bb3208 100644
--- a/server/tests/src/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponentsTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponentsTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/upload/UploadDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/upload/UploadDeclarativeTest.java
index 12f319c6ad..12f319c6ad 100644
--- a/server/tests/src/com/vaadin/tests/server/component/upload/UploadDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/upload/UploadDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/upload/UploadListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/upload/UploadListenersTest.java
index 13d4c6bfe6..f2bfaf9650 100644
--- a/server/tests/src/com/vaadin/tests/server/component/upload/UploadListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/upload/UploadListenersTest.java
@@ -1,5 +1,7 @@
 package com.vaadin.tests.server.component.upload;
 
+import org.junit.Test;
+
 import com.vaadin.server.StreamVariable.StreamingProgressEvent;
 import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.Upload;
@@ -14,26 +16,32 @@ import com.vaadin.ui.Upload.SucceededEvent;
 import com.vaadin.ui.Upload.SucceededListener;
 
 public class UploadListenersTest extends AbstractListenerMethodsTestBase {
+
+    @Test
     public void testProgressListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Upload.class, StreamingProgressEvent.class,
                 ProgressListener.class);
     }
 
+    @Test
     public void testSucceededListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Upload.class, SucceededEvent.class,
                 SucceededListener.class);
     }
 
+    @Test
     public void testStartedListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Upload.class, StartedEvent.class,
                 StartedListener.class);
     }
 
+    @Test
     public void testFailedListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Upload.class, FailedEvent.class,
                 FailedListener.class);
     }
 
+    @Test
     public void testFinishedListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Upload.class, FinishedEvent.class,
                 FinishedListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/upload/UploadTest.java b/server/src/test/java/com/vaadin/tests/server/component/upload/UploadTest.java
index 358e4db9cd..358e4db9cd 100644
--- a/server/tests/src/com/vaadin/tests/server/component/upload/UploadTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/upload/UploadTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindowTest.java b/server/src/test/java/com/vaadin/tests/server/component/window/AddRemoveSubWindowTest.java
index 7fa8665c01..7fa8665c01 100644
--- a/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindowTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/window/AddRemoveSubWindowTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindowTest.java b/server/src/test/java/com/vaadin/tests/server/component/window/AttachDetachWindowTest.java
index 9f7a54df9c..9f7a54df9c 100644
--- a/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindowTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/window/AttachDetachWindowTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/window/WindowAttachTest.java b/server/src/test/java/com/vaadin/tests/server/component/window/WindowAttachTest.java
index 867342ab03..867342ab03 100644
--- a/server/tests/src/com/vaadin/tests/server/component/window/WindowAttachTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/window/WindowAttachTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/window/WindowDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/window/WindowDeclarativeTest.java
index e1c14e9757..e1c14e9757 100644
--- a/server/tests/src/com/vaadin/tests/server/component/window/WindowDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/window/WindowDeclarativeTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/component/window/WindowListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/window/WindowListenersTest.java
index 87a1af301c..07bb0adadb 100644
--- a/server/tests/src/com/vaadin/tests/server/component/window/WindowListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/window/WindowListenersTest.java
@@ -1,5 +1,7 @@
 package com.vaadin.tests.server.component.window;
 
+import org.junit.Test;
+
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
@@ -12,21 +14,26 @@ import com.vaadin.ui.Window.ResizeEvent;
 import com.vaadin.ui.Window.ResizeListener;
 
 public class WindowListenersTest extends AbstractListenerMethodsTestBase {
+
+    @Test
     public void testFocusListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Window.class, FocusEvent.class,
                 FocusListener.class);
     }
 
+    @Test
     public void testBlurListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Window.class, BlurEvent.class,
                 BlurListener.class);
     }
 
+    @Test
     public void testResizeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Window.class, ResizeEvent.class,
                 ResizeListener.class);
     }
 
+    @Test
     public void testCloseListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(Window.class, CloseEvent.class,
                 CloseListener.class);
diff --git a/server/tests/src/com/vaadin/tests/server/component/window/WindowTest.java b/server/src/test/java/com/vaadin/tests/server/component/window/WindowTest.java
index e9e73c1e0f..e9e73c1e0f 100644
--- a/server/tests/src/com/vaadin/tests/server/component/window/WindowTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/window/WindowTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTestBase.java b/server/src/test/java/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTestBase.java
index f19821f92e..7bf0cb5c4e 100644
--- a/server/tests/src/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTestBase.java
+++ b/server/src/test/java/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTestBase.java
@@ -1,19 +1,23 @@
 package com.vaadin.tests.server.componentcontainer;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import org.junit.Before;
+import org.junit.Test;
 
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
 
-public abstract class AbstractIndexedLayoutTestBase extends TestCase {
+public abstract class AbstractIndexedLayoutTestBase {
 
     private Layout layout;
 
     protected abstract Layout createLayout();
 
-    @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() {
         layout = createLayout();
     }
 
@@ -21,6 +25,7 @@ public abstract class AbstractIndexedLayoutTestBase extends TestCase {
         return layout;
     }
 
+    @Test
     public void testAddRemoveComponent() {
         Label c1 = new Label();
         Label c2 = new Label();
@@ -46,6 +51,7 @@ public abstract class AbstractIndexedLayoutTestBase extends TestCase {
 
     protected abstract int getComponentIndex(Component c);
 
+    @Test
     public void testGetComponentIndex() {
         Label c1 = new Label();
         Label c2 = new Label();
@@ -62,6 +68,7 @@ public abstract class AbstractIndexedLayoutTestBase extends TestCase {
         assertEquals(-1, getComponentIndex(c1));
     }
 
+    @Test
     public void testGetComponent() {
         Label c1 = new Label();
         Label c2 = new Label();
diff --git a/server/tests/src/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java b/server/src/test/java/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java
index 91a302a274..c5bc4f39e5 100644
--- a/server/tests/src/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java
@@ -2,7 +2,8 @@ package com.vaadin.tests.server.componentcontainer;
 
 import java.util.List;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.tests.VaadinClasses;
 import com.vaadin.ui.ComponentContainer;
@@ -11,8 +12,9 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.components.colorpicker.ColorPickerPreview;
 
-public class AddRemoveComponentTest extends TestCase {
+public class AddRemoveComponentTest {
 
+    @Test
     public void testRemoveComponentFromWrongContainer()
             throws InstantiationException, IllegalAccessException {
         List<Class<? extends ComponentContainer>> containerClasses = VaadinClasses
@@ -35,8 +37,7 @@ public class AddRemoveComponentTest extends TestCase {
         hl.addComponent(label);
 
         componentContainer.removeComponent(label);
-        assertEquals(
-                "Parent no longer correct for " + componentContainer.getClass(),
-                hl, label.getParent());
+        Assert.assertEquals("Parent no longer correct for "
+                + componentContainer.getClass(), hl, label.getParent());
     }
 }
diff --git a/server/tests/src/com/vaadin/tests/server/componentcontainer/CssLayoutTest.java b/server/src/test/java/com/vaadin/tests/server/componentcontainer/CssLayoutTest.java
index 8dd36beda3..8dd36beda3 100644
--- a/server/tests/src/com/vaadin/tests/server/componentcontainer/CssLayoutTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/componentcontainer/CssLayoutTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java b/server/src/test/java/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java
index f55798007f..29dfd08212 100644
--- a/server/tests/src/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java
@@ -1,5 +1,9 @@
 package com.vaadin.tests.server.componentcontainer;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
+
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
diff --git a/server/tests/src/com/vaadin/tests/server/componentcontainer/VerticalLayoutTest.java b/server/src/test/java/com/vaadin/tests/server/componentcontainer/VerticalLayoutTest.java
index 565cc8e8ab..565cc8e8ab 100644
--- a/server/tests/src/com/vaadin/tests/server/componentcontainer/VerticalLayoutTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/componentcontainer/VerticalLayoutTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java b/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java
index 637947fc9b..d068051663 100644
--- a/server/tests/src/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java
+++ b/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java
@@ -1,8 +1,7 @@
 package com.vaadin.tests.server.components;
 
-import junit.framework.TestCase;
-
 import org.easymock.EasyMock;
+import org.junit.Test;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
@@ -22,12 +21,12 @@ import com.vaadin.ui.AbstractField;
  * override {@link #setValue(AbstractField)} to set the field value via
  * <code>changeVariables()</code>.
  */
-public abstract class AbstractFieldValueChangeTestBase<T> extends TestCase {
+public abstract class AbstractFieldValueChangeTestBase<T> {
 
     private AbstractField<T> field;
     private ValueChangeListener listener;
 
-    protected void setUp(AbstractField<T> field) throws Exception {
+    protected void setUp(AbstractField<T> field) {
         this.field = field;
         listener = EasyMock.createStrictMock(ValueChangeListener.class);
 
@@ -40,6 +39,7 @@ public abstract class AbstractFieldValueChangeTestBase<T> extends TestCase {
     /**
      * Test that listeners are not called when they have been unregistered.
      */
+    @Test
     public void testRemoveListener() {
         getField().setPropertyDataSource(new ObjectProperty<String>(""));
         getField().setBuffered(false);
@@ -75,6 +75,7 @@ public abstract class AbstractFieldValueChangeTestBase<T> extends TestCase {
      * Field value change notifications closely mirror value changes of the data
      * source behind the field.
      */
+    @Test
     public void testNonBuffered() {
         getField().setPropertyDataSource(new ObjectProperty<String>(""));
         getField().setBuffered(false);
diff --git a/server/tests/src/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java b/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java
index f3cc337657..8bc1eb87df 100644
--- a/server/tests/src/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java
@@ -3,6 +3,8 @@ package com.vaadin.tests.server.components;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.junit.Before;
+
 import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.ComboBox;
 
@@ -14,8 +16,9 @@ import com.vaadin.ui.ComboBox;
  */
 public class ComboBoxValueChangeTest extends
         AbstractFieldValueChangeTestBase<Object> {
-    @Override
-    protected void setUp() throws Exception {
+
+    @Before
+    public void setUp() {
         ComboBox combo = new ComboBox();
         combo.addItem("myvalue");
         super.setUp(combo);
diff --git a/server/tests/src/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java b/server/src/test/java/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java
index d8b366ffbc..b13a379b05 100644
--- a/server/tests/src/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java
@@ -1,8 +1,16 @@
 package com.vaadin.tests.server.components;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
 import java.util.Iterator;
 
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
 
 import com.vaadin.ui.AbsoluteLayout;
 import com.vaadin.ui.AbsoluteLayout.ComponentPosition;
@@ -20,7 +28,7 @@ import com.vaadin.ui.HasComponents.ComponentDetachListener;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 
-public class ComponentAttachDetachListenerTest extends TestCase {
+public class ComponentAttachDetachListenerTest {
 
     private AbstractOrderedLayout olayout;
     private GridLayout gridlayout;
@@ -126,9 +134,8 @@ public class ComponentAttachDetachListenerTest extends TestCase {
         componentPosition = null;
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
 
         olayout = new HorizontalLayout();
         olayout.addComponentAttachListener(new MyAttachListener());
@@ -151,6 +158,7 @@ public class ComponentAttachDetachListenerTest extends TestCase {
         customlayout.addComponentDetachListener(new MyDetachListener());
     }
 
+    @Test
     public void testOrderedLayoutAttachListener() {
         // Reset state variables
         resetVariables();
@@ -175,6 +183,7 @@ public class ComponentAttachDetachListenerTest extends TestCase {
         assertFalse(indexOfComponent == -1);
     }
 
+    @Test
     public void testOrderedLayoutDetachListener() {
         // Add a component to detach
         Component comp = new Label();
@@ -202,6 +211,7 @@ public class ComponentAttachDetachListenerTest extends TestCase {
         assertEquals(-1, indexOfComponent);
     }
 
+    @Test
     public void testGridLayoutAttachListener() {
         // Reset state variables
         resetVariables();
@@ -226,6 +236,7 @@ public class ComponentAttachDetachListenerTest extends TestCase {
         assertNotNull(componentArea);
     }
 
+    @Test
     public void testGridLayoutDetachListener() {
         // Add a component to detach
         Component comp = new Label();
@@ -253,6 +264,7 @@ public class ComponentAttachDetachListenerTest extends TestCase {
         assertNull(componentArea);
     }
 
+    @Test
     public void testAbsoluteLayoutAttachListener() {
         // Reset state variables
         resetVariables();
@@ -277,6 +289,7 @@ public class ComponentAttachDetachListenerTest extends TestCase {
         assertNotNull(componentPosition);
     }
 
+    @Test
     public void testAbsoluteLayoutDetachListener() {
         // Add a component to detach
         Component comp = new Label();
@@ -304,6 +317,7 @@ public class ComponentAttachDetachListenerTest extends TestCase {
         assertNull(componentPosition);
     }
 
+    @Test
     public void testCSSLayoutAttachListener() {
         // Reset state variables
         resetVariables();
@@ -325,6 +339,7 @@ public class ComponentAttachDetachListenerTest extends TestCase {
         assertTrue(foundInContainer);
     }
 
+    @Test
     public void testCSSLayoutDetachListener() {
         // Add a component to detach
         Component comp = new Label();
@@ -349,6 +364,7 @@ public class ComponentAttachDetachListenerTest extends TestCase {
         assertFalse(foundInContainer);
     }
 
+    @Test
     public void testCustomLayoutAttachListener() {
         // Reset state variables
         resetVariables();
@@ -369,6 +385,7 @@ public class ComponentAttachDetachListenerTest extends TestCase {
                 foundInContainer);
     }
 
+    @Test
     public void testCustomLayoutDetachListener() {
         // Add a component to detach
         Component comp = new Label();
diff --git a/server/tests/src/com/vaadin/tests/server/components/GridLayoutLastRowRemovalTest.java b/server/src/test/java/com/vaadin/tests/server/components/GridLayoutLastRowRemovalTest.java
index 3467d1d80c..2743301a72 100644
--- a/server/tests/src/com/vaadin/tests/server/components/GridLayoutLastRowRemovalTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/components/GridLayoutLastRowRemovalTest.java
@@ -1,12 +1,17 @@
 package com.vaadin.tests.server.components;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
 
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 
-public class GridLayoutLastRowRemovalTest extends TestCase {
+public class GridLayoutLastRowRemovalTest {
 
+    @Test
     public void testRemovingLastRow() {
         GridLayout grid = new GridLayout(2, 1);
         grid.addComponent(new Label("Col1"));
diff --git a/server/tests/src/com/vaadin/tests/server/components/TextFieldValueChangeTest.java b/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java
index cfceb6f7d7..3b34d17c99 100644
--- a/server/tests/src/com/vaadin/tests/server/components/TextFieldValueChangeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java
@@ -5,6 +5,8 @@ import java.util.Map;
 
 import org.easymock.EasyMock;
 import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.util.ObjectProperty;
@@ -20,8 +22,8 @@ import com.vaadin.ui.TextField;
 public class TextFieldValueChangeTest extends
         AbstractFieldValueChangeTestBase<String> {
 
-    @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() {
         super.setUp(new TextField());
     }
 
@@ -29,6 +31,7 @@ public class TextFieldValueChangeTest extends
      * Case where the text field only uses its internal buffer, no external
      * property data source.
      */
+    @Test
     public void testNoDataSource() {
         getField().setPropertyDataSource(null);
 
@@ -49,6 +52,7 @@ public class TextFieldValueChangeTest extends
      * 
      * TODO make test field type agnostic (eg. combobox)
      */
+    @Test
     public void testValueChangeEventPropagationWithReadThrough() {
         ObjectProperty<String> property = new ObjectProperty<String>("");
         getField().setPropertyDataSource(property);
@@ -82,6 +86,7 @@ public class TextFieldValueChangeTest extends
      * 
      * TODO make test field type agnostic (eg. combobox)
      */
+    @Test
     public void testValueChangePropagationWithReadThroughOff() {
         final String initialValue = "initial";
         ObjectProperty<String> property = new ObjectProperty<String>(
diff --git a/server/tests/src/com/vaadin/tests/server/components/WindowTest.java b/server/src/test/java/com/vaadin/tests/server/components/WindowTest.java
index 26fe238342..ed22870b59 100644
--- a/server/tests/src/com/vaadin/tests/server/components/WindowTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/components/WindowTest.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.server.components;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.TestCase;
-
 import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
 
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Window;
@@ -14,16 +14,17 @@ import com.vaadin.ui.Window.CloseListener;
 import com.vaadin.ui.Window.ResizeEvent;
 import com.vaadin.ui.Window.ResizeListener;
 
-public class WindowTest extends TestCase {
+public class WindowTest {
 
     private Window window;
 
-    @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() {
         window = new Window();
         new LegacyWindow().addWindow(window);
     }
 
+    @Test
     public void testCloseListener() {
         CloseListener cl = EasyMock.createMock(Window.CloseListener.class);
 
@@ -50,6 +51,7 @@ public class WindowTest extends TestCase {
 
     }
 
+    @Test
     public void testResizeListener() {
         ResizeListener rl = EasyMock.createMock(Window.ResizeListener.class);
 
diff --git a/server/tests/src/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java b/server/src/test/java/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java
index bc067ddb88..ecd45251b5 100644
--- a/server/tests/src/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java
@@ -16,14 +16,19 @@
 
 package com.vaadin.tests.server.navigator;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
 
 import com.vaadin.navigator.Navigator.ClassBasedViewProvider;
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
 import com.vaadin.ui.Label;
 
-public class ClassBasedViewProviderTest extends TestCase {
+public class ClassBasedViewProviderTest {
 
     public static class TestView extends Label implements View {
         public String parameters = null;
@@ -39,26 +44,24 @@ public class ClassBasedViewProviderTest extends TestCase {
 
     }
 
+    @Test(expected = IllegalArgumentException.class)
     public void testCreateProviderWithNullName() throws Exception {
-        try {
-            new ClassBasedViewProvider(null, TestView.class);
-            fail("Should not be able to create view provider with null name");
-        } catch (IllegalArgumentException e) {
-        }
+        new ClassBasedViewProvider(null, TestView.class);
+        fail("Should not be able to create view provider with null name");
     }
 
+    @Test
     public void testCreateProviderWithEmptyStringName() throws Exception {
         new ClassBasedViewProvider("", TestView.class);
     }
 
+    @Test(expected = IllegalArgumentException.class)
     public void testCreateProviderNullViewClass() throws Exception {
-        try {
-            new ClassBasedViewProvider("test", null);
-            fail("Should not be able to create view provider with null view class");
-        } catch (IllegalArgumentException e) {
-        }
+        new ClassBasedViewProvider("test", null);
+        fail("Should not be able to create view provider with null view class");
     }
 
+    @Test
     public void testViewNameGetter() throws Exception {
         ClassBasedViewProvider provider1 = new ClassBasedViewProvider("",
                 TestView.class);
@@ -70,6 +73,7 @@ public class ClassBasedViewProviderTest extends TestCase {
                 provider2.getViewName());
     }
 
+    @Test
     public void testViewClassGetter() throws Exception {
         ClassBasedViewProvider provider = new ClassBasedViewProvider("test",
                 TestView.class);
@@ -77,6 +81,7 @@ public class ClassBasedViewProviderTest extends TestCase {
                 provider.getViewClass());
     }
 
+    @Test
     public void testGetViewNameForNullString() throws Exception {
         ClassBasedViewProvider provider = new ClassBasedViewProvider("test",
                 TestView.class);
@@ -84,6 +89,7 @@ public class ClassBasedViewProviderTest extends TestCase {
                 provider.getViewName((String) null));
     }
 
+    @Test
     public void testGetViewNameForEmptyString() throws Exception {
         ClassBasedViewProvider provider1 = new ClassBasedViewProvider("",
                 TestView.class);
@@ -98,6 +104,7 @@ public class ClassBasedViewProviderTest extends TestCase {
                 provider2.getViewName(""));
     }
 
+    @Test
     public void testGetViewNameWithParameters() throws Exception {
         ClassBasedViewProvider provider = new ClassBasedViewProvider("test",
                 TestView.class);
@@ -111,6 +118,7 @@ public class ClassBasedViewProviderTest extends TestCase {
                 "test", provider.getViewName("test/params/are/here"));
     }
 
+    @Test
     public void testGetView() throws Exception {
         ClassBasedViewProvider provider = new ClassBasedViewProvider("test",
                 TestView.class);
@@ -120,6 +128,7 @@ public class ClassBasedViewProviderTest extends TestCase {
         assertEquals("Incorrect view type", TestView.class, view.getClass());
     }
 
+    @Test
     public void testGetViewIncorrectViewName() throws Exception {
         ClassBasedViewProvider provider = new ClassBasedViewProvider("test",
                 TestView.class);
diff --git a/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java b/server/src/test/java/com/vaadin/tests/server/navigator/NavigatorTest.java
index 0de804fa0b..0eda1ed045 100644
--- a/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/navigator/NavigatorTest.java
@@ -16,14 +16,19 @@
 
 package com.vaadin.tests.server.navigator;
 
-import java.util.LinkedList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
 
-import junit.framework.TestCase;
+import java.util.LinkedList;
 
 import org.easymock.EasyMock;
 import org.easymock.IArgumentMatcher;
 import org.easymock.IMocksControl;
 import org.junit.Assert;
+import org.junit.Test;
 
 import com.vaadin.navigator.NavigationStateManager;
 import com.vaadin.navigator.Navigator;
@@ -42,7 +47,7 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
 
-public class NavigatorTest extends TestCase {
+public class NavigatorTest {
 
     // TODO test internal parameters (and absence of them)
     // TODO test listeners blocking navigation, multiple listeners
@@ -273,6 +278,7 @@ public class NavigatorTest extends TestCase {
         return new Navigator(createMockUI(), manager, display);
     }
 
+    @Test(expected = NullPointerException.class)
     public void testDestroy_unsetNavigatorInUIAndUriFragmentManager() {
         TestPage page = new TestPage();
         UI ui = new TestUI(page);
@@ -292,16 +298,14 @@ public class NavigatorTest extends TestCase {
                 ui.getNavigator());
         UriFragmentManager manager = (UriFragmentManager) navigator
                 .getStateManager();
-        try {
-            manager.uriFragmentChanged(EasyMock
-                    .createMock(UriFragmentChangedEvent.class));
-            Assert.assertTrue(
-                    "Expected null pointer exception after call uriFragmentChanged "
-                            + "for destroyed navigator", false);
-        } catch (NullPointerException e) {
-        }
+
+        manager.uriFragmentChanged(EasyMock
+                .createMock(UriFragmentChangedEvent.class));
+        Assert.fail("Expected null pointer exception after call uriFragmentChanged "
+                + "for destroyed navigator");
     }
 
+    @Test
     public void testBasicNavigation() {
         IMocksControl control = EasyMock.createControl();
         NavigationStateManager manager = control
@@ -355,6 +359,7 @@ public class NavigatorTest extends TestCase {
         assertEquals("test1/params", navigator.getState());
     }
 
+    @Test
     public void testMainView() {
         IMocksControl control = EasyMock.createControl();
         NavigationStateManager manager = control
@@ -400,6 +405,7 @@ public class NavigatorTest extends TestCase {
         navigator.navigateTo("test1/params");
     }
 
+    @Test
     public void testListeners() {
         IMocksControl control = EasyMock.createControl();
         NavigationStateManager manager = control
@@ -450,6 +456,7 @@ public class NavigatorTest extends TestCase {
         }
     }
 
+    @Test
     public void testComponentContainerViewDisplay() {
         abstract class TestView implements Component, View {
         }
@@ -478,6 +485,7 @@ public class NavigatorTest extends TestCase {
         assertEquals(1, container.getComponentCount());
     }
 
+    @Test
     public void testBlockNavigation() {
         IMocksControl control = EasyMock.createControl();
         NavigationStateManager manager = control
@@ -557,6 +565,7 @@ public class NavigatorTest extends TestCase {
         }
     }
 
+    @Test
     public void testAddViewInstance() throws Exception {
         View view = new TestView();
 
@@ -568,6 +577,7 @@ public class NavigatorTest extends TestCase {
                 view, navigator.getView("test"));
     }
 
+    @Test
     public void testAddViewInstanceSameName() throws Exception {
         View view1 = new TestView();
         View view2 = new TestView2();
@@ -582,6 +592,7 @@ public class NavigatorTest extends TestCase {
                 view2, navigator.getView("test"));
     }
 
+    @Test
     public void testAddViewClass() throws Exception {
         TestNavigator navigator = new TestNavigator();
 
@@ -593,6 +604,7 @@ public class NavigatorTest extends TestCase {
                 view.getClass());
     }
 
+    @Test
     public void testAddViewClassSameName() throws Exception {
         TestNavigator navigator = new TestNavigator();
 
@@ -604,6 +616,7 @@ public class NavigatorTest extends TestCase {
                 TestView2.class, navigator.getView("test").getClass());
     }
 
+    @Test
     public void testAddViewInstanceAndClassSameName() throws Exception {
         TestNavigator navigator = new TestNavigator();
 
@@ -622,6 +635,7 @@ public class NavigatorTest extends TestCase {
                 TestView.class, navigator.getView("test").getClass());
     }
 
+    @Test
     public void testAddViewWithNullName() throws Exception {
         Navigator navigator = new TestNavigator();
 
@@ -637,26 +651,23 @@ public class NavigatorTest extends TestCase {
         }
     }
 
+    @Test(expected = IllegalArgumentException.class)
     public void testAddViewWithNullInstance() throws Exception {
         Navigator navigator = new TestNavigator();
 
-        try {
-            navigator.addView("test", (View) null);
-            fail("addView() accepted null view instance");
-        } catch (IllegalArgumentException e) {
-        }
+        navigator.addView("test", (View) null);
+        fail("addView() accepted null view instance");
     }
 
+    @Test(expected = IllegalArgumentException.class)
     public void testAddViewWithNullClass() throws Exception {
         Navigator navigator = new TestNavigator();
 
-        try {
-            navigator.addView("test", (Class<View>) null);
-            fail("addView() accepted null view class");
-        } catch (IllegalArgumentException e) {
-        }
+        navigator.addView("test", (Class<View>) null);
+        fail("addView() accepted null view class");
     }
 
+    @Test
     public void testRemoveViewInstance() throws Exception {
         View view = new TestView();
 
@@ -668,6 +679,7 @@ public class NavigatorTest extends TestCase {
         assertNull("View not removed", navigator.getView("test"));
     }
 
+    @Test
     public void testRemoveViewInstanceNothingElse() throws Exception {
         View view = new TestView();
         View view2 = new TestView2();
@@ -681,6 +693,7 @@ public class NavigatorTest extends TestCase {
         assertEquals("Removed extra views", view2, navigator.getView("test2"));
     }
 
+    @Test
     public void testRemoveViewClass() throws Exception {
         TestNavigator navigator = new TestNavigator();
 
@@ -690,6 +703,7 @@ public class NavigatorTest extends TestCase {
         assertNull("View not removed", navigator.getView("test"));
     }
 
+    @Test
     public void testRemoveViewClassNothingElse() throws Exception {
         TestNavigator navigator = new TestNavigator();
 
@@ -701,6 +715,7 @@ public class NavigatorTest extends TestCase {
                 navigator.getView("test2").getClass());
     }
 
+    @Test
     public void testGetViewNestedNames() throws Exception {
         TestNavigator navigator = new TestNavigator();
 
@@ -727,6 +742,7 @@ public class NavigatorTest extends TestCase {
                         .getClass());
     }
 
+    @Test
     public void testGetViewLongestPrefixOrder() throws Exception {
         TestNavigator navigator = new TestNavigator();
 
@@ -747,6 +763,7 @@ public class NavigatorTest extends TestCase {
                 .getView("test").getClass());
     }
 
+    @Test
     public void testNavigateToUnknownView() {
         TestNavigator navigator = new TestNavigator();
 
@@ -785,6 +802,7 @@ public class NavigatorTest extends TestCase {
         navigator.navigateTo("doesnotexist2");
     }
 
+    @Test
     public void testShowViewEnterOrder() {
         IMocksControl control = EasyMock.createStrictControl();
 
@@ -805,6 +823,7 @@ public class NavigatorTest extends TestCase {
         navigator.navigateTo("view");
     }
 
+    @Test(expected = IllegalArgumentException.class)
     public void testNullViewProvider() {
         IMocksControl control = EasyMock.createControl();
         NavigationStateManager manager = control
@@ -814,11 +833,8 @@ public class NavigatorTest extends TestCase {
         // create navigator to test
         Navigator navigator = createNavigator(manager, display);
 
-        try {
-            navigator.addProvider(null);
-            fail("Should not be allowed to add a null view provider");
-        } catch (IllegalArgumentException e) {
-            // Expected
-        }
+        navigator.addProvider(null);
+        fail("Should not be allowed to add a null view provider");
+
     }
 }
diff --git a/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java b/server/src/test/java/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
index 327baae21f..327baae21f 100644
--- a/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/renderer/ImageRendererTest.java b/server/src/test/java/com/vaadin/tests/server/renderer/ImageRendererTest.java
index 782434bcd5..782434bcd5 100644
--- a/server/tests/src/com/vaadin/tests/server/renderer/ImageRendererTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/renderer/ImageRendererTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/renderer/RendererTest.java b/server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java
index cea8df0ba6..cea8df0ba6 100644
--- a/server/tests/src/com/vaadin/tests/server/renderer/RendererTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java
diff --git a/server/tests/src/com/vaadin/tests/server/validation/BeanValidationTest.java b/server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java
index 6b7582525e..6ad6ac2d5f 100644
--- a/server/tests/src/com/vaadin/tests/server/validation/BeanValidationTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java
@@ -85,6 +85,7 @@ public class BeanValidationTest {
         Assert.assertEquals(2, causes.length);
     }
 
+    @Test
     public void testBeanValidationNotAddedTwice() {
         // See ticket #11045
         BeanFieldGroup<BeanToValidate> fieldGroup = new BeanFieldGroup<BeanToValidate>(
@@ -100,8 +101,9 @@ public class BeanValidationTest {
         try {
             nameField.validate();
         } catch (InvalidValueException e) {
-            // NOTE: causes are empty if only one validation fails
-            Assert.assertEquals(0, e.getCauses().length);
+            // The 1 cause is from BeanValidator, where it tells what failed
+            // 1 validation exception never gets wrapped.
+            Assert.assertEquals(1, e.getCauses().length);
         }
 
         // Create new, identical bean to cause duplicate validator unless #11045
@@ -115,9 +117,9 @@ public class BeanValidationTest {
         try {
             nameField.validate();
         } catch (InvalidValueException e) {
-            // NOTE: if more than one validation fails, we get the number of
-            // failed validations
-            Assert.assertEquals(0, e.getCauses().length);
+            // The 1 cause is from BeanValidator, where it tells what failed
+            // 1 validation exception never gets wrapped.
+            Assert.assertEquals(1, e.getCauses().length);
         }
 
     }
diff --git a/server/tests/src/com/vaadin/tests/server/validation/RangeValidatorTest.java b/server/src/test/java/com/vaadin/tests/server/validation/RangeValidatorTest.java
index e3320b8699..86c1083269 100644
--- a/server/tests/src/com/vaadin/tests/server/validation/RangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/validation/RangeValidatorTest.java
@@ -1,14 +1,18 @@
 package com.vaadin.tests.server.validation;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
 
 import com.vaadin.data.validator.IntegerRangeValidator;
 
-public class RangeValidatorTest extends TestCase {
+public class RangeValidatorTest {
 
     // This test uses IntegerRangeValidator for simplicity.
     // IntegerRangeValidator contains no code so we really are testing
     // RangeValidator
+    @Test
     public void testMinValueNonInclusive() {
         IntegerRangeValidator iv = new IntegerRangeValidator("Failed", 0, 10);
         iv.setMinValueIncluded(false);
@@ -18,6 +22,7 @@ public class RangeValidatorTest extends TestCase {
         assertFalse(iv.isValid(-1));
     }
 
+    @Test
     public void testMinMaxValuesInclusive() {
         IntegerRangeValidator iv = new IntegerRangeValidator("Failed", 0, 10);
         assertTrue(iv.isValid(0));
@@ -27,6 +32,7 @@ public class RangeValidatorTest extends TestCase {
         assertFalse(iv.isValid(-1));
     }
 
+    @Test
     public void testMaxValueNonInclusive() {
         IntegerRangeValidator iv = new IntegerRangeValidator("Failed", 0, 10);
         iv.setMaxValueIncluded(false);
@@ -37,6 +43,7 @@ public class RangeValidatorTest extends TestCase {
         assertFalse(iv.isValid(-1));
     }
 
+    @Test
     public void testMinMaxValuesNonInclusive() {
         IntegerRangeValidator iv = new IntegerRangeValidator("Failed", 0, 10);
         iv.setMinValueIncluded(false);
diff --git a/server/tests/src/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java b/server/src/test/java/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java
index 661236e597..661236e597 100644
--- a/server/tests/src/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java
diff --git a/server/tests/src/com/vaadin/tests/util/AlwaysLockedVaadinSession.java b/server/src/test/java/com/vaadin/tests/util/AlwaysLockedVaadinSession.java
index 89d3449b12..89d3449b12 100644
--- a/server/tests/src/com/vaadin/tests/util/AlwaysLockedVaadinSession.java
+++ b/server/src/test/java/com/vaadin/tests/util/AlwaysLockedVaadinSession.java
diff --git a/server/tests/src/com/vaadin/tests/util/GraphVizClassHierarchyCreator.java b/server/src/test/java/com/vaadin/tests/util/GraphVizClassHierarchyCreator.java
index 9e791500b0..9e791500b0 100644
--- a/server/tests/src/com/vaadin/tests/util/GraphVizClassHierarchyCreator.java
+++ b/server/src/test/java/com/vaadin/tests/util/GraphVizClassHierarchyCreator.java
diff --git a/server/tests/src/com/vaadin/tests/util/MockDeploymentConfiguration.java b/server/src/test/java/com/vaadin/tests/util/MockDeploymentConfiguration.java
index ddee23a9ec..ddee23a9ec 100644
--- a/server/tests/src/com/vaadin/tests/util/MockDeploymentConfiguration.java
+++ b/server/src/test/java/com/vaadin/tests/util/MockDeploymentConfiguration.java
diff --git a/server/tests/src/com/vaadin/tests/util/MockUI.java b/server/src/test/java/com/vaadin/tests/util/MockUI.java
index 17dc24e9e8..17dc24e9e8 100644
--- a/server/tests/src/com/vaadin/tests/util/MockUI.java
+++ b/server/src/test/java/com/vaadin/tests/util/MockUI.java
diff --git a/server/tests/src/com/vaadin/tests/util/TestUtil.java b/server/src/test/java/com/vaadin/tests/util/TestUtil.java
index 88ed017f91..88ed017f91 100644
--- a/server/tests/src/com/vaadin/tests/util/TestUtil.java
+++ b/server/src/test/java/com/vaadin/tests/util/TestUtil.java
diff --git a/server/tests/src/com/vaadin/tests/util/UniqueSerializableTest.java b/server/src/test/java/com/vaadin/tests/util/UniqueSerializableTest.java
index abdc6c1a5c..287ed0338a 100644
--- a/server/tests/src/com/vaadin/tests/util/UniqueSerializableTest.java
+++ b/server/src/test/java/com/vaadin/tests/util/UniqueSerializableTest.java
@@ -15,16 +15,19 @@
  */
 package com.vaadin.tests.util;
 
-import java.io.Serializable;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
-import junit.framework.TestCase;
+import java.io.Serializable;
 
 import org.apache.commons.lang.SerializationUtils;
+import org.junit.Test;
 
 import com.vaadin.ui.UniqueSerializable;
 
-public class UniqueSerializableTest extends TestCase implements Serializable {
+public class UniqueSerializableTest implements Serializable {
 
+    @Test
     public void testUniqueness() {
         UniqueSerializable o1 = new UniqueSerializable() {
         };
@@ -34,6 +37,7 @@ public class UniqueSerializableTest extends TestCase implements Serializable {
         assertFalse(o1.equals(o2));
     }
 
+    @Test
     public void testSerialization() {
         UniqueSerializable o1 = new UniqueSerializable() {
         };
diff --git a/server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChangeTest.java b/server/src/test/java/com/vaadin/ui/AbsFieldDataSourceLocaleChangeTest.java
index bb5babf360..bb5babf360 100644
--- a/server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChangeTest.java
+++ b/server/src/test/java/com/vaadin/ui/AbsFieldDataSourceLocaleChangeTest.java
diff --git a/server/tests/src/com/vaadin/ui/AbsSelectTest.java b/server/src/test/java/com/vaadin/ui/AbsSelectTest.java
index 0b807c5f21..0b807c5f21 100644
--- a/server/tests/src/com/vaadin/ui/AbsSelectTest.java
+++ b/server/src/test/java/com/vaadin/ui/AbsSelectTest.java
diff --git a/server/tests/src/com/vaadin/ui/CheckBoxTest.java b/server/src/test/java/com/vaadin/ui/CheckBoxTest.java
index 7d699998de..7d699998de 100644
--- a/server/tests/src/com/vaadin/ui/CheckBoxTest.java
+++ b/server/src/test/java/com/vaadin/ui/CheckBoxTest.java
diff --git a/server/tests/src/com/vaadin/ui/DateFieldTests.java b/server/src/test/java/com/vaadin/ui/DateFieldTestCase.java
index 6a75b4630c..5fee13f2cb 100644
--- a/server/tests/src/com/vaadin/ui/DateFieldTests.java
+++ b/server/src/test/java/com/vaadin/ui/DateFieldTestCase.java
@@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsNull.nullValue;
 
-public class DateFieldTests {
+public class DateFieldTestCase {
 
     private DateField dateField;
     private Date date;
diff --git a/server/tests/src/com/vaadin/ui/GridLayoutExpandRatioTest.java b/server/src/test/java/com/vaadin/ui/GridLayoutExpandRatioTest.java
index 617c7f54ed..617c7f54ed 100644
--- a/server/tests/src/com/vaadin/ui/GridLayoutExpandRatioTest.java
+++ b/server/src/test/java/com/vaadin/ui/GridLayoutExpandRatioTest.java
diff --git a/server/tests/src/com/vaadin/ui/HorizontalSplitPanelTest.java b/server/src/test/java/com/vaadin/ui/HorizontalSplitPanelTest.java
index 9797e48924..9797e48924 100644
--- a/server/tests/src/com/vaadin/ui/HorizontalSplitPanelTest.java
+++ b/server/src/test/java/com/vaadin/ui/HorizontalSplitPanelTest.java
diff --git a/server/tests/src/com/vaadin/ui/LabelDataSourceTest.java b/server/src/test/java/com/vaadin/ui/LabelDataSourceTest.java
index 030504cf2b..030504cf2b 100644
--- a/server/tests/src/com/vaadin/ui/LabelDataSourceTest.java
+++ b/server/src/test/java/com/vaadin/ui/LabelDataSourceTest.java
diff --git a/server/tests/src/com/vaadin/ui/NativeSelectTest.java b/server/src/test/java/com/vaadin/ui/NativeSelectTest.java
index 78e4715f9b..78e4715f9b 100644
--- a/server/tests/src/com/vaadin/ui/NativeSelectTest.java
+++ b/server/src/test/java/com/vaadin/ui/NativeSelectTest.java
diff --git a/server/tests/src/com/vaadin/ui/PushConfigurationTransportTest.java b/server/src/test/java/com/vaadin/ui/PushConfigurationTransportTest.java
index 80e7dd9261..80e7dd9261 100644
--- a/server/tests/src/com/vaadin/ui/PushConfigurationTransportTest.java
+++ b/server/src/test/java/com/vaadin/ui/PushConfigurationTransportTest.java
diff --git a/server/tests/src/com/vaadin/ui/RichTextAreaTest.java b/server/src/test/java/com/vaadin/ui/RichTextAreaTest.java
index ce0dfdc696..ce0dfdc696 100644
--- a/server/tests/src/com/vaadin/ui/RichTextAreaTest.java
+++ b/server/src/test/java/com/vaadin/ui/RichTextAreaTest.java
diff --git a/server/tests/src/com/vaadin/ui/SplitPositionChangeListenerTest.java b/server/src/test/java/com/vaadin/ui/SplitPositionChangeListenerTest.java
index 02dc412cd9..02dc412cd9 100644
--- a/server/tests/src/com/vaadin/ui/SplitPositionChangeListenerTest.java
+++ b/server/src/test/java/com/vaadin/ui/SplitPositionChangeListenerTest.java
diff --git a/server/tests/src/com/vaadin/ui/TableTest.java b/server/src/test/java/com/vaadin/ui/TableTest.java
index 86237abbe0..86237abbe0 100644
--- a/server/tests/src/com/vaadin/ui/TableTest.java
+++ b/server/src/test/java/com/vaadin/ui/TableTest.java
diff --git a/server/tests/src/com/vaadin/ui/TextAreaTest.java b/server/src/test/java/com/vaadin/ui/TextAreaTest.java
index e7e99c19e9..e7e99c19e9 100644
--- a/server/tests/src/com/vaadin/ui/TextAreaTest.java
+++ b/server/src/test/java/com/vaadin/ui/TextAreaTest.java
diff --git a/server/tests/src/com/vaadin/ui/TextFieldTest.java b/server/src/test/java/com/vaadin/ui/TextFieldTest.java
index bfd452bd3b..bfd452bd3b 100644
--- a/server/tests/src/com/vaadin/ui/TextFieldTest.java
+++ b/server/src/test/java/com/vaadin/ui/TextFieldTest.java
diff --git a/server/tests/src/com/vaadin/ui/UIInitRefreshTest.java b/server/src/test/java/com/vaadin/ui/UIInitRefreshTest.java
index 9e1fabc58f..9e1fabc58f 100644
--- a/server/tests/src/com/vaadin/ui/UIInitRefreshTest.java
+++ b/server/src/test/java/com/vaadin/ui/UIInitRefreshTest.java
diff --git a/server/tests/src/com/vaadin/ui/UIThemeEscapingTest.java b/server/src/test/java/com/vaadin/ui/UIThemeEscapingTest.java
index 7a0a5551e3..7a0a5551e3 100644
--- a/server/tests/src/com/vaadin/ui/UIThemeEscapingTest.java
+++ b/server/src/test/java/com/vaadin/ui/UIThemeEscapingTest.java
diff --git a/server/tests/src/com/vaadin/ui/VerticalSplitPanelTest.java b/server/src/test/java/com/vaadin/ui/VerticalSplitPanelTest.java
index c48caf8144..c48caf8144 100644
--- a/server/tests/src/com/vaadin/ui/VerticalSplitPanelTest.java
+++ b/server/src/test/java/com/vaadin/ui/VerticalSplitPanelTest.java
diff --git a/server/tests/src/com/vaadin/ui/declarative/DesignTest.java b/server/src/test/java/com/vaadin/ui/declarative/DesignTest.java
index f1d6982992..f1d6982992 100644
--- a/server/tests/src/com/vaadin/ui/declarative/DesignTest.java
+++ b/server/src/test/java/com/vaadin/ui/declarative/DesignTest.java
diff --git a/server/tests/src/com/vaadin/util/CurrentInstanceTest.java b/server/src/test/java/com/vaadin/util/CurrentInstanceTest.java
index 458e8a2f6c..458e8a2f6c 100644
--- a/server/tests/src/com/vaadin/util/CurrentInstanceTest.java
+++ b/server/src/test/java/com/vaadin/util/CurrentInstanceTest.java
diff --git a/server/tests/src/com/vaadin/util/ReflectToolsGetFieldValueByTypeTest.java b/server/src/test/java/com/vaadin/util/ReflectToolsGetFieldValueByTypeTest.java
index 67796314c0..67796314c0 100644
--- a/server/tests/src/com/vaadin/util/ReflectToolsGetFieldValueByTypeTest.java
+++ b/server/src/test/java/com/vaadin/util/ReflectToolsGetFieldValueByTypeTest.java
diff --git a/server/tests/src/com/vaadin/util/ReflectToolsGetPrimitiveFieldValueTest.java b/server/src/test/java/com/vaadin/util/ReflectToolsGetPrimitiveFieldValueTest.java
index 40e8f05e1e..40e8f05e1e 100644
--- a/server/tests/src/com/vaadin/util/ReflectToolsGetPrimitiveFieldValueTest.java
+++ b/server/src/test/java/com/vaadin/util/ReflectToolsGetPrimitiveFieldValueTest.java
diff --git a/server/tests/src/com/vaadin/tests/design/DesignReadInConstructor.html b/server/src/test/resources/com/vaadin/tests/design/DesignReadInConstructor.html
index 72f65d744a..72f65d744a 100644
--- a/server/tests/src/com/vaadin/tests/design/DesignReadInConstructor.html
+++ b/server/src/test/resources/com/vaadin/tests/design/DesignReadInConstructor.html
diff --git a/server/tests/src/com/vaadin/tests/design/MyVerticalLayout.html b/server/src/test/resources/com/vaadin/tests/design/MyVerticalLayout.html
index f6f4d98259..f6f4d98259 100644
--- a/server/tests/src/com/vaadin/tests/design/MyVerticalLayout.html
+++ b/server/src/test/resources/com/vaadin/tests/design/MyVerticalLayout.html
diff --git a/server/tests/src/com/vaadin/tests/design/all-components-legacy.html b/server/src/test/resources/com/vaadin/tests/design/all-components-legacy.html
index 39aecb6db1..39aecb6db1 100644
--- a/server/tests/src/com/vaadin/tests/design/all-components-legacy.html
+++ b/server/src/test/resources/com/vaadin/tests/design/all-components-legacy.html
diff --git a/server/tests/src/com/vaadin/tests/design/all-components.html b/server/src/test/resources/com/vaadin/tests/design/all-components.html
index 6507188cd7..6507188cd7 100644
--- a/server/tests/src/com/vaadin/tests/design/all-components.html
+++ b/server/src/test/resources/com/vaadin/tests/design/all-components.html
diff --git a/server/tests/src/com/vaadin/tests/design/designroot/DesignWithEmptyAnnotation.html b/server/src/test/resources/com/vaadin/tests/design/designroot/DesignWithEmptyAnnotation.html
index 3e7977f568..3e7977f568 100644
--- a/server/tests/src/com/vaadin/tests/design/designroot/DesignWithEmptyAnnotation.html
+++ b/server/src/test/resources/com/vaadin/tests/design/designroot/DesignWithEmptyAnnotation.html
diff --git a/server/tests/src/com/vaadin/tests/design/duplicate-ids.html b/server/src/test/resources/com/vaadin/tests/design/duplicate-ids.html
index 984bb1e047..984bb1e047 100644
--- a/server/tests/src/com/vaadin/tests/design/duplicate-ids.html
+++ b/server/src/test/resources/com/vaadin/tests/design/duplicate-ids.html
diff --git a/server/tests/src/com/vaadin/tests/design/duplicate-local-ids.html b/server/src/test/resources/com/vaadin/tests/design/duplicate-local-ids.html
index e8a698a39f..e8a698a39f 100644
--- a/server/tests/src/com/vaadin/tests/design/duplicate-local-ids.html
+++ b/server/src/test/resources/com/vaadin/tests/design/duplicate-local-ids.html
diff --git a/server/tests/src/com/vaadin/tests/design/local-ids.html b/server/src/test/resources/com/vaadin/tests/design/local-ids.html
index 76ff642ee0..76ff642ee0 100644
--- a/server/tests/src/com/vaadin/tests/design/local-ids.html
+++ b/server/src/test/resources/com/vaadin/tests/design/local-ids.html
diff --git a/server/tests/src/com/vaadin/tests/design/nested/mychilddesign.html b/server/src/test/resources/com/vaadin/tests/design/nested/mychilddesign.html
index 0d2613539b..0d2613539b 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/mychilddesign.html
+++ b/server/src/test/resources/com/vaadin/tests/design/nested/mychilddesign.html
diff --git a/server/tests/src/com/vaadin/tests/design/nested/mydesignroot.html b/server/src/test/resources/com/vaadin/tests/design/nested/mydesignroot.html
index 6bf38db8f6..6bf38db8f6 100644
--- a/server/tests/src/com/vaadin/tests/design/nested/mydesignroot.html
+++ b/server/src/test/resources/com/vaadin/tests/design/nested/mydesignroot.html
diff --git a/server/tests/src/com/vaadin/tests/design/testFile-legacy.html b/server/src/test/resources/com/vaadin/tests/design/testFile-legacy.html
index 79ae1e9eaf..79ae1e9eaf 100644
--- a/server/tests/src/com/vaadin/tests/design/testFile-legacy.html
+++ b/server/src/test/resources/com/vaadin/tests/design/testFile-legacy.html
diff --git a/server/tests/src/com/vaadin/tests/design/testFile.html b/server/src/test/resources/com/vaadin/tests/design/testFile.html
index ab23d1d1b2..ab23d1d1b2 100644
--- a/server/tests/src/com/vaadin/tests/design/testFile.html
+++ b/server/src/test/resources/com/vaadin/tests/design/testFile.html
diff --git a/server/tests/src/com/vaadin/tests/design/verticallayout-one-child.html b/server/src/test/resources/com/vaadin/tests/design/verticallayout-one-child.html
index cf3dc65e48..cf3dc65e48 100644
--- a/server/tests/src/com/vaadin/tests/design/verticallayout-one-child.html
+++ b/server/src/test/resources/com/vaadin/tests/design/verticallayout-one-child.html
diff --git a/server/tests/src/com/vaadin/tests/design/verticallayout-two-children.html b/server/src/test/resources/com/vaadin/tests/design/verticallayout-two-children.html
index dcf71a190b..dcf71a190b 100644
--- a/server/tests/src/com/vaadin/tests/design/verticallayout-two-children.html
+++ b/server/src/test/resources/com/vaadin/tests/design/verticallayout-two-children.html
diff --git a/server/src/test/resources/com/vaadin/tests/styles.scss b/server/src/test/resources/com/vaadin/tests/styles.scss
new file mode 100644
index 0000000000..7a8c625919
--- /dev/null
+++ b/server/src/test/resources/com/vaadin/tests/styles.scss
@@ -0,0 +1,5 @@
+@import "../../../../../../themes/src/main/themes/VAADIN/themes/valo/valo";
+
+.my-label {
+    @include transition-property (transform);
+}
\ No newline at end of file
diff --git a/server/tests/src/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java b/server/tests/src/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java
deleted file mode 100644
index 6e81af97a3..0000000000
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.vaadin.tests.data.converter;
-
-import junit.framework.TestCase;
-
-import com.vaadin.data.util.converter.StringToBooleanConverter;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-public class StringToBooleanConverterTest extends TestCase {
-
-    StringToBooleanConverter converter = new StringToBooleanConverter();
-    StringToBooleanConverter yesNoConverter = new StringToBooleanConverter("yes","no");
-    StringToBooleanConverter localeConverter = new StringToBooleanConverter() {
-        @Override
-        public String getFalseString(Locale locale) {
-            return SimpleDateFormat.getDateInstance(SimpleDateFormat.LONG,locale).format(new Date(3000000000000L));
-        }
-
-        @Override
-        public String getTrueString(Locale locale) {
-            return SimpleDateFormat.getDateInstance(SimpleDateFormat.LONG,locale).format(new Date(2000000000000L));
-        }
-    };
-
-    public void testNullConversion() {
-        assertEquals(null, converter.convertToModel(null, Boolean.class, null));
-    }
-
-    public void testEmptyStringConversion() {
-        assertEquals(null, converter.convertToModel("", Boolean.class, null));
-    }
-
-    public void testValueConversion() {
-        assertTrue(converter.convertToModel("true", Boolean.class, null));
-        assertFalse(converter.convertToModel("false", Boolean.class, null));
-    }
-
-    public void testYesNoValueConversion() {
-        assertTrue(yesNoConverter.convertToModel("yes", Boolean.class, null));
-        assertFalse(yesNoConverter.convertToModel("no", Boolean.class, null));
-
-        assertEquals("yes", yesNoConverter.convertToPresentation(true, String.class, null));
-        assertEquals("no", yesNoConverter.convertToPresentation(false, String.class, null));
-    }
-
-
-    public void testLocale() {
-        assertEquals("May 18, 2033", localeConverter.convertToPresentation(true, String.class, Locale.US));
-        assertEquals("January 24, 2065", localeConverter.convertToPresentation(false, String.class, Locale.US));
-
-        assertEquals("18. Mai 2033", localeConverter.convertToPresentation(true, String.class, Locale.GERMANY));
-        assertEquals("24. Januar 2065", localeConverter.convertToPresentation(false, String.class, Locale.GERMANY));
-    }
-
-}
diff --git a/server/tests/src/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java b/server/tests/src/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java
deleted file mode 100644
index 7054587009..0000000000
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.vaadin.tests.data.converter;
-
-import junit.framework.TestCase;
-
-import com.vaadin.data.util.converter.StringToDoubleConverter;
-
-public class StringToDoubleConverterTest extends TestCase {
-
-    StringToDoubleConverter converter = new StringToDoubleConverter();
-
-    public void testNullConversion() {
-        assertEquals(null, converter.convertToModel(null, Double.class, null));
-    }
-
-    public void testEmptyStringConversion() {
-        assertEquals(null, converter.convertToModel("", Double.class, null));
-    }
-
-    public void testValueConversion() {
-        assertEquals(10.0, converter.convertToModel("10", Double.class, null));
-    }
-}
diff --git a/server/tests/src/com/vaadin/tests/styles.scss b/server/tests/src/com/vaadin/tests/styles.scss
deleted file mode 100644
index d574243969..0000000000
--- a/server/tests/src/com/vaadin/tests/styles.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@import "../../../../../../WebContent/VAADIN/themes/valo/valo";
-
-.my-label {
-    @include transition-property (transform);
-}
\ No newline at end of file
diff --git a/shared/build.xml b/shared/build.xml
deleted file mode 100644
index 30f4ac65ce..0000000000
--- a/shared/build.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="vaadin-shared" basedir="." default="publish-local"
-    xmlns:ivy="antlib:org.apache.ivy.ant">
-    <description>
-        The shared module containing classes used by both server and client.
-    </description>
-    <include file="../common.xml" as="common" />
-    <include file="../build.xml" as="vaadin" />
-    <include file="../gwt-files.xml" as="gwtfiles" />
-
-    <!-- global properties -->
-    <property name="module.name" value="vaadin-shared" />
-    <property name="module.symbolic" value="com.vaadin.shared" />
-    <property name="result.dir" location="result" />
-    <property name="src.filtered" location="${result.dir}/filtered-src" />
-    <property name="src" location="${src.filtered}" />
-    <path id="classpath.compile.custom">
-        <fileset file="${gwt.elemental.jar}" />
-    </path>
-    <path id="classpath.test.custom" />
-
-    <target name="jar">
-        <property name="shared.osgi.import"
-            value="com.google.gwt.thirdparty.streamhtmlparser;version=&quot;0.0.10.vaadin1&quot;, com.google.gwt.thirdparty.streamhtmlparser.impl;version=&quot;0.0.10.vaadin1&quot;, com.google.gwt.thirdparty.streamhtmlparser.util;version=&quot;0.0.10.vaadin1&quot;, org.w3c.flute.parser;version=&quot;1.3.0.gg2&quot;, org.w3c.flute.parser.selectors;version=&quot;1.3.0.gg2&quot;, org.w3c.flute.util;version=&quot;1.3.0.gg2&quot;" />
-        <property name="shared.osgi.require-bundle"
-            value="com.google.gwt.thirdparty.guava;bundle-version=&quot;16.0.1.vaadin1&quot;" />
-        <delete dir="${src.filtered}" />
-        <!-- Update version in Version.java -->
-        <copy todir="${src.filtered}">
-            <fileset dir="src">
-            </fileset>
-            <filterchain>
-                <replacetokens begintoken="@" endtoken="@">
-                    <token key="VERSION" value="${vaadin.version}" />
-                </replacetokens>
-            </filterchain>
-        </copy>
-
-        <antcall target="common.jar">
-            <param name="import-package" value="${shared.osgi.import}" />
-            <param name="require-bundle" value="${shared.osgi.require-bundle}" />
-            <reference refid="shared.gwt.includes" torefid="extra.jar.includes" />
-            <param name="osgi.extra.package.prefixes" value="elemental" />
-        </antcall>
-    </target>
-
-    <target name="publish-local" depends="jar">
-        <antcall target="common.sources.jar">
-            <reference torefid="extra.jar.includes" refid="shared.gwt.includes" />
-        </antcall>
-        <antcall target="common.javadoc.jar" />
-
-        <antcall target="common.publish-local" />
-    </target>
-
-    <target name="clean">
-        <antcall target="common.clean" />
-    </target>
-
-    <target name="checkstyle">
-        <antcall target="common.checkstyle">
-            <param name="cs.src" location="src" />
-        </antcall>
-    </target>
-
-    <target name="test" depends="checkstyle">
-        <antcall target="common.test.run" />
-    </target>
-
-</project>
diff --git a/shared/ivy.xml b/shared/ivy.xml
deleted file mode 100644
index dcb7390c04..0000000000
--- a/shared/ivy.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
-    xmlns:m="http://ant.apache.org/ivy/maven">
-
-    <info organisation="com.vaadin" module="vaadin-shared"
-        revision="${vaadin.version}" />
-
-    <configurations>
-        <conf name="build" />
-        <conf name="build-provided" />
-        <conf name="ide" visibility="private" />
-        <conf name="test" />
-    </configurations>
-    <publications>
-        <artifact type="jar" ext="jar" />
-        <artifact type="source" ext="jar" m:classifier="sources" />
-        <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
-        <artifact type="pom" ext="pom" />
-    </publications>
-    <dependencies>
-        <dependency org="com.vaadin.external.flute" name="flute"
-            rev="1.3.0.gg2" conf="build,ide,test->default" />
-        <dependency org="com.vaadin.external.streamhtmlparser"
-            name="streamhtmlparser-jsilver" rev="0.0.10.vaadin1"
-            conf="build,ide,test->default" />
-        <dependency org="com.vaadin.external.google" name="guava"
-            rev="16.0.1.vaadin1" conf="build,ide,test->default" />
-        <dependency org="junit" name="junit" rev="4.11"
-            conf="test,ide -> default" />
-
-    </dependencies>
-
-</ivy-module>
diff --git a/shared/pom.xml b/shared/pom.xml
new file mode 100644
index 0000000000..8706e45f70
--- /dev/null
+++ b/shared/pom.xml
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.vaadin</groupId>
+		<artifactId>vaadin-root</artifactId>
+		<version>7.7.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>vaadin-shared</artifactId>
+	<name>vaadin-shared</name>
+	<packaging>jar</packaging>
+
+	<properties>
+		<flute.version>1.3.0.gg2</flute.version>
+		<streamhtmlparser.version>0.0.10.vaadin1</streamhtmlparser.version>
+	</properties>
+
+	<url>https://vaadin.com/</url>
+	<description>Vaadin shared</description>
+
+	<dependencies>
+		<!-- Actual dependencies -->
+		<dependency>
+			<groupId>com.vaadin.external.flute</groupId>
+			<artifactId>flute</artifactId>
+			<version>${flute.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin.external.streamhtmlparser</groupId>
+			<artifactId>streamhtmlparser-jsilver</artifactId>
+			<version>${streamhtmlparser.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin.external.google</groupId>
+			<artifactId>guava</artifactId>
+			<version>${guava.version}</version>
+		</dependency>
+
+		<!-- Needed GWT dependencies. Required parts are packaged to jar -->
+		<dependency>
+			<groupId>com.vaadin.external.gwt</groupId>
+			<artifactId>gwt-elemental</artifactId>
+			<version>${vaadin.gwt.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin.external.gwt</groupId>
+			<artifactId>gwt-user</artifactId>
+			<version>${vaadin.gwt.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<!-- Generated Version.java -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>templating-maven-plugin</artifactId>
+				<version>1.0.0</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>filter-sources</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- Copy needed GWT dependencies to package -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>unpack-dependencies</id>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>com.vaadin.external.gwt</groupId>
+									<artifactId>gwt-elemental</artifactId>
+									<includes>
+										elemental/json/**,
+										elemental/util/Array*,
+										elemental/util/Can*,
+										elemental/util/Map*
+									</includes>
+								</artifactItem>
+								<artifactItem>
+									<groupId>com.vaadin.external.gwt</groupId>
+									<artifactId>gwt-user</artifactId>
+									<includes>
+										com/google/gwt/*/shared/**,
+										com/google/gwt/*/*/shared/**,
+										com/google/web/bindery/*/shared/**,
+										com/google/gwt/user/client/rpc/IsSerializable.*
+									</includes>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<!-- Copy .java files to package -->
+					<execution>
+						<id>copy-sources</id>
+						<!-- here the phase you need -->
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.outputDirectory}</outputDirectory>
+							<resources>
+								<resource>
+									<directory>src/main/java</directory>
+									<filtering>false</filtering>
+								</resource>
+								<resource>
+									<directory>${project.build.directory}/generated-sources/java-templates</directory>
+									<filtering>false</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+						<Export-Package>com.vaadin.*;version="${project.version}",com.google.*;version="${project.version}",elemental.*;version="${project.version}"</Export-Package>
+						<Import-Package>com.google.gwt.thirdparty.streamhtmlparser;version="${streamhtmlparser.version}",
+							com.google.gwt.thirdparty.streamhtmlparser.impl;version="${streamhtmlparser.version}",
+							com.google.gwt.thirdparty.streamhtmlparser.util;version="${streamhtmlparser.version}",
+							org.w3c.flute.parser;version="${flute.version}",
+							org.w3c.flute.parser.selectors;version="${flute.version}",
+							org.w3c.flute.util;version="${flute.version}"</Import-Package>
+						<Require-Bundle>com.google.gwt.thirdparty.guava;bundle-version="${guava.version}"</Require-Bundle>
+					</instructions>
+				</configuration>
+				<executions>
+					<execution>
+						<id>bundle-manifest</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+						<index>false</index>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>checkstyle</goal>
+						</goals>
+						<phase>process-sources</phase>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/shared/src/com/vaadin/shared/Version.java b/shared/src/main/java-templates/com/vaadin/shared/Version.java
index a492229643..dc781f33ed 100644
--- a/shared/src/com/vaadin/shared/Version.java
+++ b/shared/src/main/java-templates/com/vaadin/shared/Version.java
@@ -47,12 +47,12 @@ public class Version implements Serializable {
 
     /* Initialize version numbers from string replaced by build-script. */
     static {
-        if ("@VERSION@".equals("@" + "VERSION" + "@")) {
+        if ("${project.version}".equals("${" + "project.version" + "}")) {
             VERSION = "9.9.9.INTERNAL-DEBUG-BUILD";
         } else {
-            VERSION = "@VERSION@";
+            VERSION = "${project.version}";
         }
-        final String[] digits = VERSION.split("\\.", 4);
+        final String[] digits = VERSION.split("[-.]", 4);
         VERSION_MAJOR = Integer.parseInt(digits[0]);
         VERSION_MINOR = Integer.parseInt(digits[1]);
         VERSION_REVISION = Integer.parseInt(digits[2]);
diff --git a/shared/src/com/vaadin/shared/AbstractComponentState.java b/shared/src/main/java/com/vaadin/shared/AbstractComponentState.java
index 1c32a67c70..1c32a67c70 100644
--- a/shared/src/com/vaadin/shared/AbstractComponentState.java
+++ b/shared/src/main/java/com/vaadin/shared/AbstractComponentState.java
diff --git a/shared/src/com/vaadin/shared/AbstractFieldState.java b/shared/src/main/java/com/vaadin/shared/AbstractFieldState.java
index 3e9fd811de..3e9fd811de 100644
--- a/shared/src/com/vaadin/shared/AbstractFieldState.java
+++ b/shared/src/main/java/com/vaadin/shared/AbstractFieldState.java
diff --git a/shared/src/com/vaadin/shared/ApplicationConstants.java b/shared/src/main/java/com/vaadin/shared/ApplicationConstants.java
index e5da716eb3..e5da716eb3 100644
--- a/shared/src/com/vaadin/shared/ApplicationConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ApplicationConstants.java
diff --git a/shared/src/com/vaadin/shared/ComponentConstants.java b/shared/src/main/java/com/vaadin/shared/ComponentConstants.java
index dae1382256..dae1382256 100644
--- a/shared/src/com/vaadin/shared/ComponentConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ComponentConstants.java
diff --git a/shared/src/com/vaadin/shared/Connector.java b/shared/src/main/java/com/vaadin/shared/Connector.java
index c4a880f5ea..c4a880f5ea 100644
--- a/shared/src/com/vaadin/shared/Connector.java
+++ b/shared/src/main/java/com/vaadin/shared/Connector.java
diff --git a/shared/src/com/vaadin/shared/ContextClickRpc.java b/shared/src/main/java/com/vaadin/shared/ContextClickRpc.java
index 2152de0863..2152de0863 100644
--- a/shared/src/com/vaadin/shared/ContextClickRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ContextClickRpc.java
diff --git a/shared/src/com/vaadin/shared/EventId.java b/shared/src/main/java/com/vaadin/shared/EventId.java
index ad840d1e5d..ad840d1e5d 100644
--- a/shared/src/com/vaadin/shared/EventId.java
+++ b/shared/src/main/java/com/vaadin/shared/EventId.java
diff --git a/shared/src/com/vaadin/shared/JavaScriptConnectorState.java b/shared/src/main/java/com/vaadin/shared/JavaScriptConnectorState.java
index 12c9728628..12c9728628 100644
--- a/shared/src/com/vaadin/shared/JavaScriptConnectorState.java
+++ b/shared/src/main/java/com/vaadin/shared/JavaScriptConnectorState.java
diff --git a/shared/src/com/vaadin/shared/JavaScriptExtensionState.java b/shared/src/main/java/com/vaadin/shared/JavaScriptExtensionState.java
index 5050ffec10..5050ffec10 100644
--- a/shared/src/com/vaadin/shared/JavaScriptExtensionState.java
+++ b/shared/src/main/java/com/vaadin/shared/JavaScriptExtensionState.java
diff --git a/shared/src/com/vaadin/shared/JsonConstants.java b/shared/src/main/java/com/vaadin/shared/JsonConstants.java
index fd26d2ab74..fd26d2ab74 100644
--- a/shared/src/com/vaadin/shared/JsonConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/JsonConstants.java
diff --git a/shared/src/com/vaadin/shared/MouseEventDetails.java b/shared/src/main/java/com/vaadin/shared/MouseEventDetails.java
index 3c06ee80f3..3c06ee80f3 100644
--- a/shared/src/com/vaadin/shared/MouseEventDetails.java
+++ b/shared/src/main/java/com/vaadin/shared/MouseEventDetails.java
diff --git a/shared/src/com/vaadin/shared/Position.java b/shared/src/main/java/com/vaadin/shared/Position.java
index 9234c798d1..9234c798d1 100755
--- a/shared/src/com/vaadin/shared/Position.java
+++ b/shared/src/main/java/com/vaadin/shared/Position.java
diff --git a/shared/src/com/vaadin/shared/VBrowserDetails.java b/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java
index a7426d2022..a7426d2022 100644
--- a/shared/src/com/vaadin/shared/VBrowserDetails.java
+++ b/shared/src/main/java/com/vaadin/shared/VBrowserDetails.java
diff --git a/shared/src/com/vaadin/shared/VaadinUriResolver.java b/shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java
index ee8d13f10f..ee8d13f10f 100644
--- a/shared/src/com/vaadin/shared/VaadinUriResolver.java
+++ b/shared/src/main/java/com/vaadin/shared/VaadinUriResolver.java
diff --git a/shared/src/com/vaadin/shared/annotations/Delayed.java b/shared/src/main/java/com/vaadin/shared/annotations/Delayed.java
index f7e24de006..f7e24de006 100644
--- a/shared/src/com/vaadin/shared/annotations/Delayed.java
+++ b/shared/src/main/java/com/vaadin/shared/annotations/Delayed.java
diff --git a/shared/src/com/vaadin/shared/annotations/DelegateToWidget.java b/shared/src/main/java/com/vaadin/shared/annotations/DelegateToWidget.java
index ee5cf78a68..ee5cf78a68 100644
--- a/shared/src/com/vaadin/shared/annotations/DelegateToWidget.java
+++ b/shared/src/main/java/com/vaadin/shared/annotations/DelegateToWidget.java
diff --git a/shared/src/com/vaadin/shared/annotations/NoLayout.java b/shared/src/main/java/com/vaadin/shared/annotations/NoLayout.java
index b77729cdcc..b77729cdcc 100644
--- a/shared/src/com/vaadin/shared/annotations/NoLayout.java
+++ b/shared/src/main/java/com/vaadin/shared/annotations/NoLayout.java
diff --git a/shared/src/com/vaadin/shared/annotations/NoLoadingIndicator.java b/shared/src/main/java/com/vaadin/shared/annotations/NoLoadingIndicator.java
index 2e519b69e8..2e519b69e8 100644
--- a/shared/src/com/vaadin/shared/annotations/NoLoadingIndicator.java
+++ b/shared/src/main/java/com/vaadin/shared/annotations/NoLoadingIndicator.java
diff --git a/shared/src/com/vaadin/shared/communication/ClientRpc.java b/shared/src/main/java/com/vaadin/shared/communication/ClientRpc.java
index e400c7de7c..e400c7de7c 100644
--- a/shared/src/com/vaadin/shared/communication/ClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/communication/ClientRpc.java
diff --git a/shared/src/com/vaadin/shared/communication/FieldRpc.java b/shared/src/main/java/com/vaadin/shared/communication/FieldRpc.java
index 28ae8d39b6..28ae8d39b6 100644
--- a/shared/src/com/vaadin/shared/communication/FieldRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/communication/FieldRpc.java
diff --git a/shared/src/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java b/shared/src/main/java/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java
index 4d21b5af7a..4d21b5af7a 100644
--- a/shared/src/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java
+++ b/shared/src/main/java/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java
diff --git a/shared/src/com/vaadin/shared/communication/MethodInvocation.java b/shared/src/main/java/com/vaadin/shared/communication/MethodInvocation.java
index a4370f37de..a4370f37de 100644
--- a/shared/src/com/vaadin/shared/communication/MethodInvocation.java
+++ b/shared/src/main/java/com/vaadin/shared/communication/MethodInvocation.java
diff --git a/shared/src/com/vaadin/shared/communication/PushConstants.java b/shared/src/main/java/com/vaadin/shared/communication/PushConstants.java
index 5b23cd7f6e..5b23cd7f6e 100644
--- a/shared/src/com/vaadin/shared/communication/PushConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/communication/PushConstants.java
diff --git a/shared/src/com/vaadin/shared/communication/PushMode.java b/shared/src/main/java/com/vaadin/shared/communication/PushMode.java
index 7b0f968c77..7b0f968c77 100644
--- a/shared/src/com/vaadin/shared/communication/PushMode.java
+++ b/shared/src/main/java/com/vaadin/shared/communication/PushMode.java
diff --git a/shared/src/com/vaadin/shared/communication/ServerRpc.java b/shared/src/main/java/com/vaadin/shared/communication/ServerRpc.java
index e23b3758c6..e23b3758c6 100644
--- a/shared/src/com/vaadin/shared/communication/ServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/communication/ServerRpc.java
diff --git a/shared/src/com/vaadin/shared/communication/SharedState.java b/shared/src/main/java/com/vaadin/shared/communication/SharedState.java
index b21a675a4a..b21a675a4a 100644
--- a/shared/src/com/vaadin/shared/communication/SharedState.java
+++ b/shared/src/main/java/com/vaadin/shared/communication/SharedState.java
diff --git a/shared/src/com/vaadin/shared/communication/URLReference.java b/shared/src/main/java/com/vaadin/shared/communication/URLReference.java
index be767fb25c..be767fb25c 100644
--- a/shared/src/com/vaadin/shared/communication/URLReference.java
+++ b/shared/src/main/java/com/vaadin/shared/communication/URLReference.java
diff --git a/shared/src/com/vaadin/shared/communication/UidlValue.java b/shared/src/main/java/com/vaadin/shared/communication/UidlValue.java
index 04015213f9..04015213f9 100644
--- a/shared/src/com/vaadin/shared/communication/UidlValue.java
+++ b/shared/src/main/java/com/vaadin/shared/communication/UidlValue.java
diff --git a/shared/src/com/vaadin/shared/data/DataProviderRpc.java b/shared/src/main/java/com/vaadin/shared/data/DataProviderRpc.java
index 05965ea56c..05965ea56c 100644
--- a/shared/src/com/vaadin/shared/data/DataProviderRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/data/DataProviderRpc.java
diff --git a/shared/src/com/vaadin/shared/data/DataRequestRpc.java b/shared/src/main/java/com/vaadin/shared/data/DataRequestRpc.java
index 4b553dda68..4b553dda68 100644
--- a/shared/src/com/vaadin/shared/data/DataRequestRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/data/DataRequestRpc.java
diff --git a/shared/src/com/vaadin/shared/data/sort/SortDirection.java b/shared/src/main/java/com/vaadin/shared/data/sort/SortDirection.java
index cd572087d7..cd572087d7 100644
--- a/shared/src/com/vaadin/shared/data/sort/SortDirection.java
+++ b/shared/src/main/java/com/vaadin/shared/data/sort/SortDirection.java
diff --git a/shared/src/com/vaadin/shared/extension/javascriptmanager/ExecuteJavaScriptRpc.java b/shared/src/main/java/com/vaadin/shared/extension/javascriptmanager/ExecuteJavaScriptRpc.java
index 7a75bcbec1..7a75bcbec1 100644
--- a/shared/src/com/vaadin/shared/extension/javascriptmanager/ExecuteJavaScriptRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/extension/javascriptmanager/ExecuteJavaScriptRpc.java
diff --git a/shared/src/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java b/shared/src/main/java/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java
index e5af6a04f8..e5af6a04f8 100644
--- a/shared/src/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java
+++ b/shared/src/main/java/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java
diff --git a/shared/src/com/vaadin/shared/ui/AbstractEmbeddedState.java b/shared/src/main/java/com/vaadin/shared/ui/AbstractEmbeddedState.java
index 0cb9be8702..0cb9be8702 100644
--- a/shared/src/com/vaadin/shared/ui/AbstractEmbeddedState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/AbstractEmbeddedState.java
diff --git a/shared/src/com/vaadin/shared/ui/AbstractLayoutState.java b/shared/src/main/java/com/vaadin/shared/ui/AbstractLayoutState.java
index 49e5e1c36a..49e5e1c36a 100644
--- a/shared/src/com/vaadin/shared/ui/AbstractLayoutState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/AbstractLayoutState.java
diff --git a/shared/src/com/vaadin/shared/ui/AbstractMediaState.java b/shared/src/main/java/com/vaadin/shared/ui/AbstractMediaState.java
index 3029bedca7..3029bedca7 100644
--- a/shared/src/com/vaadin/shared/ui/AbstractMediaState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/AbstractMediaState.java
diff --git a/shared/src/com/vaadin/shared/ui/AlignmentInfo.java b/shared/src/main/java/com/vaadin/shared/ui/AlignmentInfo.java
index 120552a43d..120552a43d 100644
--- a/shared/src/com/vaadin/shared/ui/AlignmentInfo.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/AlignmentInfo.java
diff --git a/shared/src/com/vaadin/shared/ui/BorderStyle.java b/shared/src/main/java/com/vaadin/shared/ui/BorderStyle.java
index ff5c7c7179..ff5c7c7179 100755
--- a/shared/src/com/vaadin/shared/ui/BorderStyle.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/BorderStyle.java
diff --git a/shared/src/com/vaadin/shared/ui/BrowserWindowOpenerState.java b/shared/src/main/java/com/vaadin/shared/ui/BrowserWindowOpenerState.java
index 6196ea09ac..6196ea09ac 100644
--- a/shared/src/com/vaadin/shared/ui/BrowserWindowOpenerState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/BrowserWindowOpenerState.java
diff --git a/shared/src/com/vaadin/shared/ui/ClickRpc.java b/shared/src/main/java/com/vaadin/shared/ui/ClickRpc.java
index 388ac14882..388ac14882 100644
--- a/shared/src/com/vaadin/shared/ui/ClickRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ClickRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/ComponentStateUtil.java b/shared/src/main/java/com/vaadin/shared/ui/ComponentStateUtil.java
index 894a1bbcbb..894a1bbcbb 100644
--- a/shared/src/com/vaadin/shared/ui/ComponentStateUtil.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ComponentStateUtil.java
diff --git a/shared/src/com/vaadin/shared/ui/Connect.java b/shared/src/main/java/com/vaadin/shared/ui/Connect.java
index b0c20cec31..b0c20cec31 100644
--- a/shared/src/com/vaadin/shared/ui/Connect.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/Connect.java
diff --git a/shared/src/com/vaadin/shared/ui/JavaScriptComponentState.java b/shared/src/main/java/com/vaadin/shared/ui/JavaScriptComponentState.java
index 3208934146..3208934146 100644
--- a/shared/src/com/vaadin/shared/ui/JavaScriptComponentState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/JavaScriptComponentState.java
diff --git a/shared/src/com/vaadin/shared/ui/LayoutClickRpc.java b/shared/src/main/java/com/vaadin/shared/ui/LayoutClickRpc.java
index bd46bbda3d..bd46bbda3d 100644
--- a/shared/src/com/vaadin/shared/ui/LayoutClickRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/LayoutClickRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/MarginInfo.java b/shared/src/main/java/com/vaadin/shared/ui/MarginInfo.java
index c66d1f0a11..c66d1f0a11 100644
--- a/shared/src/com/vaadin/shared/ui/MarginInfo.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/MarginInfo.java
diff --git a/shared/src/com/vaadin/shared/ui/MediaControl.java b/shared/src/main/java/com/vaadin/shared/ui/MediaControl.java
index ab31d6f95f..ab31d6f95f 100644
--- a/shared/src/com/vaadin/shared/ui/MediaControl.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/MediaControl.java
diff --git a/shared/src/com/vaadin/shared/ui/MultiSelectMode.java b/shared/src/main/java/com/vaadin/shared/ui/MultiSelectMode.java
index b628017a12..b628017a12 100644
--- a/shared/src/com/vaadin/shared/ui/MultiSelectMode.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/MultiSelectMode.java
diff --git a/shared/src/com/vaadin/shared/ui/Orientation.java b/shared/src/main/java/com/vaadin/shared/ui/Orientation.java
index b370ba8109..b370ba8109 100644
--- a/shared/src/com/vaadin/shared/ui/Orientation.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/Orientation.java
diff --git a/shared/src/com/vaadin/shared/ui/ShortCutConstants.java b/shared/src/main/java/com/vaadin/shared/ui/ShortCutConstants.java
index d7049c2a74..d7049c2a74 100644
--- a/shared/src/com/vaadin/shared/ui/ShortCutConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ShortCutConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/TabIndexState.java b/shared/src/main/java/com/vaadin/shared/ui/TabIndexState.java
index 1afe982546..1afe982546 100644
--- a/shared/src/com/vaadin/shared/ui/TabIndexState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/TabIndexState.java
diff --git a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutServerRpc.java
index 9ec88db2c2..9ec88db2c2 100644
--- a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java b/shared/src/main/java/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java
index 865d1420d5..865d1420d5 100644
--- a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java
diff --git a/shared/src/com/vaadin/shared/ui/accordion/AccordionState.java b/shared/src/main/java/com/vaadin/shared/ui/accordion/AccordionState.java
index cbb7447a25..cbb7447a25 100644
--- a/shared/src/com/vaadin/shared/ui/accordion/AccordionState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/accordion/AccordionState.java
diff --git a/shared/src/com/vaadin/shared/ui/audio/AudioState.java b/shared/src/main/java/com/vaadin/shared/ui/audio/AudioState.java
index f0b4501e82..f0b4501e82 100644
--- a/shared/src/com/vaadin/shared/ui/audio/AudioState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/audio/AudioState.java
diff --git a/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java b/shared/src/main/java/com/vaadin/shared/ui/browserframe/BrowserFrameState.java
index f8a5343cc9..f8a5343cc9 100644
--- a/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/browserframe/BrowserFrameState.java
diff --git a/shared/src/com/vaadin/shared/ui/button/ButtonServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/button/ButtonServerRpc.java
index d692fe5a6a..d692fe5a6a 100644
--- a/shared/src/com/vaadin/shared/ui/button/ButtonServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/button/ButtonServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/button/ButtonState.java b/shared/src/main/java/com/vaadin/shared/ui/button/ButtonState.java
index 01ef9a038b..01ef9a038b 100644
--- a/shared/src/com/vaadin/shared/ui/button/ButtonState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/button/ButtonState.java
diff --git a/shared/src/com/vaadin/shared/ui/button/NativeButtonState.java b/shared/src/main/java/com/vaadin/shared/ui/button/NativeButtonState.java
index 378b84832d..378b84832d 100644
--- a/shared/src/com/vaadin/shared/ui/button/NativeButtonState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/button/NativeButtonState.java
diff --git a/shared/src/com/vaadin/shared/ui/calendar/CalendarClientRpc.java b/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarClientRpc.java
index bffcde11a0..bffcde11a0 100644
--- a/shared/src/com/vaadin/shared/ui/calendar/CalendarClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarClientRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/calendar/CalendarEventId.java b/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarEventId.java
index 67a5fe11e2..67a5fe11e2 100644
--- a/shared/src/com/vaadin/shared/ui/calendar/CalendarEventId.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarEventId.java
diff --git a/shared/src/com/vaadin/shared/ui/calendar/CalendarServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarServerRpc.java
index 7b7856fee9..7b7856fee9 100644
--- a/shared/src/com/vaadin/shared/ui/calendar/CalendarServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/calendar/CalendarState.java b/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarState.java
index c26c4ead16..c26c4ead16 100644
--- a/shared/src/com/vaadin/shared/ui/calendar/CalendarState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/calendar/CalendarState.java
diff --git a/shared/src/com/vaadin/shared/ui/calendar/DateConstants.java b/shared/src/main/java/com/vaadin/shared/ui/calendar/DateConstants.java
index 48f42eebbe..48f42eebbe 100644
--- a/shared/src/com/vaadin/shared/ui/calendar/DateConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/calendar/DateConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java
index f4124100e0..f4124100e0 100644
--- a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java b/shared/src/main/java/com/vaadin/shared/ui/checkbox/CheckBoxState.java
index 10d3b46d93..10d3b46d93 100644
--- a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/checkbox/CheckBoxState.java
diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/Color.java b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/Color.java
index 8624327993..8624327993 100644
--- a/shared/src/com/vaadin/shared/ui/colorpicker/Color.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/Color.java
diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGradientServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerGradientServerRpc.java
index 374a41a0fe..374a41a0fe 100644
--- a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGradientServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerGradientServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGradientState.java b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerGradientState.java
index 8245ffeaac..8245ffeaac 100644
--- a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGradientState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerGradientState.java
diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGridServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerGridServerRpc.java
index ce5c4317b4..ce5c4317b4 100644
--- a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGridServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerGridServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGridState.java b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerGridState.java
index e3e90f5418..e3e90f5418 100644
--- a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGridState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerGridState.java
diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerServerRpc.java
index f556625025..f556625025 100644
--- a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerState.java b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerState.java
index 3fdce20ce7..3fdce20ce7 100644
--- a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/colorpicker/ColorPickerState.java
diff --git a/shared/src/com/vaadin/shared/ui/combobox/ComboBoxConstants.java b/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxConstants.java
index aeb04ba75f..aeb04ba75f 100644
--- a/shared/src/com/vaadin/shared/ui/combobox/ComboBoxConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java b/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxState.java
index 46e24aa266..46e24aa266 100644
--- a/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/combobox/ComboBoxState.java
diff --git a/shared/src/com/vaadin/shared/ui/combobox/FilteringMode.java b/shared/src/main/java/com/vaadin/shared/ui/combobox/FilteringMode.java
index 1c0b743cc6..1c0b743cc6 100644
--- a/shared/src/com/vaadin/shared/ui/combobox/FilteringMode.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/combobox/FilteringMode.java
diff --git a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/csslayout/CssLayoutServerRpc.java
index 1ff2f83d08..1ff2f83d08 100644
--- a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/csslayout/CssLayoutServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java b/shared/src/main/java/com/vaadin/shared/ui/csslayout/CssLayoutState.java
index 5fe61082d5..5fe61082d5 100644
--- a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/csslayout/CssLayoutState.java
diff --git a/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java b/shared/src/main/java/com/vaadin/shared/ui/customlayout/CustomLayoutState.java
index 04c7eed7e4..04c7eed7e4 100644
--- a/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/customlayout/CustomLayoutState.java
diff --git a/shared/src/com/vaadin/shared/ui/datefield/DateFieldConstants.java b/shared/src/main/java/com/vaadin/shared/ui/datefield/DateFieldConstants.java
index 48bc74c690..48bc74c690 100644
--- a/shared/src/com/vaadin/shared/ui/datefield/DateFieldConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/datefield/DateFieldConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java b/shared/src/main/java/com/vaadin/shared/ui/datefield/InlineDateFieldState.java
index b15d28f706..b15d28f706 100644
--- a/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/datefield/InlineDateFieldState.java
diff --git a/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java b/shared/src/main/java/com/vaadin/shared/ui/datefield/PopupDateFieldState.java
index 6f10af4314..6f10af4314 100644
--- a/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/datefield/PopupDateFieldState.java
diff --git a/shared/src/com/vaadin/shared/ui/datefield/Resolution.java b/shared/src/main/java/com/vaadin/shared/ui/datefield/Resolution.java
index 689db11188..689db11188 100644
--- a/shared/src/com/vaadin/shared/ui/datefield/Resolution.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/datefield/Resolution.java
diff --git a/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java b/shared/src/main/java/com/vaadin/shared/ui/datefield/TextualDateFieldState.java
index bf38ee04a9..bf38ee04a9 100644
--- a/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/datefield/TextualDateFieldState.java
diff --git a/shared/src/com/vaadin/shared/ui/dd/AcceptCriterion.java b/shared/src/main/java/com/vaadin/shared/ui/dd/AcceptCriterion.java
index fa3ec107a2..fa3ec107a2 100644
--- a/shared/src/com/vaadin/shared/ui/dd/AcceptCriterion.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/dd/AcceptCriterion.java
diff --git a/shared/src/com/vaadin/shared/ui/dd/DragEventType.java b/shared/src/main/java/com/vaadin/shared/ui/dd/DragEventType.java
index f894ed6219..f894ed6219 100644
--- a/shared/src/com/vaadin/shared/ui/dd/DragEventType.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/dd/DragEventType.java
diff --git a/shared/src/com/vaadin/shared/ui/dd/HorizontalDropLocation.java b/shared/src/main/java/com/vaadin/shared/ui/dd/HorizontalDropLocation.java
index 064815695a..064815695a 100644
--- a/shared/src/com/vaadin/shared/ui/dd/HorizontalDropLocation.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/dd/HorizontalDropLocation.java
diff --git a/shared/src/com/vaadin/shared/ui/dd/VerticalDropLocation.java b/shared/src/main/java/com/vaadin/shared/ui/dd/VerticalDropLocation.java
index d64a48946a..d64a48946a 100644
--- a/shared/src/com/vaadin/shared/ui/dd/VerticalDropLocation.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/dd/VerticalDropLocation.java
diff --git a/shared/src/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java b/shared/src/main/java/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java
index 9dda86ad73..9dda86ad73 100644
--- a/shared/src/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperServerRpc.java
index 241518c3e3..241518c3e3 100644
--- a/shared/src/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedConstants.java b/shared/src/main/java/com/vaadin/shared/ui/embedded/EmbeddedConstants.java
index 6aadb43b05..6aadb43b05 100644
--- a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/embedded/EmbeddedConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/embedded/EmbeddedServerRpc.java
index 3b293ecdb2..3b293ecdb2 100644
--- a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/embedded/EmbeddedServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java b/shared/src/main/java/com/vaadin/shared/ui/embedded/EmbeddedState.java
index 9f12a917e5..9f12a917e5 100644
--- a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/embedded/EmbeddedState.java
diff --git a/shared/src/com/vaadin/shared/ui/flash/FlashState.java b/shared/src/main/java/com/vaadin/shared/ui/flash/FlashState.java
index d974650030..d974650030 100644
--- a/shared/src/com/vaadin/shared/ui/flash/FlashState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/flash/FlashState.java
diff --git a/shared/src/com/vaadin/shared/ui/form/FormState.java b/shared/src/main/java/com/vaadin/shared/ui/form/FormState.java
index 99ed11f8df..99ed11f8df 100644
--- a/shared/src/com/vaadin/shared/ui/form/FormState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/form/FormState.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/ColumnGroupState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/ColumnGroupState.java
index 79e6c9a89f..79e6c9a89f 100644
--- a/shared/src/com/vaadin/shared/ui/grid/ColumnGroupState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/ColumnGroupState.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/DetailsConnectorChange.java b/shared/src/main/java/com/vaadin/shared/ui/grid/DetailsConnectorChange.java
index 8b64d22423..8b64d22423 100644
--- a/shared/src/com/vaadin/shared/ui/grid/DetailsConnectorChange.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/DetailsConnectorChange.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/EditorClientRpc.java b/shared/src/main/java/com/vaadin/shared/ui/grid/EditorClientRpc.java
index 61066f28c2..61066f28c2 100644
--- a/shared/src/com/vaadin/shared/ui/grid/EditorClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/EditorClientRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/EditorServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/grid/EditorServerRpc.java
index 34a16ccb38..34a16ccb38 100644
--- a/shared/src/com/vaadin/shared/ui/grid/EditorServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/EditorServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/GridClientRpc.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridClientRpc.java
index ac1b1d5a78..ac1b1d5a78 100644
--- a/shared/src/com/vaadin/shared/ui/grid/GridClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridClientRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/GridColumnState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridColumnState.java
index 98fa553330..98fa553330 100644
--- a/shared/src/com/vaadin/shared/ui/grid/GridColumnState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridColumnState.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/GridConstants.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridConstants.java
index 0f1af94456..0f1af94456 100644
--- a/shared/src/com/vaadin/shared/ui/grid/GridConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/GridServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridServerRpc.java
index 336e8097c0..336e8097c0 100644
--- a/shared/src/com/vaadin/shared/ui/grid/GridServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/GridState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java
index 54ccc78daa..54ccc78daa 100644
--- a/shared/src/com/vaadin/shared/ui/grid/GridState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/GridStaticCellType.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridStaticCellType.java
index c646717d2c..c646717d2c 100644
--- a/shared/src/com/vaadin/shared/ui/grid/GridStaticCellType.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridStaticCellType.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridStaticSectionState.java
index a3c485af08..a3c485af08 100644
--- a/shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridStaticSectionState.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/HeightMode.java b/shared/src/main/java/com/vaadin/shared/ui/grid/HeightMode.java
index 4cd19a01b1..4cd19a01b1 100644
--- a/shared/src/com/vaadin/shared/ui/grid/HeightMode.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/HeightMode.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/Range.java b/shared/src/main/java/com/vaadin/shared/ui/grid/Range.java
index 21e70d3dbf..21e70d3dbf 100644
--- a/shared/src/com/vaadin/shared/ui/grid/Range.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/Range.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/ScrollDestination.java b/shared/src/main/java/com/vaadin/shared/ui/grid/ScrollDestination.java
index 64cf070e46..64cf070e46 100644
--- a/shared/src/com/vaadin/shared/ui/grid/ScrollDestination.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/ScrollDestination.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/renderers/RendererClickRpc.java b/shared/src/main/java/com/vaadin/shared/ui/grid/renderers/RendererClickRpc.java
index 658caef050..658caef050 100644
--- a/shared/src/com/vaadin/shared/ui/grid/renderers/RendererClickRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/renderers/RendererClickRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/selection/MultiSelectionModelServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/grid/selection/MultiSelectionModelServerRpc.java
index 1ddecb31e4..1ddecb31e4 100644
--- a/shared/src/com/vaadin/shared/ui/grid/selection/MultiSelectionModelServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/selection/MultiSelectionModelServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/selection/MultiSelectionModelState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/selection/MultiSelectionModelState.java
index 3d56b65793..3d56b65793 100644
--- a/shared/src/com/vaadin/shared/ui/grid/selection/MultiSelectionModelState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/selection/MultiSelectionModelState.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/selection/SingleSelectionModelServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/grid/selection/SingleSelectionModelServerRpc.java
index ff8e7c424b..ff8e7c424b 100644
--- a/shared/src/com/vaadin/shared/ui/grid/selection/SingleSelectionModelServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/selection/SingleSelectionModelServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/grid/selection/SingleSelectionModelState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/selection/SingleSelectionModelState.java
index be8770a94e..be8770a94e 100644
--- a/shared/src/com/vaadin/shared/ui/grid/selection/SingleSelectionModelState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/selection/SingleSelectionModelState.java
diff --git a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/gridlayout/GridLayoutServerRpc.java
index 70b49154ee..70b49154ee 100644
--- a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/gridlayout/GridLayoutServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java b/shared/src/main/java/com/vaadin/shared/ui/gridlayout/GridLayoutState.java
index b84c2673f4..b84c2673f4 100644
--- a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/gridlayout/GridLayoutState.java
diff --git a/shared/src/com/vaadin/shared/ui/image/ImageServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/image/ImageServerRpc.java
index ec03c7fe47..ec03c7fe47 100644
--- a/shared/src/com/vaadin/shared/ui/image/ImageServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/image/ImageServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/image/ImageState.java b/shared/src/main/java/com/vaadin/shared/ui/image/ImageState.java
index b51913d168..b51913d168 100644
--- a/shared/src/com/vaadin/shared/ui/image/ImageState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/image/ImageState.java
diff --git a/shared/src/com/vaadin/shared/ui/label/ContentMode.java b/shared/src/main/java/com/vaadin/shared/ui/label/ContentMode.java
index 37e821536d..37e821536d 100644
--- a/shared/src/com/vaadin/shared/ui/label/ContentMode.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/label/ContentMode.java
diff --git a/shared/src/com/vaadin/shared/ui/label/LabelState.java b/shared/src/main/java/com/vaadin/shared/ui/label/LabelState.java
index 8fd1d7c798..8fd1d7c798 100644
--- a/shared/src/com/vaadin/shared/ui/label/LabelState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/label/LabelState.java
diff --git a/shared/src/com/vaadin/shared/ui/link/LinkConstants.java b/shared/src/main/java/com/vaadin/shared/ui/link/LinkConstants.java
index 399e6b6148..399e6b6148 100644
--- a/shared/src/com/vaadin/shared/ui/link/LinkConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/link/LinkConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/link/LinkState.java b/shared/src/main/java/com/vaadin/shared/ui/link/LinkState.java
index 2b1f73b90a..2b1f73b90a 100644
--- a/shared/src/com/vaadin/shared/ui/link/LinkState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/link/LinkState.java
diff --git a/shared/src/com/vaadin/shared/ui/menubar/MenuBarConstants.java b/shared/src/main/java/com/vaadin/shared/ui/menubar/MenuBarConstants.java
index b34bc13a23..b34bc13a23 100644
--- a/shared/src/com/vaadin/shared/ui/menubar/MenuBarConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/menubar/MenuBarConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java b/shared/src/main/java/com/vaadin/shared/ui/menubar/MenuBarState.java
index 6d6acebe18..6d6acebe18 100644
--- a/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/menubar/MenuBarState.java
diff --git a/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java b/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java
index 5670b64b38..5670b64b38 100644
--- a/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java b/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupState.java
index f1676e0dd8..f1676e0dd8 100644
--- a/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/optiongroup/OptionGroupState.java
diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java
index 76e5267bb8..76e5267bb8 100644
--- a/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java
index c06b945ada..c06b945ada 100644
--- a/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java
diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/FormLayoutState.java b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/FormLayoutState.java
index b8134d2cee..b8134d2cee 100644
--- a/shared/src/com/vaadin/shared/ui/orderedlayout/FormLayoutState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/FormLayoutState.java
diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java
index 167e89f624..167e89f624 100644
--- a/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java
diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java
index 4c83a8b1dd..4c83a8b1dd 100644
--- a/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java
diff --git a/shared/src/com/vaadin/shared/ui/panel/PanelServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/panel/PanelServerRpc.java
index 8bb98e8e5d..8bb98e8e5d 100644
--- a/shared/src/com/vaadin/shared/ui/panel/PanelServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/panel/PanelServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/panel/PanelState.java b/shared/src/main/java/com/vaadin/shared/ui/panel/PanelState.java
index 8f48fad921..8f48fad921 100644
--- a/shared/src/com/vaadin/shared/ui/panel/PanelState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/panel/PanelState.java
diff --git a/shared/src/com/vaadin/shared/ui/popupview/PopupViewServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/popupview/PopupViewServerRpc.java
index af712b9e31..af712b9e31 100644
--- a/shared/src/com/vaadin/shared/ui/popupview/PopupViewServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/popupview/PopupViewServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/popupview/PopupViewState.java b/shared/src/main/java/com/vaadin/shared/ui/popupview/PopupViewState.java
index 86fda428a1..86fda428a1 100644
--- a/shared/src/com/vaadin/shared/ui/popupview/PopupViewState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/popupview/PopupViewState.java
diff --git a/shared/src/com/vaadin/shared/ui/progressindicator/ProgressBarState.java b/shared/src/main/java/com/vaadin/shared/ui/progressindicator/ProgressBarState.java
index 6f557489dd..6f557489dd 100644
--- a/shared/src/com/vaadin/shared/ui/progressindicator/ProgressBarState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/progressindicator/ProgressBarState.java
diff --git a/shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/progressindicator/ProgressIndicatorServerRpc.java
index f541395cef..f541395cef 100644
--- a/shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/progressindicator/ProgressIndicatorServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorState.java b/shared/src/main/java/com/vaadin/shared/ui/progressindicator/ProgressIndicatorState.java
index 9b3cf94d4a..9b3cf94d4a 100644
--- a/shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/progressindicator/ProgressIndicatorState.java
diff --git a/shared/src/com/vaadin/shared/ui/select/AbstractSelectState.java b/shared/src/main/java/com/vaadin/shared/ui/select/AbstractSelectState.java
index 8ea306daf6..8ea306daf6 100644
--- a/shared/src/com/vaadin/shared/ui/select/AbstractSelectState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/select/AbstractSelectState.java
diff --git a/shared/src/com/vaadin/shared/ui/slider/SliderOrientation.java b/shared/src/main/java/com/vaadin/shared/ui/slider/SliderOrientation.java
index 74ccaa4e15..74ccaa4e15 100644
--- a/shared/src/com/vaadin/shared/ui/slider/SliderOrientation.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/slider/SliderOrientation.java
diff --git a/shared/src/com/vaadin/shared/ui/slider/SliderServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/slider/SliderServerRpc.java
index 1938dc1de2..1938dc1de2 100644
--- a/shared/src/com/vaadin/shared/ui/slider/SliderServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/slider/SliderServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/slider/SliderState.java b/shared/src/main/java/com/vaadin/shared/ui/slider/SliderState.java
index a96d35bc13..a96d35bc13 100644
--- a/shared/src/com/vaadin/shared/ui/slider/SliderState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/slider/SliderState.java
diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelRpc.java b/shared/src/main/java/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelRpc.java
index 7f1e9555d5..7f1e9555d5 100644
--- a/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java b/shared/src/main/java/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java
index 2db292d71d..2db292d71d 100644
--- a/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java
diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java b/shared/src/main/java/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java
index 849cd89651..849cd89651 100644
--- a/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java
diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java b/shared/src/main/java/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java
index cb06a2a076..cb06a2a076 100644
--- a/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java
diff --git a/shared/src/com/vaadin/shared/ui/table/CollapseMenuContent.java b/shared/src/main/java/com/vaadin/shared/ui/table/CollapseMenuContent.java
index afeb7fb35a..afeb7fb35a 100644
--- a/shared/src/com/vaadin/shared/ui/table/CollapseMenuContent.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/table/CollapseMenuContent.java
diff --git a/shared/src/com/vaadin/shared/ui/table/TableConstants.java b/shared/src/main/java/com/vaadin/shared/ui/table/TableConstants.java
index 2bdb711153..2bdb711153 100644
--- a/shared/src/com/vaadin/shared/ui/table/TableConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/table/TableConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/table/TableServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/table/TableServerRpc.java
index 13d494afb7..13d494afb7 100644
--- a/shared/src/com/vaadin/shared/ui/table/TableServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/table/TableServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/table/TableState.java b/shared/src/main/java/com/vaadin/shared/ui/table/TableState.java
index 9e225846b8..9e225846b8 100644
--- a/shared/src/com/vaadin/shared/ui/table/TableState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/table/TableState.java
diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabState.java b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabState.java
index 3c8c1d76d0..3c8c1d76d0 100644
--- a/shared/src/com/vaadin/shared/ui/tabsheet/TabState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabState.java
diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetBaseConstants.java b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetBaseConstants.java
index 62cfd5cb81..62cfd5cb81 100644
--- a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetBaseConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetBaseConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetClientRpc.java b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetClientRpc.java
index 5b1497dd3b..5b1497dd3b 100644
--- a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetClientRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetConstants.java b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetConstants.java
index c99bf2eeb2..c99bf2eeb2 100644
--- a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetServerRpc.java
index a96c616ec6..a96c616ec6 100644
--- a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetState.java
index 6059379dc5..6059379dc5 100644
--- a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/tabsheet/TabsheetState.java
diff --git a/shared/src/com/vaadin/shared/ui/textarea/RichTextAreaState.java b/shared/src/main/java/com/vaadin/shared/ui/textarea/RichTextAreaState.java
index 51c386ddfc..51c386ddfc 100644
--- a/shared/src/com/vaadin/shared/ui/textarea/RichTextAreaState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/textarea/RichTextAreaState.java
diff --git a/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java b/shared/src/main/java/com/vaadin/shared/ui/textarea/TextAreaState.java
index c1f9536278..c1f9536278 100644
--- a/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/textarea/TextAreaState.java
diff --git a/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java b/shared/src/main/java/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java
index 9d4272c22f..9d4272c22f 100644
--- a/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java
diff --git a/shared/src/com/vaadin/shared/ui/textfield/TextFieldConstants.java b/shared/src/main/java/com/vaadin/shared/ui/textfield/TextFieldConstants.java
index 242e53682b..242e53682b 100644
--- a/shared/src/com/vaadin/shared/ui/textfield/TextFieldConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/textfield/TextFieldConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/tree/TreeConstants.java b/shared/src/main/java/com/vaadin/shared/ui/tree/TreeConstants.java
index 33560dec53..33560dec53 100644
--- a/shared/src/com/vaadin/shared/ui/tree/TreeConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/tree/TreeConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/tree/TreeServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/tree/TreeServerRpc.java
index 76b33aa8c3..76b33aa8c3 100644
--- a/shared/src/com/vaadin/shared/ui/tree/TreeServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/tree/TreeServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/tree/TreeState.java b/shared/src/main/java/com/vaadin/shared/ui/tree/TreeState.java
index 19a70e89f2..19a70e89f2 100644
--- a/shared/src/com/vaadin/shared/ui/tree/TreeState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/tree/TreeState.java
diff --git a/shared/src/com/vaadin/shared/ui/treetable/TreeTableConstants.java b/shared/src/main/java/com/vaadin/shared/ui/treetable/TreeTableConstants.java
index 510c18d245..510c18d245 100644
--- a/shared/src/com/vaadin/shared/ui/treetable/TreeTableConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/treetable/TreeTableConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java b/shared/src/main/java/com/vaadin/shared/ui/treetable/TreeTableState.java
index ecc7d0f4c4..ecc7d0f4c4 100644
--- a/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/treetable/TreeTableState.java
diff --git a/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java b/shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java
index 32422a38e5..32422a38e5 100644
--- a/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java b/shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java
index 12505c4231..12505c4231 100644
--- a/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/DebugWindowClientRpc.java b/shared/src/main/java/com/vaadin/shared/ui/ui/DebugWindowClientRpc.java
index 9a5d269a87..9a5d269a87 100644
--- a/shared/src/com/vaadin/shared/ui/ui/DebugWindowClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/DebugWindowClientRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/DebugWindowServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/ui/DebugWindowServerRpc.java
index b6f17661d0..b6f17661d0 100644
--- a/shared/src/com/vaadin/shared/ui/ui/DebugWindowServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/DebugWindowServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/NotificationRole.java b/shared/src/main/java/com/vaadin/shared/ui/ui/NotificationRole.java
index b6f6c6bb83..b6f6c6bb83 100644
--- a/shared/src/com/vaadin/shared/ui/ui/NotificationRole.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/NotificationRole.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/PageClientRpc.java b/shared/src/main/java/com/vaadin/shared/ui/ui/PageClientRpc.java
index a4c7d33ad1..a4c7d33ad1 100644
--- a/shared/src/com/vaadin/shared/ui/ui/PageClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/PageClientRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/PageState.java b/shared/src/main/java/com/vaadin/shared/ui/ui/PageState.java
index b6dd5abb89..b6dd5abb89 100644
--- a/shared/src/com/vaadin/shared/ui/ui/PageState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/PageState.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/ScrollClientRpc.java b/shared/src/main/java/com/vaadin/shared/ui/ui/ScrollClientRpc.java
index fb052a25e9..fb052a25e9 100644
--- a/shared/src/com/vaadin/shared/ui/ui/ScrollClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/ScrollClientRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/Transport.java b/shared/src/main/java/com/vaadin/shared/ui/ui/Transport.java
index 6263f3039d..6263f3039d 100644
--- a/shared/src/com/vaadin/shared/ui/ui/Transport.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/Transport.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/UIClientRpc.java b/shared/src/main/java/com/vaadin/shared/ui/ui/UIClientRpc.java
index 5026189d71..5026189d71 100644
--- a/shared/src/com/vaadin/shared/ui/ui/UIClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/UIClientRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/UIConstants.java b/shared/src/main/java/com/vaadin/shared/ui/ui/UIConstants.java
index 429360e05d..429360e05d 100644
--- a/shared/src/com/vaadin/shared/ui/ui/UIConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/UIConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/UIServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/ui/UIServerRpc.java
index 887ea760b3..887ea760b3 100644
--- a/shared/src/com/vaadin/shared/ui/ui/UIServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/UIServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/ui/UIState.java b/shared/src/main/java/com/vaadin/shared/ui/ui/UIState.java
index 48ff9cdaaf..48ff9cdaaf 100644
--- a/shared/src/com/vaadin/shared/ui/ui/UIState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/ui/UIState.java
diff --git a/shared/src/com/vaadin/shared/ui/upload/UploadClientRpc.java b/shared/src/main/java/com/vaadin/shared/ui/upload/UploadClientRpc.java
index a5147147bc..a5147147bc 100644
--- a/shared/src/com/vaadin/shared/ui/upload/UploadClientRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/upload/UploadClientRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/upload/UploadServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/upload/UploadServerRpc.java
index 5a5a1378d1..5a5a1378d1 100644
--- a/shared/src/com/vaadin/shared/ui/upload/UploadServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/upload/UploadServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/upload/UploadState.java b/shared/src/main/java/com/vaadin/shared/ui/upload/UploadState.java
index f91d67631c..f91d67631c 100644
--- a/shared/src/com/vaadin/shared/ui/upload/UploadState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/upload/UploadState.java
diff --git a/shared/src/com/vaadin/shared/ui/video/VideoConstants.java b/shared/src/main/java/com/vaadin/shared/ui/video/VideoConstants.java
index 0a61b88afc..0a61b88afc 100644
--- a/shared/src/com/vaadin/shared/ui/video/VideoConstants.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/video/VideoConstants.java
diff --git a/shared/src/com/vaadin/shared/ui/video/VideoState.java b/shared/src/main/java/com/vaadin/shared/ui/video/VideoState.java
index 91006f0f6a..91006f0f6a 100644
--- a/shared/src/com/vaadin/shared/ui/video/VideoState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/video/VideoState.java
diff --git a/shared/src/com/vaadin/shared/ui/window/WindowMode.java b/shared/src/main/java/com/vaadin/shared/ui/window/WindowMode.java
index e3438fe6a9..e3438fe6a9 100644
--- a/shared/src/com/vaadin/shared/ui/window/WindowMode.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/window/WindowMode.java
diff --git a/shared/src/com/vaadin/shared/ui/window/WindowRole.java b/shared/src/main/java/com/vaadin/shared/ui/window/WindowRole.java
index 5114c04bc2..5114c04bc2 100644
--- a/shared/src/com/vaadin/shared/ui/window/WindowRole.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/window/WindowRole.java
diff --git a/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/window/WindowServerRpc.java
index 6c7191c54d..6c7191c54d 100644
--- a/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/window/WindowServerRpc.java
diff --git a/shared/src/com/vaadin/shared/ui/window/WindowState.java b/shared/src/main/java/com/vaadin/shared/ui/window/WindowState.java
index 7dafba57ff..7dafba57ff 100644
--- a/shared/src/com/vaadin/shared/ui/window/WindowState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/window/WindowState.java
diff --git a/shared/src/com/vaadin/shared/util/SharedUtil.java b/shared/src/main/java/com/vaadin/shared/util/SharedUtil.java
index 28c1ea3734..28c1ea3734 100644
--- a/shared/src/com/vaadin/shared/util/SharedUtil.java
+++ b/shared/src/main/java/com/vaadin/shared/util/SharedUtil.java
diff --git a/shared/tests/src/com/vaadin/shared/ui/grid/RangeTest.java b/shared/src/test/java/com/vaadin/shared/ui/grid/RangeTest.java
index e3cae858ee..e3cae858ee 100644
--- a/shared/tests/src/com/vaadin/shared/ui/grid/RangeTest.java
+++ b/shared/src/test/java/com/vaadin/shared/ui/grid/RangeTest.java
diff --git a/shared/tests/src/com/vaadin/shared/util/SharedUtilTests.java b/shared/src/test/java/com/vaadin/shared/util/SharedUtilTest.java
index e77501a446..081f594a97 100644
--- a/shared/tests/src/com/vaadin/shared/util/SharedUtilTests.java
+++ b/shared/src/test/java/com/vaadin/shared/util/SharedUtilTest.java
@@ -8,7 +8,7 @@ import java.util.Locale;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class SharedUtilTests {
+public class SharedUtilTest {
 
     @Test
     public void trailingSlashIsTrimmed() {
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableFocusOnRefreshRowCache.html b/tests/testbench/com/vaadin/tests/components/table/TableFocusOnRefreshRowCache.html
deleted file mode 100644
index b5f4d9b418..0000000000
--- a/tests/testbench/com/vaadin/tests/components/table/TableFocusOnRefreshRowCache.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8888/" />
-<title>TableFocusOnRefreshRowCache</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">TableFocusOnRefreshRowCache</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/run/com.vaadin.tests.components.table.TableFocusOnRefreshRowCache?restartApplication</td>
-	<td></td>
-</tr>
-<tr>
-	<td>scroll</td>
-	<td>vaadin=runcomvaadintestscomponentstableTableFocusOnRefreshRowCache::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>
-	<td>3161</td>
-</tr>
-<tr>
-	<td>pause</td>
-	<td>500</td>
-	<td></td>
-</tr>
-<tr>
-	<td>mouseClick</td>
-	<td>vaadin=runcomvaadintestscomponentstableTableFocusOnRefreshRowCache::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[42]/domChild[0]/domChild[0]</td>
-	<td>186,-3151</td>
-</tr>
-<!-- Opera does some funky stuff with the row indices when this is run in
-     testbench, making it impossible to reliably test that the stylenames are
-     in the right location. Must instead just test that the stylename is not in
-     the position it was prior to fixing the bug, although that could never
-     fail in Opera since it looks at the wrong row
--->
-<!-- 
-<tr>
-	<td>assertCSSClass</td>
-	<td>vaadin=runcomvaadintestscomponentstableTableFocusOnRefreshRowCache::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[35]</td>
-	<td>v-selected</td>
-</tr>
-<tr>
-	<td>assertCSSClass</td>
-	<td>vaadin=runcomvaadintestscomponentstableTableFocusOnRefreshRowCache::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[35]</td>
-	<td>v-table-focus</td>
-</tr>
--->
-<!-- Test that the first row in the view does not get focus -->
-<tr>
-	<td>assertNotCSSClass</td>
-	<td>vaadin=runcomvaadintestscomponentstableTableFocusOnRefreshRowCache::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[23]</td>
-	<td>v-table-focus</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.html b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.html
deleted file mode 100644
index d0dec8ce40..0000000000
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8068/" />
-<title>TextChangeListenerLosesFocus</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">TextChangeListenerLosesFocus</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/run/com.vaadin.tests.components.textfield.TextChangeListenerLosesFocus?restartApplication</td>
-	<td></td>
-</tr>
-<tr>
-	<td>focus</td>
-	<td>test-textfield</td>
-	<td></td>
-</tr>
-<tr>
-	<td>enterCharacter</td>
-	<td>test-textfield</td>
-	<td>123</td>
-</tr>
-<tr>
-	<td>pause</td>
-	<td>1000</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertValue</td>
-	<td>test-textfield</td>
-	<td>Updated by TextChangeListener</td>
-</tr>
-<tr>
-	<td>assertCSSClass</td>
-	<td>test-textfield</td>
-	<td>v-textfield-focus</td>
-</tr>
-<tr>
-	<td>focus</td>
-	<td>test-textarea</td>
-	<td></td>
-</tr>
-<tr>
-	<td>enterCharacter</td>
-	<td>test-textarea</td>
-	<td>123</td>
-</tr>
-<tr>
-	<td>pause</td>
-	<td>1000</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertValue</td>
-	<td>test-textarea</td>
-	<td>Updated by TextChangeListener</td>
-</tr>
-<tr>
-	<td>assertCSSClass</td>
-	<td>test-textarea</td>
-	<td>v-textarea-focus</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/RowHeightWithoutRows.html b/tests/testbench/com/vaadin/tests/components/treetable/RowHeightWithoutRows.html
deleted file mode 100644
index e8cb0ccfe6..0000000000
--- a/tests/testbench/com/vaadin/tests/components/treetable/RowHeightWithoutRows.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8888/" />
-<title>New Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">New Test</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/run/com.vaadin.tests.components.treetable.RowHeightWithoutRows?restartApplication=</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>two</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestscomponentstreetableRowHeightWithoutRows::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>empty</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>vaadin=runcomvaadintestscomponentstreetableRowHeightWithoutRows::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>five</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/themes/build.xml b/themes/build.xml
deleted file mode 100644
index 0bb167855f..0000000000
--- a/themes/build.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="vaadin-themes" basedir="." default="publish-local"
-    xmlns:ivy="antlib:org.apache.ivy.ant">
-    <description>
-        Themes compiled to CSS
-    </description>
-
-    <include file="../common.xml" as="common" />
-    <include file="../build.xml" as="vaadin" />
-    <include file="../gwt-files.xml" as="gwtfiles" />
-
-    <!-- global properties -->
-    <property name="module.name" value="vaadin-themes" />
-    <property name="module.symbolic" value="com.vaadin.themes" />
-    <property name="result.dir" value="result" />
-    <property name="theme.result.dir" value="${result.dir}/VAADIN/themes/" />
-
-    <union id="jar.includes">
-        <fileset dir="${result.dir}">
-            <include name="VAADIN/themes/**" />
-            <exclude name="VAADIN/themes/*-tests*/**" />
-            <exclude name="VAADIN/themes/tests-*/**" />
-        </fileset>
-    </union>
-
-    <target name="compile-themes">
-        <ivy:resolve log="download-only" resolveid="common"
-            conf="build" />
-        <ivy:cachepath pathid="classpath.compile.theme"
-            conf="build" />
-
-        <antcall target="compile-theme">
-            <param name="theme" value="base" />
-        </antcall>
-        <antcall target="compile-theme">
-            <param name="theme" value="runo" />
-        </antcall>
-        <antcall target="compile-theme">
-            <param name="theme" value="reindeer" />
-        </antcall>
-        <antcall target="compile-theme">
-            <param name="theme" value="chameleon" />
-        </antcall>
-        <antcall target="compile-theme">
-            <param name="theme" value="liferay" />
-        </antcall>
-        <antcall target="compile-theme">
-            <param name="theme" value="valo" />
-        </antcall>
-    </target>
-
-    <target name="jar" depends="compile-themes">
-        <antcall target="common.jar">
-            <param name="osgi.extra.package.prefixes" value="VAADIN/themes" />
-            <reference torefid="extra.jar.includes" refid="jar.includes" />
-        </antcall>
-    </target>
-
-    <target name="copy-theme">
-        <fail unless="theme"
-            message="You must give the theme name to copy n the 'theme' parameter" />
-        <property name="theme.source.dir" location="../WebContent/VAADIN/themes/${theme}/" />
-
-        <copy todir="${theme.result.dir}/${theme}">
-            <fileset dir="${theme.source.dir}">
-                <include name="**/*.scss" />
-            </fileset>
-            <filterset refid="filter-vaadin.version" />
-        </copy>
-        <copy todir="${theme.result.dir}/${theme}">
-            <fileset dir="${theme.source.dir}">
-                <exclude name="**/*.scss" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="compile-theme" depends="copy-theme">
-        <fail unless="theme"
-            message="You must give the theme name to compile in the 'theme' parameter" />
-
-        <ivy:resolve log="download-only" resolveid="common"
-            conf="compile-theme" />
-        <ivy:cachepath pathid="classpath.compile.theme"
-            conf="compile-theme" />
-        <ivy:cachepath pathid="classpath.runtime.theme"
-            conf="build" />
-
-        <echo>Compiling ${theme}</echo>
-        <mkdir dir="${theme.result.dir}" />
-
-        <!-- compile the theme -->
-        <java classname="com.vaadin.buildhelpers.CompileTheme"
-            classpathref="classpath.compile.theme" failonerror="yes"
-            fork="yes" maxmemory="512m">
-            <arg value="--theme" />
-            <arg value="${theme}" />
-            <arg value="--theme-folder" />
-            <arg value="${theme.result.dir}" />
-            <arg value="--version" />
-            <arg value="${vaadin.version}" />
-            <jvmarg value="-Xss8M" />
-            <jvmarg value="-XX:MaxPermSize=256M" />
-            <jvmarg value="-Djava.awt.headless=true" />
-        </java>
-
-        <!-- Compress theme to serve using gzip -->
-        <gzip src="${theme.result.dir}/${theme}/styles.css"
-            destfile="${theme.result.dir}/${theme}/styles.css.gz" />
-    </target>
-
-
-    <target name="publish-local" depends="jar">
-        <antcall target="common.publish-local">
-
-        </antcall>
-    </target>
-
-    <target name="clean">
-        <antcall target="common.clean" />
-    </target>
-
-    <target name="checkstyle">
-        <echo>No java files in module</echo>
-    </target>
-    <target name="test" depends="checkstyle">
-        <!--<antcall target="common.test.run" /> -->
-        <echo>WHAT? No tests for ${module.name}!</echo>
-    </target>
-
-</project>
diff --git a/themes/ivy.xml b/themes/ivy.xml
deleted file mode 100644
index 7bc4dfe8da..0000000000
--- a/themes/ivy.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
-    xmlns:m="http://ant.apache.org/ivy/maven">
-
-    <info organisation="com.vaadin" module="vaadin-themes"
-        revision="${vaadin.version}" />
-
-    <configurations>
-        <conf name="build" />
-        <conf name="build-provided" />
-        <conf name="compile-theme" visibility="private" />
-    </configurations>
-    <publications>
-        <artifact type="jar" ext="jar" />
-        <!-- <artifact type="source" ext="jar" m:classifier="sources" /> -->
-        <!-- <artifact type="javadoc" ext="jar" m:classifier="javadoc" /> -->
-        <artifact type="pom" ext="pom" />
-    </publications>
-    <dependencies>
-        <dependency org="com.vaadin" name="vaadin-sass-compiler"
-            rev="${vaadin.sass.version}" conf="compile-theme->default" />
-
-        <dependency org="com.vaadin" name="vaadin-buildhelpers"
-                    rev="${vaadin.version}" conf="compile-theme->build">
-            <exclude type="pom" conf="test" />
-        </dependency>
-
-        <!-- remove cssparser override once sass-compiler is updated -->
-        <override org="net.sourceforge.cssparser" module="cssparser"
-                  rev="0.9.11" />
-    </dependencies>
-
-</ivy-module>
diff --git a/themes/pom.xml b/themes/pom.xml
new file mode 100644
index 0000000000..8a1333a754
--- /dev/null
+++ b/themes/pom.xml
@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.vaadin</groupId>
+		<artifactId>vaadin-root</artifactId>
+		<version>7.7.0-SNAPSHOT</version>
+	</parent>
+	<groupId>com.vaadin</groupId>
+	<artifactId>vaadin-themes</artifactId>
+	<name>vaadin-themes</name>
+	<packaging>jar</packaging>
+
+	<url>https://vaadin.com/</url>
+	<description>Vaadin themes</description>
+
+	<dependencies>
+		<!-- Maven plugin scans for vaadin-server... -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-server</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>vaadin-buildhelpers</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-sass-compiler</artifactId>
+			<version>${vaadin.sass.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- remove cssparser override once sass-compiler is updated -->
+		<dependency>
+			<groupId>net.sourceforge.cssparser</groupId>
+			<artifactId>cssparser</artifactId>
+			<version>0.9.11</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.carrotsearch</groupId>
+			<artifactId>smartsprites</artifactId>
+			<version>0.2.10</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-theme-sources</id>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.outputDirectory}</outputDirectory>
+							<resources>
+								<resource>
+									<directory>src/main/themes</directory>
+									<filtering>false</filtering>
+									<excludes>
+										<exclude>**/base.scss</exclude>
+										<exclude>**/valo/shared/_global.scss</exclude>
+									</excludes>
+								</resource>
+								<resource>
+									<directory>src/main/themes</directory>
+									<filtering>true</filtering>
+									<includes>
+										<include>**/base.scss</include>
+										<include>**/valo/shared/_global.scss</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+
+			<plugin>
+				<groupId>com.vaadin</groupId>
+				<artifactId>vaadin-maven-plugin</artifactId>
+				<configuration>
+					<compressTheme>true</compressTheme>
+					<warSourceDirectory>${project.build.outputDirectory}</warSourceDirectory>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>compile-theme</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>compile-legacy-base</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<configuration>
+							<classpathScope>compile</classpathScope>
+							<executable>${java.home}/bin/java</executable>
+							<arguments>
+								<argument>-classpath</argument>
+								<classpath />
+
+								<argument>com.vaadin.sass.SassCompiler</argument>
+								<argument> ${project.build.outputDirectory}/VAADIN/themes/base/legacy-styles.scss</argument>
+								<argument> ${project.build.outputDirectory}/VAADIN/themes/base/legacy-styles.css</argument>
+							</arguments>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>compile-legacy-chameleon</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<configuration>
+							<classpathScope>compile</classpathScope>
+							<executable>${java.home}/bin/java</executable>
+							<arguments>
+								<argument>-classpath</argument>
+								<classpath />
+
+								<argument>com.vaadin.sass.SassCompiler</argument>
+								<argument> ${project.build.outputDirectory}/VAADIN/themes/chameleon/legacy-styles.scss</argument>
+								<argument> ${project.build.outputDirectory}/VAADIN/themes/chameleon/legacy-styles.css</argument>
+							</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>compile-legacy-liferay</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<configuration>
+							<classpathScope>compile</classpathScope>
+							<executable>${java.home}/bin/java</executable>
+							<arguments>
+								<argument>-classpath</argument>
+								<classpath />
+
+								<argument>com.vaadin.sass.SassCompiler</argument>
+								<argument> ${project.build.outputDirectory}/VAADIN/themes/liferay/legacy-styles.scss</argument>
+								<argument> ${project.build.outputDirectory}/VAADIN/themes/liferay/legacy-styles.css</argument>
+							</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>compile-legacy-reindeer</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<configuration>
+							<classpathScope>compile</classpathScope>
+							<executable>${java.home}/bin/java</executable>
+							<arguments>
+								<argument>-classpath</argument>
+								<classpath />
+
+								<argument>com.vaadin.sass.SassCompiler</argument>
+								<argument> ${project.build.outputDirectory}/VAADIN/themes/reindeer/legacy-styles.scss</argument>
+								<argument> ${project.build.outputDirectory}/VAADIN/themes/reindeer/legacy-styles.css</argument>
+							</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>compile-legacy-runo</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<configuration>
+							<classpathScope>compile</classpathScope>
+							<executable>${java.home}/bin/java</executable>
+							<arguments>
+								<argument>-classpath</argument>
+								<classpath />
+
+								<argument>com.vaadin.sass.SassCompiler</argument>
+								<argument> ${project.build.outputDirectory}/VAADIN/themes/runo/legacy-styles.scss</argument>
+								<argument> ${project.build.outputDirectory}/VAADIN/themes/runo/legacy-styles.css</argument>
+							</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>smart-sprite-reindeer</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<configuration>
+							<classpathScope>compile</classpathScope>
+							<executable>${java.home}/bin/java</executable>
+							<arguments>
+								<argument>-classpath</argument>
+								<classpath />
+
+								<argument>org.carrot2.labs.smartsprites.SmartSprites</argument>
+
+								<argument>--sprite-png-depth</argument>
+								<argument>AUTO</argument>
+
+								<argument>--css-file-encoding</argument>
+								<argument>UTF-8</argument>
+
+								<argument>--root-dir-path</argument>
+								<argument>${project.build.outputDirectory}/VAADIN/themes/reindeer</argument>
+
+								<argument>--log-level</argument>
+								<argument>WARN</argument>
+							</arguments>
+						</configuration>
+					</execution>
+					<execution>
+						<id>generate-export-package</id>
+						<phase>package</phase>
+						<goals>
+							<goal>exec</goal>
+						</goals>
+						<configuration>
+							<classpathScope>compile</classpathScope>
+							<executable>${java.home}/bin/java</executable>
+							<arguments>
+								<argument>-Dvaadin.version=${project.version}</argument>
+								<argument>-DincludeNumberPackages=0</argument>
+
+								<argument>-classpath</argument>
+								<classpath />
+
+								<argument>com.vaadin.buildhelpers.GeneratePackageExports</argument>
+
+								<argument>${project.build.directory}/${project.build.finalName}.${project.packaging}</argument>
+								<argument>VAADIN/themes</argument>
+							</arguments>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>repackage-reindeer</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<property name="reindeer.theme.path"
+									value="${project.build.outputDirectory}/VAADIN/themes/reindeer/" />
+
+								<move file="${reindeer.theme.path}/styles-sprite.css"
+									tofile="${reindeer.theme.path}/styles.css" />
+
+								<move file="${reindeer.theme.path}/legacy-styles-sprite.css"
+									tofile="${reindeer.theme.path}/legacy-styles.css" />
+
+								<gzip src="${reindeer.theme.path}/styles.css" destfile="${reindeer.theme.path}/styles.css.gz" />
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+						<!-- Export package is handled in exec plugin -->
+						<Export-Package></Export-Package>
+						<Import-Package></Import-Package>
+					</instructions>
+				</configuration>
+				<executions>
+					<execution>
+						<id>bundle-manifest</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.6</version>
+				<configuration>
+					<archive>
+						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+						<index>false</index>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+		</plugins>
+
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<artifactId>maven-source-plugin</artifactId>
+					<configuration>
+						<skipSource>true</skipSource>
+					</configuration>
+				</plugin>
+				<!--This plugin's configuration is used to store Eclipse m2e settings 
+					only. It has no influence on the Maven build itself. -->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.codehaus.mojo
+										</groupId>
+										<artifactId>
+											exec-maven-plugin
+										</artifactId>
+										<versionRange>
+											[1.4.0,)
+										</versionRange>
+										<goals>
+											<goal>exec</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore />
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+
+</project>
diff --git a/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.scss b/themes/src/main/themes/VAADIN/themes/base/absolutelayout/absolutelayout.scss
index 4f007de9af..4f007de9af 100644
--- a/WebContent/VAADIN/themes/base/absolutelayout/absolutelayout.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/absolutelayout/absolutelayout.scss
diff --git a/WebContent/VAADIN/themes/base/accordion/accordion.scss b/themes/src/main/themes/VAADIN/themes/base/accordion/accordion.scss
index a8def37d3b..a8def37d3b 100644
--- a/WebContent/VAADIN/themes/base/accordion/accordion.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/accordion/accordion.scss
diff --git a/WebContent/VAADIN/themes/base/base.scss b/themes/src/main/themes/VAADIN/themes/base/base.scss
index 56b2e311c6..e776e007fd 100644
--- a/WebContent/VAADIN/themes/base/base.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/base.scss
@@ -54,7 +54,7 @@ $v-line-height: $line-height !default;
 @import "browserframe/browserframe.scss";
 
 .v-vaadin-version:after {
-	content: "@version@";
+	content: "${project.version}";
 }
 
 /* References the BODY tag generated by Vaadin application servlet */
diff --git a/WebContent/VAADIN/themes/base/browserframe/browserframe.scss b/themes/src/main/themes/VAADIN/themes/base/browserframe/browserframe.scss
index fce9c11513..fce9c11513 100644
--- a/WebContent/VAADIN/themes/base/browserframe/browserframe.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/browserframe/browserframe.scss
diff --git a/WebContent/VAADIN/themes/base/button/button.scss b/themes/src/main/themes/VAADIN/themes/base/button/button.scss
index 694e49a359..694e49a359 100644
--- a/WebContent/VAADIN/themes/base/button/button.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/button/button.scss
diff --git a/WebContent/VAADIN/themes/base/button/checkbox.scss b/themes/src/main/themes/VAADIN/themes/base/button/checkbox.scss
index e46d236035..e46d236035 100644
--- a/WebContent/VAADIN/themes/base/button/checkbox.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/button/checkbox.scss
diff --git a/WebContent/VAADIN/themes/base/button/nativebutton.scss b/themes/src/main/themes/VAADIN/themes/base/button/nativebutton.scss
index f85bd507ab..f85bd507ab 100644
--- a/WebContent/VAADIN/themes/base/button/nativebutton.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/button/nativebutton.scss
diff --git a/WebContent/VAADIN/themes/base/calendar/calendar.scss b/themes/src/main/themes/VAADIN/themes/base/calendar/calendar.scss
index 8ff97df0f9..8ff97df0f9 100644
--- a/WebContent/VAADIN/themes/base/calendar/calendar.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/calendar/calendar.scss
diff --git a/WebContent/VAADIN/themes/base/calendar/img/arrows.png b/themes/src/main/themes/VAADIN/themes/base/calendar/img/arrows.png
index 9905c0b065..9905c0b065 100644
--- a/WebContent/VAADIN/themes/base/calendar/img/arrows.png
+++ b/themes/src/main/themes/VAADIN/themes/base/calendar/img/arrows.png
diff --git a/WebContent/VAADIN/themes/base/caption/caption.scss b/themes/src/main/themes/VAADIN/themes/base/caption/caption.scss
index ec87f71999..ec87f71999 100644
--- a/WebContent/VAADIN/themes/base/caption/caption.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/caption/caption.scss
diff --git a/WebContent/VAADIN/themes/base/colorpicker/colorpicker.scss b/themes/src/main/themes/VAADIN/themes/base/colorpicker/colorpicker.scss
index 70705dcee3..70705dcee3 100644
--- a/WebContent/VAADIN/themes/base/colorpicker/colorpicker.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/colorpicker/colorpicker.scss
diff --git a/WebContent/VAADIN/themes/base/colorpicker/images/gradient.png b/themes/src/main/themes/VAADIN/themes/base/colorpicker/images/gradient.png
index def063a8ab..def063a8ab 100644
--- a/WebContent/VAADIN/themes/base/colorpicker/images/gradient.png
+++ b/themes/src/main/themes/VAADIN/themes/base/colorpicker/images/gradient.png
diff --git a/WebContent/VAADIN/themes/base/colorpicker/images/gradient2.png b/themes/src/main/themes/VAADIN/themes/base/colorpicker/images/gradient2.png
index f51ed752a7..f51ed752a7 100644
--- a/WebContent/VAADIN/themes/base/colorpicker/images/gradient2.png
+++ b/themes/src/main/themes/VAADIN/themes/base/colorpicker/images/gradient2.png
diff --git a/WebContent/VAADIN/themes/base/colorpicker/images/resizebg-selected.png b/themes/src/main/themes/VAADIN/themes/base/colorpicker/images/resizebg-selected.png
index 6e56ec0cc7..6e56ec0cc7 100644
--- a/WebContent/VAADIN/themes/base/colorpicker/images/resizebg-selected.png
+++ b/themes/src/main/themes/VAADIN/themes/base/colorpicker/images/resizebg-selected.png
diff --git a/WebContent/VAADIN/themes/base/colorpicker/images/resizebg.png b/themes/src/main/themes/VAADIN/themes/base/colorpicker/images/resizebg.png
index b6e3532713..b6e3532713 100644
--- a/WebContent/VAADIN/themes/base/colorpicker/images/resizebg.png
+++ b/themes/src/main/themes/VAADIN/themes/base/colorpicker/images/resizebg.png
diff --git a/WebContent/VAADIN/themes/base/colorpicker/images/slider_hue_bg.png b/themes/src/main/themes/VAADIN/themes/base/colorpicker/images/slider_hue_bg.png
index bcef2c5575..bcef2c5575 100644
--- a/WebContent/VAADIN/themes/base/colorpicker/images/slider_hue_bg.png
+++ b/themes/src/main/themes/VAADIN/themes/base/colorpicker/images/slider_hue_bg.png
diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/themes/src/main/themes/VAADIN/themes/base/common/common.scss
index ea8b5e5aa0..ea8b5e5aa0 100644
--- a/WebContent/VAADIN/themes/base/common/common.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/common/common.scss
diff --git a/WebContent/VAADIN/themes/base/common/img/ajax-loader-big.gif b/themes/src/main/themes/VAADIN/themes/base/common/img/ajax-loader-big.gif
index 73dc88e31f..73dc88e31f 100644
--- a/WebContent/VAADIN/themes/base/common/img/ajax-loader-big.gif
+++ b/themes/src/main/themes/VAADIN/themes/base/common/img/ajax-loader-big.gif
diff --git a/WebContent/VAADIN/themes/base/common/img/ajax-loader-medium.gif b/themes/src/main/themes/VAADIN/themes/base/common/img/ajax-loader-medium.gif
index 0a0c6aaef0..0a0c6aaef0 100644
--- a/WebContent/VAADIN/themes/base/common/img/ajax-loader-medium.gif
+++ b/themes/src/main/themes/VAADIN/themes/base/common/img/ajax-loader-medium.gif
diff --git a/WebContent/VAADIN/themes/base/common/img/ajax-loader.gif b/themes/src/main/themes/VAADIN/themes/base/common/img/ajax-loader.gif
index 354dc4685c..354dc4685c 100644
--- a/WebContent/VAADIN/themes/base/common/img/ajax-loader.gif
+++ b/themes/src/main/themes/VAADIN/themes/base/common/img/ajax-loader.gif
diff --git a/WebContent/VAADIN/themes/base/common/img/drag-slot-dot.png b/themes/src/main/themes/VAADIN/themes/base/common/img/drag-slot-dot.png
index f8abcf7e21..f8abcf7e21 100644
--- a/WebContent/VAADIN/themes/base/common/img/drag-slot-dot.png
+++ b/themes/src/main/themes/VAADIN/themes/base/common/img/drag-slot-dot.png
diff --git a/WebContent/VAADIN/themes/base/common/img/loading-indicator-delay.gif b/themes/src/main/themes/VAADIN/themes/base/common/img/loading-indicator-delay.gif
index 831526849e..831526849e 100644
--- a/WebContent/VAADIN/themes/base/common/img/loading-indicator-delay.gif
+++ b/themes/src/main/themes/VAADIN/themes/base/common/img/loading-indicator-delay.gif
diff --git a/WebContent/VAADIN/themes/base/common/img/loading-indicator-wait.gif b/themes/src/main/themes/VAADIN/themes/base/common/img/loading-indicator-wait.gif
index b10a0720b5..b10a0720b5 100644
--- a/WebContent/VAADIN/themes/base/common/img/loading-indicator-wait.gif
+++ b/themes/src/main/themes/VAADIN/themes/base/common/img/loading-indicator-wait.gif
diff --git a/WebContent/VAADIN/themes/base/common/img/loading-indicator.gif b/themes/src/main/themes/VAADIN/themes/base/common/img/loading-indicator.gif
index 3fae1b8a6b..3fae1b8a6b 100644
--- a/WebContent/VAADIN/themes/base/common/img/loading-indicator.gif
+++ b/themes/src/main/themes/VAADIN/themes/base/common/img/loading-indicator.gif
diff --git a/WebContent/VAADIN/themes/base/common/img/reconnect-spinner.gif b/themes/src/main/themes/VAADIN/themes/base/common/img/reconnect-spinner.gif
index bc1a496d11..bc1a496d11 100644
--- a/WebContent/VAADIN/themes/base/common/img/reconnect-spinner.gif
+++ b/themes/src/main/themes/VAADIN/themes/base/common/img/reconnect-spinner.gif
diff --git a/WebContent/VAADIN/themes/base/common/img/sprites.png b/themes/src/main/themes/VAADIN/themes/base/common/img/sprites.png
index c5d2e89b97..c5d2e89b97 100644
--- a/WebContent/VAADIN/themes/base/common/img/sprites.png
+++ b/themes/src/main/themes/VAADIN/themes/base/common/img/sprites.png
diff --git a/WebContent/VAADIN/themes/base/common/mixins.scss b/themes/src/main/themes/VAADIN/themes/base/common/mixins.scss
index fab97e9565..fab97e9565 100644
--- a/WebContent/VAADIN/themes/base/common/mixins.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/common/mixins.scss
diff --git a/WebContent/VAADIN/themes/base/common/reconnect-dialog.scss b/themes/src/main/themes/VAADIN/themes/base/common/reconnect-dialog.scss
index 15b78800d0..15b78800d0 100644
--- a/WebContent/VAADIN/themes/base/common/reconnect-dialog.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/common/reconnect-dialog.scss
diff --git a/WebContent/VAADIN/themes/base/csslayout/csslayout.scss b/themes/src/main/themes/VAADIN/themes/base/csslayout/csslayout.scss
index d6df771b85..d6df771b85 100644
--- a/WebContent/VAADIN/themes/base/csslayout/csslayout.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/csslayout/csslayout.scss
diff --git a/WebContent/VAADIN/themes/base/customcomponent/customcomponent.scss b/themes/src/main/themes/VAADIN/themes/base/customcomponent/customcomponent.scss
index d672254a86..d672254a86 100644
--- a/WebContent/VAADIN/themes/base/customcomponent/customcomponent.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/customcomponent/customcomponent.scss
diff --git a/WebContent/VAADIN/themes/base/customlayout/customlayout.scss b/themes/src/main/themes/VAADIN/themes/base/customlayout/customlayout.scss
index c8a13da4e9..c8a13da4e9 100644
--- a/WebContent/VAADIN/themes/base/customlayout/customlayout.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/customlayout/customlayout.scss
diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.scss b/themes/src/main/themes/VAADIN/themes/base/datefield/datefield.scss
index 57a691211d..57a691211d 100644
--- a/WebContent/VAADIN/themes/base/datefield/datefield.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/datefield/datefield.scss
diff --git a/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss b/themes/src/main/themes/VAADIN/themes/base/dragwrapper/dragwrapper.scss
index 86000abd7c..86000abd7c 100644
--- a/WebContent/VAADIN/themes/base/dragwrapper/dragwrapper.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/dragwrapper/dragwrapper.scss
diff --git a/WebContent/VAADIN/themes/base/embedded/embedded.scss b/themes/src/main/themes/VAADIN/themes/base/embedded/embedded.scss
index abb5e7956f..abb5e7956f 100644
--- a/WebContent/VAADIN/themes/base/embedded/embedded.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/embedded/embedded.scss
diff --git a/WebContent/VAADIN/themes/base/escalator/escalator.scss b/themes/src/main/themes/VAADIN/themes/base/escalator/escalator.scss
index 2d5ad729fc..2d5ad729fc 100644
--- a/WebContent/VAADIN/themes/base/escalator/escalator.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/escalator/escalator.scss
diff --git a/WebContent/VAADIN/themes/base/favicon.ico b/themes/src/main/themes/VAADIN/themes/base/favicon.ico
index 1f81f0de76..1f81f0de76 100644
--- a/WebContent/VAADIN/themes/base/favicon.ico
+++ b/themes/src/main/themes/VAADIN/themes/base/favicon.ico
diff --git a/WebContent/VAADIN/themes/base/fonts/fontawesome-webfont.eot b/themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.eot
index 9b6afaedc0..9b6afaedc0 100755
--- a/WebContent/VAADIN/themes/base/fonts/fontawesome-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.eot
diff --git a/WebContent/VAADIN/themes/base/fonts/fontawesome-webfont.svg b/themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.svg
index d05688e9e2..d05688e9e2 100755
--- a/WebContent/VAADIN/themes/base/fonts/fontawesome-webfont.svg
+++ b/themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.svg
diff --git a/WebContent/VAADIN/themes/base/fonts/fontawesome-webfont.ttf b/themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.ttf
index 26dea7951a..26dea7951a 100755
--- a/WebContent/VAADIN/themes/base/fonts/fontawesome-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.ttf
diff --git a/WebContent/VAADIN/themes/base/fonts/fontawesome-webfont.woff b/themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.woff
index dc35ce3c2c..dc35ce3c2c 100755
--- a/WebContent/VAADIN/themes/base/fonts/fontawesome-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.woff
diff --git a/WebContent/VAADIN/themes/base/fonts/fonts.scss b/themes/src/main/themes/VAADIN/themes/base/fonts/fonts.scss
index 1f5c0cf6a2..1f5c0cf6a2 100644
--- a/WebContent/VAADIN/themes/base/fonts/fonts.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/fonts/fonts.scss
diff --git a/WebContent/VAADIN/themes/base/fonts/themeicons-webfont.eot b/themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.eot
index 9cc04785e2..9cc04785e2 100644
--- a/WebContent/VAADIN/themes/base/fonts/themeicons-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.eot
diff --git a/WebContent/VAADIN/themes/base/fonts/themeicons-webfont.svg b/themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.svg
index 59685c3b3a..59685c3b3a 100644
--- a/WebContent/VAADIN/themes/base/fonts/themeicons-webfont.svg
+++ b/themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.svg
diff --git a/WebContent/VAADIN/themes/base/fonts/themeicons-webfont.ttf b/themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.ttf
index 1b7dd4a6ad..1b7dd4a6ad 100644
--- a/WebContent/VAADIN/themes/base/fonts/themeicons-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.ttf
diff --git a/WebContent/VAADIN/themes/base/fonts/themeicons-webfont.woff b/themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.woff
index 7d055f6dd0..7d055f6dd0 100644
--- a/WebContent/VAADIN/themes/base/fonts/themeicons-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.woff
diff --git a/WebContent/VAADIN/themes/base/formlayout/formlayout.scss b/themes/src/main/themes/VAADIN/themes/base/formlayout/formlayout.scss
index 2e2a3213f9..2e2a3213f9 100644
--- a/WebContent/VAADIN/themes/base/formlayout/formlayout.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/formlayout/formlayout.scss
diff --git a/WebContent/VAADIN/themes/base/grid/grid.scss b/themes/src/main/themes/VAADIN/themes/base/grid/grid.scss
index 3e7b708557..3e7b708557 100644
--- a/WebContent/VAADIN/themes/base/grid/grid.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/grid/grid.scss
diff --git a/WebContent/VAADIN/themes/base/gridlayout/gridlayout.scss b/themes/src/main/themes/VAADIN/themes/base/gridlayout/gridlayout.scss
index 54a2e8667c..54a2e8667c 100644
--- a/WebContent/VAADIN/themes/base/gridlayout/gridlayout.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/gridlayout/gridlayout.scss
diff --git a/WebContent/VAADIN/themes/base/inlinedatefield/inlinedatefield.scss b/themes/src/main/themes/VAADIN/themes/base/inlinedatefield/inlinedatefield.scss
index 06a24125c2..06a24125c2 100644
--- a/WebContent/VAADIN/themes/base/inlinedatefield/inlinedatefield.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/inlinedatefield/inlinedatefield.scss
diff --git a/WebContent/VAADIN/themes/base/label/label.scss b/themes/src/main/themes/VAADIN/themes/base/label/label.scss
index 3c72796828..3c72796828 100644
--- a/WebContent/VAADIN/themes/base/label/label.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/label/label.scss
diff --git a/WebContent/VAADIN/themes/base/layout/layout.scss b/themes/src/main/themes/VAADIN/themes/base/layout/layout.scss
index fe3fcd17ed..fe3fcd17ed 100644
--- a/WebContent/VAADIN/themes/base/layout/layout.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/layout/layout.scss
diff --git a/WebContent/VAADIN/themes/base/legacy-styles.scss b/themes/src/main/themes/VAADIN/themes/base/legacy-styles.scss
index 188fc85d46..188fc85d46 100644
--- a/WebContent/VAADIN/themes/base/legacy-styles.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/legacy-styles.scss
diff --git a/WebContent/VAADIN/themes/base/link/link.scss b/themes/src/main/themes/VAADIN/themes/base/link/link.scss
index bff6fbd5fe..bff6fbd5fe 100644
--- a/WebContent/VAADIN/themes/base/link/link.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/link/link.scss
diff --git a/WebContent/VAADIN/themes/base/loginform/loginform.scss b/themes/src/main/themes/VAADIN/themes/base/loginform/loginform.scss
index 48fabbf793..48fabbf793 100644
--- a/WebContent/VAADIN/themes/base/loginform/loginform.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/loginform/loginform.scss
diff --git a/WebContent/VAADIN/themes/base/menubar/img/check.gif b/themes/src/main/themes/VAADIN/themes/base/menubar/img/check.gif
index 0a89195168..0a89195168 100644
--- a/WebContent/VAADIN/themes/base/menubar/img/check.gif
+++ b/themes/src/main/themes/VAADIN/themes/base/menubar/img/check.gif
diff --git a/WebContent/VAADIN/themes/base/menubar/menubar.scss b/themes/src/main/themes/VAADIN/themes/base/menubar/menubar.scss
index ad701f1b42..ad701f1b42 100644
--- a/WebContent/VAADIN/themes/base/menubar/menubar.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/menubar/menubar.scss
diff --git a/WebContent/VAADIN/themes/base/notification/notification.scss b/themes/src/main/themes/VAADIN/themes/base/notification/notification.scss
index 5deb7e0e84..5deb7e0e84 100644
--- a/WebContent/VAADIN/themes/base/notification/notification.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/notification/notification.scss
diff --git a/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.scss b/themes/src/main/themes/VAADIN/themes/base/orderedlayout/orderedlayout.scss
index 7820d842fc..7820d842fc 100644
--- a/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/orderedlayout/orderedlayout.scss
diff --git a/WebContent/VAADIN/themes/base/panel/panel.scss b/themes/src/main/themes/VAADIN/themes/base/panel/panel.scss
index 16fadfa15d..16fadfa15d 100644
--- a/WebContent/VAADIN/themes/base/panel/panel.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/panel/panel.scss
diff --git a/WebContent/VAADIN/themes/base/popupview/popupview.scss b/themes/src/main/themes/VAADIN/themes/base/popupview/popupview.scss
index cafcf9b720..cafcf9b720 100644
--- a/WebContent/VAADIN/themes/base/popupview/popupview.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/popupview/popupview.scss
diff --git a/WebContent/VAADIN/themes/base/progressindicator/progressindicator.scss b/themes/src/main/themes/VAADIN/themes/base/progressindicator/progressindicator.scss
index 0065cf3d07..0065cf3d07 100644
--- a/WebContent/VAADIN/themes/base/progressindicator/progressindicator.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/progressindicator/progressindicator.scss
diff --git a/WebContent/VAADIN/themes/base/select/select.scss b/themes/src/main/themes/VAADIN/themes/base/select/select.scss
index 69d3c07272..69d3c07272 100644
--- a/WebContent/VAADIN/themes/base/select/select.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/select/select.scss
diff --git a/WebContent/VAADIN/themes/base/shadow/img/bottom-left.png b/themes/src/main/themes/VAADIN/themes/base/shadow/img/bottom-left.png
index 6b2cd00a0d..6b2cd00a0d 100644
--- a/WebContent/VAADIN/themes/base/shadow/img/bottom-left.png
+++ b/themes/src/main/themes/VAADIN/themes/base/shadow/img/bottom-left.png
diff --git a/WebContent/VAADIN/themes/base/shadow/img/bottom-right.png b/themes/src/main/themes/VAADIN/themes/base/shadow/img/bottom-right.png
index c5c10a7bf5..c5c10a7bf5 100644
--- a/WebContent/VAADIN/themes/base/shadow/img/bottom-right.png
+++ b/themes/src/main/themes/VAADIN/themes/base/shadow/img/bottom-right.png
diff --git a/WebContent/VAADIN/themes/base/shadow/img/bottom.png b/themes/src/main/themes/VAADIN/themes/base/shadow/img/bottom.png
index 14935a81d4..14935a81d4 100644
--- a/WebContent/VAADIN/themes/base/shadow/img/bottom.png
+++ b/themes/src/main/themes/VAADIN/themes/base/shadow/img/bottom.png
diff --git a/WebContent/VAADIN/themes/base/shadow/img/center.png b/themes/src/main/themes/VAADIN/themes/base/shadow/img/center.png
index 1db9a53c75..1db9a53c75 100644
--- a/WebContent/VAADIN/themes/base/shadow/img/center.png
+++ b/themes/src/main/themes/VAADIN/themes/base/shadow/img/center.png
diff --git a/WebContent/VAADIN/themes/base/shadow/img/left.png b/themes/src/main/themes/VAADIN/themes/base/shadow/img/left.png
index 45634c05d8..45634c05d8 100644
--- a/WebContent/VAADIN/themes/base/shadow/img/left.png
+++ b/themes/src/main/themes/VAADIN/themes/base/shadow/img/left.png
diff --git a/WebContent/VAADIN/themes/base/shadow/img/right.png b/themes/src/main/themes/VAADIN/themes/base/shadow/img/right.png
index 619c4034db..619c4034db 100644
--- a/WebContent/VAADIN/themes/base/shadow/img/right.png
+++ b/themes/src/main/themes/VAADIN/themes/base/shadow/img/right.png
diff --git a/WebContent/VAADIN/themes/base/shadow/img/top-left.png b/themes/src/main/themes/VAADIN/themes/base/shadow/img/top-left.png
index 10e743875e..10e743875e 100644
--- a/WebContent/VAADIN/themes/base/shadow/img/top-left.png
+++ b/themes/src/main/themes/VAADIN/themes/base/shadow/img/top-left.png
diff --git a/WebContent/VAADIN/themes/base/shadow/img/top-right.png b/themes/src/main/themes/VAADIN/themes/base/shadow/img/top-right.png
index 2088806475..2088806475 100644
--- a/WebContent/VAADIN/themes/base/shadow/img/top-right.png
+++ b/themes/src/main/themes/VAADIN/themes/base/shadow/img/top-right.png
diff --git a/WebContent/VAADIN/themes/base/shadow/img/top.png b/themes/src/main/themes/VAADIN/themes/base/shadow/img/top.png
index 9daf3f41f4..9daf3f41f4 100644
--- a/WebContent/VAADIN/themes/base/shadow/img/top.png
+++ b/themes/src/main/themes/VAADIN/themes/base/shadow/img/top.png
diff --git a/WebContent/VAADIN/themes/base/shadow/shadow.scss b/themes/src/main/themes/VAADIN/themes/base/shadow/shadow.scss
index 3c369d3fef..3c369d3fef 100644
--- a/WebContent/VAADIN/themes/base/shadow/shadow.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/shadow/shadow.scss
diff --git a/WebContent/VAADIN/themes/base/slider/slider.scss b/themes/src/main/themes/VAADIN/themes/base/slider/slider.scss
index 60047bc6db..60047bc6db 100644
--- a/WebContent/VAADIN/themes/base/slider/slider.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/slider/slider.scss
diff --git a/WebContent/VAADIN/themes/base/splitpanel/splitpanel.scss b/themes/src/main/themes/VAADIN/themes/base/splitpanel/splitpanel.scss
index 968894d92d..968894d92d 100644
--- a/WebContent/VAADIN/themes/base/splitpanel/splitpanel.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/splitpanel/splitpanel.scss
diff --git a/WebContent/VAADIN/themes/base/styles.scss b/themes/src/main/themes/VAADIN/themes/base/styles.scss
index 1b6942944b..1b6942944b 100644
--- a/WebContent/VAADIN/themes/base/styles.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/styles.scss
diff --git a/WebContent/VAADIN/themes/base/table/table.scss b/themes/src/main/themes/VAADIN/themes/base/table/table.scss
index 22ffdffa4d..22ffdffa4d 100644
--- a/WebContent/VAADIN/themes/base/table/table.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/table/table.scss
diff --git a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss b/themes/src/main/themes/VAADIN/themes/base/tabsheet/tabsheet.scss
index 14def56ab5..14def56ab5 100644
--- a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/tabsheet/tabsheet.scss
diff --git a/WebContent/VAADIN/themes/base/textfield/img/richtext-toolbar-bg.png b/themes/src/main/themes/VAADIN/themes/base/textfield/img/richtext-toolbar-bg.png
index e92be23e51..e92be23e51 100644
--- a/WebContent/VAADIN/themes/base/textfield/img/richtext-toolbar-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/base/textfield/img/richtext-toolbar-bg.png
diff --git a/WebContent/VAADIN/themes/base/textfield/textfield.scss b/themes/src/main/themes/VAADIN/themes/base/textfield/textfield.scss
index 4266346132..4266346132 100644
--- a/WebContent/VAADIN/themes/base/textfield/textfield.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/textfield/textfield.scss
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-collapse-last.png b/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-collapse-last.png
index c03e0839b5..c03e0839b5 100644
--- a/WebContent/VAADIN/themes/base/tree/img/connector-collapse-last.png
+++ b/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-collapse-last.png
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-collapse.png b/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-collapse.png
index 577a7c9de6..577a7c9de6 100644
--- a/WebContent/VAADIN/themes/base/tree/img/connector-collapse.png
+++ b/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-collapse.png
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-expand-last.png b/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-expand-last.png
index 3a578681de..3a578681de 100644
--- a/WebContent/VAADIN/themes/base/tree/img/connector-expand-last.png
+++ b/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-expand-last.png
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-expand.png b/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-expand.png
index f3548875fa..f3548875fa 100644
--- a/WebContent/VAADIN/themes/base/tree/img/connector-expand.png
+++ b/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-expand.png
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-item-last.png b/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-item-last.png
index 2eb04a32fd..2eb04a32fd 100644
--- a/WebContent/VAADIN/themes/base/tree/img/connector-item-last.png
+++ b/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-item-last.png
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-item.png b/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-item.png
index 5f88fe1bef..5f88fe1bef 100644
--- a/WebContent/VAADIN/themes/base/tree/img/connector-item.png
+++ b/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-item.png
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-leaf-last.png b/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-leaf-last.png
index 15a255088a..15a255088a 100644
--- a/WebContent/VAADIN/themes/base/tree/img/connector-leaf-last.png
+++ b/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-leaf-last.png
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-leaf.png b/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-leaf.png
index 282839bb95..282839bb95 100644
--- a/WebContent/VAADIN/themes/base/tree/img/connector-leaf.png
+++ b/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-leaf.png
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector.png b/themes/src/main/themes/VAADIN/themes/base/tree/img/connector.png
index 4f0327204e..4f0327204e 100644
--- a/WebContent/VAADIN/themes/base/tree/img/connector.png
+++ b/themes/src/main/themes/VAADIN/themes/base/tree/img/connector.png
diff --git a/WebContent/VAADIN/themes/base/tree/tree.scss b/themes/src/main/themes/VAADIN/themes/base/tree/tree.scss
index ace6d7d2f2..ace6d7d2f2 100644
--- a/WebContent/VAADIN/themes/base/tree/tree.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/tree/tree.scss
diff --git a/WebContent/VAADIN/themes/base/treetable/img/arrow-down.gif b/themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-down.gif
index ad599674a1..ad599674a1 100644
--- a/WebContent/VAADIN/themes/base/treetable/img/arrow-down.gif
+++ b/themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-down.gif
diff --git a/WebContent/VAADIN/themes/base/treetable/img/arrow-down.png b/themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-down.png
index cba812b799..cba812b799 100644
--- a/WebContent/VAADIN/themes/base/treetable/img/arrow-down.png
+++ b/themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-down.png
diff --git a/WebContent/VAADIN/themes/base/treetable/img/arrow-right.gif b/themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-right.gif
index cbe21ac7c0..cbe21ac7c0 100644
--- a/WebContent/VAADIN/themes/base/treetable/img/arrow-right.gif
+++ b/themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-right.gif
diff --git a/WebContent/VAADIN/themes/base/treetable/img/arrow-right.png b/themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-right.png
index 7fe6e2b59f..7fe6e2b59f 100644
--- a/WebContent/VAADIN/themes/base/treetable/img/arrow-right.png
+++ b/themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-right.png
diff --git a/WebContent/VAADIN/themes/base/treetable/treetable.scss b/themes/src/main/themes/VAADIN/themes/base/treetable/treetable.scss
index e4d41eefa8..e4d41eefa8 100644
--- a/WebContent/VAADIN/themes/base/treetable/treetable.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/treetable/treetable.scss
diff --git a/WebContent/VAADIN/themes/base/upload/upload.scss b/themes/src/main/themes/VAADIN/themes/base/upload/upload.scss
index f8e707446c..f8e707446c 100644
--- a/WebContent/VAADIN/themes/base/upload/upload.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/upload/upload.scss
diff --git a/WebContent/VAADIN/themes/base/widget/widget.scss b/themes/src/main/themes/VAADIN/themes/base/widget/widget.scss
index e4f660003c..e4f660003c 100644
--- a/WebContent/VAADIN/themes/base/widget/widget.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/widget/widget.scss
diff --git a/WebContent/VAADIN/themes/base/window/img/shadow/bottom-left.png b/themes/src/main/themes/VAADIN/themes/base/window/img/shadow/bottom-left.png
index f40e53f939..f40e53f939 100644
--- a/WebContent/VAADIN/themes/base/window/img/shadow/bottom-left.png
+++ b/themes/src/main/themes/VAADIN/themes/base/window/img/shadow/bottom-left.png
diff --git a/WebContent/VAADIN/themes/base/window/img/shadow/bottom-right.png b/themes/src/main/themes/VAADIN/themes/base/window/img/shadow/bottom-right.png
index 8ef8376f7a..8ef8376f7a 100644
--- a/WebContent/VAADIN/themes/base/window/img/shadow/bottom-right.png
+++ b/themes/src/main/themes/VAADIN/themes/base/window/img/shadow/bottom-right.png
diff --git a/WebContent/VAADIN/themes/base/window/img/shadow/bottom.png b/themes/src/main/themes/VAADIN/themes/base/window/img/shadow/bottom.png
index 89096316e6..89096316e6 100644
--- a/WebContent/VAADIN/themes/base/window/img/shadow/bottom.png
+++ b/themes/src/main/themes/VAADIN/themes/base/window/img/shadow/bottom.png
diff --git a/WebContent/VAADIN/themes/base/window/img/shadow/center.png b/themes/src/main/themes/VAADIN/themes/base/window/img/shadow/center.png
index 1db9a53c75..1db9a53c75 100644
--- a/WebContent/VAADIN/themes/base/window/img/shadow/center.png
+++ b/themes/src/main/themes/VAADIN/themes/base/window/img/shadow/center.png
diff --git a/WebContent/VAADIN/themes/base/window/img/shadow/left.png b/themes/src/main/themes/VAADIN/themes/base/window/img/shadow/left.png
index bc526b1674..bc526b1674 100644
--- a/WebContent/VAADIN/themes/base/window/img/shadow/left.png
+++ b/themes/src/main/themes/VAADIN/themes/base/window/img/shadow/left.png
diff --git a/WebContent/VAADIN/themes/base/window/img/shadow/right.png b/themes/src/main/themes/VAADIN/themes/base/window/img/shadow/right.png
index b837d90545..b837d90545 100644
--- a/WebContent/VAADIN/themes/base/window/img/shadow/right.png
+++ b/themes/src/main/themes/VAADIN/themes/base/window/img/shadow/right.png
diff --git a/WebContent/VAADIN/themes/base/window/img/shadow/top-left.png b/themes/src/main/themes/VAADIN/themes/base/window/img/shadow/top-left.png
index abd7943b21..abd7943b21 100644
--- a/WebContent/VAADIN/themes/base/window/img/shadow/top-left.png
+++ b/themes/src/main/themes/VAADIN/themes/base/window/img/shadow/top-left.png
diff --git a/WebContent/VAADIN/themes/base/window/img/shadow/top-right.png b/themes/src/main/themes/VAADIN/themes/base/window/img/shadow/top-right.png
index d54b748be7..d54b748be7 100644
--- a/WebContent/VAADIN/themes/base/window/img/shadow/top-right.png
+++ b/themes/src/main/themes/VAADIN/themes/base/window/img/shadow/top-right.png
diff --git a/WebContent/VAADIN/themes/base/window/img/shadow/top.png b/themes/src/main/themes/VAADIN/themes/base/window/img/shadow/top.png
index 4d5272e7f3..4d5272e7f3 100644
--- a/WebContent/VAADIN/themes/base/window/img/shadow/top.png
+++ b/themes/src/main/themes/VAADIN/themes/base/window/img/shadow/top.png
diff --git a/WebContent/VAADIN/themes/base/window/window.scss b/themes/src/main/themes/VAADIN/themes/base/window/window.scss
index bdc16999b0..bdc16999b0 100644
--- a/WebContent/VAADIN/themes/base/window/window.scss
+++ b/themes/src/main/themes/VAADIN/themes/base/window/window.scss
diff --git a/WebContent/VAADIN/themes/chameleon/chameleon.scss b/themes/src/main/themes/VAADIN/themes/chameleon/chameleon.scss
index b315678308..b315678308 100644
--- a/WebContent/VAADIN/themes/chameleon/chameleon.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/chameleon.scss
diff --git a/WebContent/VAADIN/themes/chameleon/common/common.scss b/themes/src/main/themes/VAADIN/themes/chameleon/common/common.scss
index 82e0810bc2..82e0810bc2 100644
--- a/WebContent/VAADIN/themes/chameleon/common/common.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/common/common.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/accordion/accordion.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/accordion/accordion.scss
index 2fe0307fe0..2fe0307fe0 100644
--- a/WebContent/VAADIN/themes/chameleon/components/accordion/accordion.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/accordion/accordion.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/button/button.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/button/button.scss
index f2b597c59a..f2b597c59a 100644
--- a/WebContent/VAADIN/themes/chameleon/components/button/button.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/button/button.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/colorpicker/colorpicker.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/colorpicker/colorpicker.scss
index 98f00f0626..98f00f0626 100644
--- a/WebContent/VAADIN/themes/chameleon/components/colorpicker/colorpicker.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/colorpicker/colorpicker.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/components.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/components.scss
index 578ea23bf3..578ea23bf3 100644
--- a/WebContent/VAADIN/themes/chameleon/components/components.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/components.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/datefield/datefield.scss
index 2947a71896..2947a71896 100644
--- a/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/datefield/datefield.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/grid/grid.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/grid/grid.scss
index 5007ad6619..5007ad6619 100644
--- a/WebContent/VAADIN/themes/chameleon/components/grid/grid.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/grid/grid.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/inlinedatefield/inlinedatefield.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/inlinedatefield/inlinedatefield.scss
index deceee19be..deceee19be 100644
--- a/WebContent/VAADIN/themes/chameleon/components/inlinedatefield/inlinedatefield.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/inlinedatefield/inlinedatefield.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/label/label.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/label/label.scss
index 5afcbd584a..5afcbd584a 100644
--- a/WebContent/VAADIN/themes/chameleon/components/label/label.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/label/label.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/menubar/menubar.scss
index 0db478855d..0db478855d 100644
--- a/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/menubar/menubar.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/notification/notification.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/notification/notification.scss
index a1454ccfad..a1454ccfad 100644
--- a/WebContent/VAADIN/themes/chameleon/components/notification/notification.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/notification/notification.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/panel/panel.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/panel/panel.scss
index bae827b484..bae827b484 100644
--- a/WebContent/VAADIN/themes/chameleon/components/panel/panel.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/panel/panel.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/popupview/popupview.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/popupview/popupview.scss
index 978ca56391..978ca56391 100644
--- a/WebContent/VAADIN/themes/chameleon/components/popupview/popupview.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/popupview/popupview.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/progressindicator/progressindicator.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/progressindicator/progressindicator.scss
index 56eb2cc6c9..56eb2cc6c9 100644
--- a/WebContent/VAADIN/themes/chameleon/components/progressindicator/progressindicator.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/progressindicator/progressindicator.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/selects/selects.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/selects/selects.scss
index fc51e8a779..fc51e8a779 100644
--- a/WebContent/VAADIN/themes/chameleon/components/selects/selects.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/selects/selects.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/slider/slider.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/slider/slider.scss
index 30c5eb85cb..30c5eb85cb 100644
--- a/WebContent/VAADIN/themes/chameleon/components/slider/slider.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/slider/slider.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/splitpanel/splitpanel.scss
index 2496be6513..2496be6513 100644
--- a/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/splitpanel/splitpanel.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/table/table.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/table/table.scss
index f224e898f1..f224e898f1 100644
--- a/WebContent/VAADIN/themes/chameleon/components/table/table.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/table/table.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/tabsheet/tabsheet.scss
index d7f968fe43..d7f968fe43 100644
--- a/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/tabsheet/tabsheet.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/textfield/textfield.scss
index 4554672da4..4554672da4 100644
--- a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/textfield/textfield.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/tree/tree.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/tree/tree.scss
index 9b33cd0155..9b33cd0155 100644
--- a/WebContent/VAADIN/themes/chameleon/components/tree/tree.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/tree/tree.scss
diff --git a/WebContent/VAADIN/themes/chameleon/components/window/window.scss b/themes/src/main/themes/VAADIN/themes/chameleon/components/window/window.scss
index 16de81a785..16de81a785 100644
--- a/WebContent/VAADIN/themes/chameleon/components/window/window.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/components/window/window.scss
diff --git a/WebContent/VAADIN/themes/chameleon/compound/compound.scss b/themes/src/main/themes/VAADIN/themes/chameleon/compound/compound.scss
index 43a8717dbb..43a8717dbb 100644
--- a/WebContent/VAADIN/themes/chameleon/compound/compound.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/compound/compound.scss
diff --git a/WebContent/VAADIN/themes/chameleon/favicon.ico b/themes/src/main/themes/VAADIN/themes/chameleon/favicon.ico
index 1f81f0de76..1f81f0de76 100644
--- a/WebContent/VAADIN/themes/chameleon/favicon.ico
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/favicon.ico
diff --git a/WebContent/VAADIN/themes/chameleon/icons/bullet-white.png b/themes/src/main/themes/VAADIN/themes/chameleon/icons/bullet-white.png
index f0a0b1bfba..f0a0b1bfba 100644
--- a/WebContent/VAADIN/themes/chameleon/icons/bullet-white.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/icons/bullet-white.png
diff --git a/WebContent/VAADIN/themes/chameleon/icons/bullet.png b/themes/src/main/themes/VAADIN/themes/chameleon/icons/bullet.png
index 5047f6b27c..5047f6b27c 100644
--- a/WebContent/VAADIN/themes/chameleon/icons/bullet.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/icons/bullet.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/app-bg.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/app-bg.png
index 0eb0022781..0eb0022781 100644
--- a/WebContent/VAADIN/themes/chameleon/img/app-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/app-bg.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/close-btn.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/close-btn.png
index a1337676e1..a1337676e1 100644
--- a/WebContent/VAADIN/themes/chameleon/img/close-btn.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/close-btn.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/date-btn-big.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/date-btn-big.png
index d4562a1368..d4562a1368 100644
--- a/WebContent/VAADIN/themes/chameleon/img/date-btn-big.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/date-btn-big.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/date-btn.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/date-btn.png
index 522a77539e..522a77539e 100644
--- a/WebContent/VAADIN/themes/chameleon/img/date-btn.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/date-btn.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/error-close.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/error-close.png
index 587a680604..587a680604 100644
--- a/WebContent/VAADIN/themes/chameleon/img/error-close.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/error-close.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/error-indicator.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/error-indicator.png
index ab7b4bb2f0..ab7b4bb2f0 100644
--- a/WebContent/VAADIN/themes/chameleon/img/error-indicator.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/error-indicator.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/grad-dark-bottom.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-dark-bottom.png
index 3d86693c5f..3d86693c5f 100644
--- a/WebContent/VAADIN/themes/chameleon/img/grad-dark-bottom.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-dark-bottom.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/grad-dark-bottom2.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-dark-bottom2.png
index 1bf7a557ef..1bf7a557ef 100644
--- a/WebContent/VAADIN/themes/chameleon/img/grad-dark-bottom2.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-dark-bottom2.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/grad-dark-top2.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-dark-top2.png
index 8509f462e0..8509f462e0 100644
--- a/WebContent/VAADIN/themes/chameleon/img/grad-dark-top2.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-dark-top2.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/grad-light-left.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-light-left.png
index a6965e4772..a6965e4772 100644
--- a/WebContent/VAADIN/themes/chameleon/img/grad-light-left.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-light-left.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/grad-light-top.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-light-top.png
index d9479f195e..d9479f195e 100644
--- a/WebContent/VAADIN/themes/chameleon/img/grad-light-top.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-light-top.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/grad-light-top2.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-light-top2.png
index 51ec5e60b3..51ec5e60b3 100644
--- a/WebContent/VAADIN/themes/chameleon/img/grad-light-top2.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-light-top2.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/indeterminate-progress.gif b/themes/src/main/themes/VAADIN/themes/chameleon/img/indeterminate-progress.gif
index 46136f0339..46136f0339 100644
--- a/WebContent/VAADIN/themes/chameleon/img/indeterminate-progress.gif
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/indeterminate-progress.gif
diff --git a/WebContent/VAADIN/themes/chameleon/img/input-bg.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/input-bg.png
index 08b67dd7bd..08b67dd7bd 100644
--- a/WebContent/VAADIN/themes/chameleon/img/input-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/input-bg.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/label-error-icon-big.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/label-error-icon-big.png
index 6de95c9595..6de95c9595 100644
--- a/WebContent/VAADIN/themes/chameleon/img/label-error-icon-big.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/label-error-icon-big.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/label-error-icon.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/label-error-icon.png
index 8802ac417c..8802ac417c 100644
--- a/WebContent/VAADIN/themes/chameleon/img/label-error-icon.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/label-error-icon.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/label-warning-icon-big.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/label-warning-icon-big.png
index e6bb96cbdd..e6bb96cbdd 100644
--- a/WebContent/VAADIN/themes/chameleon/img/label-warning-icon-big.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/label-warning-icon-big.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/label-warning-icon.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/label-warning-icon.png
index 67886c067c..67886c067c 100644
--- a/WebContent/VAADIN/themes/chameleon/img/label-warning-icon.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/label-warning-icon.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/magnifier-big.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/magnifier-big.png
index 19d662fe7c..19d662fe7c 100644
--- a/WebContent/VAADIN/themes/chameleon/img/magnifier-big.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/magnifier-big.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/magnifier.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/magnifier.png
index 3fed5eeaab..3fed5eeaab 100644
--- a/WebContent/VAADIN/themes/chameleon/img/magnifier.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/magnifier.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/maximize.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/maximize.png
index 5c6488d1a5..5c6488d1a5 100644
--- a/WebContent/VAADIN/themes/chameleon/img/maximize.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/maximize.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/resize.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/resize.png
index 86ae55eced..86ae55eced 100644
--- a/WebContent/VAADIN/themes/chameleon/img/resize.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/resize.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/restore.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/restore.png
index 55d004fe53..55d004fe53 100644
--- a/WebContent/VAADIN/themes/chameleon/img/restore.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/restore.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/split-handle.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/split-handle.png
index 01085cdd4d..01085cdd4d 100644
--- a/WebContent/VAADIN/themes/chameleon/img/split-handle.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/split-handle.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/tab-arrows.png b/themes/src/main/themes/VAADIN/themes/chameleon/img/tab-arrows.png
index 8a16d80e55..8a16d80e55 100644
--- a/WebContent/VAADIN/themes/chameleon/img/tab-arrows.png
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/img/tab-arrows.png
diff --git a/WebContent/VAADIN/themes/chameleon/legacy-styles.scss b/themes/src/main/themes/VAADIN/themes/chameleon/legacy-styles.scss
index 843f81475c..843f81475c 100644
--- a/WebContent/VAADIN/themes/chameleon/legacy-styles.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/legacy-styles.scss
diff --git a/WebContent/VAADIN/themes/chameleon/styles.scss b/themes/src/main/themes/VAADIN/themes/chameleon/styles.scss
index 0c55a57239..0c55a57239 100644
--- a/WebContent/VAADIN/themes/chameleon/styles.scss
+++ b/themes/src/main/themes/VAADIN/themes/chameleon/styles.scss
diff --git a/WebContent/VAADIN/themes/liferay/accordion/accordion.scss b/themes/src/main/themes/VAADIN/themes/liferay/accordion/accordion.scss
index 9a37fd463e..9a37fd463e 100644
--- a/WebContent/VAADIN/themes/liferay/accordion/accordion.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/accordion/accordion.scss
diff --git a/WebContent/VAADIN/themes/liferay/button/button.scss b/themes/src/main/themes/VAADIN/themes/liferay/button/button.scss
index 85c1eb4094..85c1eb4094 100644
--- a/WebContent/VAADIN/themes/liferay/button/button.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/button/button.scss
diff --git a/WebContent/VAADIN/themes/liferay/colorpicker/colorpicker.scss b/themes/src/main/themes/VAADIN/themes/liferay/colorpicker/colorpicker.scss
index fc50297388..fc50297388 100644
--- a/WebContent/VAADIN/themes/liferay/colorpicker/colorpicker.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/colorpicker/colorpicker.scss
diff --git a/WebContent/VAADIN/themes/liferay/common/buttons_sprites.png b/themes/src/main/themes/VAADIN/themes/liferay/common/buttons_sprites.png
index 70521dffce..70521dffce 100644
--- a/WebContent/VAADIN/themes/liferay/common/buttons_sprites.png
+++ b/themes/src/main/themes/VAADIN/themes/liferay/common/buttons_sprites.png
diff --git a/WebContent/VAADIN/themes/liferay/common/common.scss b/themes/src/main/themes/VAADIN/themes/liferay/common/common.scss
index 0d653baf7c..0d653baf7c 100644
--- a/WebContent/VAADIN/themes/liferay/common/common.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/common/common.scss
diff --git a/WebContent/VAADIN/themes/liferay/contextmenu/contextmenu.scss b/themes/src/main/themes/VAADIN/themes/liferay/contextmenu/contextmenu.scss
index 7748580f0c..7748580f0c 100644
--- a/WebContent/VAADIN/themes/liferay/contextmenu/contextmenu.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/contextmenu/contextmenu.scss
diff --git a/WebContent/VAADIN/themes/liferay/datefield/datefield.scss b/themes/src/main/themes/VAADIN/themes/liferay/datefield/datefield.scss
index c9ef7180a5..c9ef7180a5 100644
--- a/WebContent/VAADIN/themes/liferay/datefield/datefield.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/datefield/datefield.scss
diff --git a/WebContent/VAADIN/themes/liferay/datefield/datefield_sprites.png b/themes/src/main/themes/VAADIN/themes/liferay/datefield/datefield_sprites.png
index 7da07e33ca..7da07e33ca 100644
--- a/WebContent/VAADIN/themes/liferay/datefield/datefield_sprites.png
+++ b/themes/src/main/themes/VAADIN/themes/liferay/datefield/datefield_sprites.png
diff --git a/WebContent/VAADIN/themes/liferay/favicon.ico b/themes/src/main/themes/VAADIN/themes/liferay/favicon.ico
index 1f81f0de76..1f81f0de76 100644
--- a/WebContent/VAADIN/themes/liferay/favicon.ico
+++ b/themes/src/main/themes/VAADIN/themes/liferay/favicon.ico
diff --git a/WebContent/VAADIN/themes/liferay/formlayout/formlayout.scss b/themes/src/main/themes/VAADIN/themes/liferay/formlayout/formlayout.scss
index 3fa6fa20ee..3fa6fa20ee 100644
--- a/WebContent/VAADIN/themes/liferay/formlayout/formlayout.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/formlayout/formlayout.scss
diff --git a/WebContent/VAADIN/themes/liferay/inlinedatefield/inlinedatefield.scss b/themes/src/main/themes/VAADIN/themes/liferay/inlinedatefield/inlinedatefield.scss
index 80e3b467ec..80e3b467ec 100644
--- a/WebContent/VAADIN/themes/liferay/inlinedatefield/inlinedatefield.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/inlinedatefield/inlinedatefield.scss
diff --git a/WebContent/VAADIN/themes/liferay/legacy-styles.scss b/themes/src/main/themes/VAADIN/themes/liferay/legacy-styles.scss
index 4f304fd397..4f304fd397 100644
--- a/WebContent/VAADIN/themes/liferay/legacy-styles.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/legacy-styles.scss
diff --git a/WebContent/VAADIN/themes/liferay/liferay.scss b/themes/src/main/themes/VAADIN/themes/liferay/liferay.scss
index 273c065772..273c065772 100644
--- a/WebContent/VAADIN/themes/liferay/liferay.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/liferay.scss
diff --git a/WebContent/VAADIN/themes/liferay/menubar/menubar.scss b/themes/src/main/themes/VAADIN/themes/liferay/menubar/menubar.scss
index dd31608e79..dd31608e79 100644
--- a/WebContent/VAADIN/themes/liferay/menubar/menubar.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/menubar/menubar.scss
diff --git a/WebContent/VAADIN/themes/liferay/notification/notification.scss b/themes/src/main/themes/VAADIN/themes/liferay/notification/notification.scss
index 75b5e6a0a9..75b5e6a0a9 100644
--- a/WebContent/VAADIN/themes/liferay/notification/notification.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/notification/notification.scss
diff --git a/WebContent/VAADIN/themes/liferay/panel/panel.scss b/themes/src/main/themes/VAADIN/themes/liferay/panel/panel.scss
index cb65560a74..cb65560a74 100644
--- a/WebContent/VAADIN/themes/liferay/panel/panel.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/panel/panel.scss
diff --git a/WebContent/VAADIN/themes/liferay/panel/top-left.png b/themes/src/main/themes/VAADIN/themes/liferay/panel/top-left.png
index 12e0780d42..12e0780d42 100644
--- a/WebContent/VAADIN/themes/liferay/panel/top-left.png
+++ b/themes/src/main/themes/VAADIN/themes/liferay/panel/top-left.png
diff --git a/WebContent/VAADIN/themes/liferay/panel/top-right.png b/themes/src/main/themes/VAADIN/themes/liferay/panel/top-right.png
index 08203ae8a2..08203ae8a2 100644
--- a/WebContent/VAADIN/themes/liferay/panel/top-right.png
+++ b/themes/src/main/themes/VAADIN/themes/liferay/panel/top-right.png
diff --git a/WebContent/VAADIN/themes/liferay/popupview/popupview.scss b/themes/src/main/themes/VAADIN/themes/liferay/popupview/popupview.scss
index ab06d18c98..ab06d18c98 100644
--- a/WebContent/VAADIN/themes/liferay/popupview/popupview.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/popupview/popupview.scss
diff --git a/WebContent/VAADIN/themes/liferay/progressindicator/progressindicator.scss b/themes/src/main/themes/VAADIN/themes/liferay/progressindicator/progressindicator.scss
index 4371b2aeef..4371b2aeef 100644
--- a/WebContent/VAADIN/themes/liferay/progressindicator/progressindicator.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/progressindicator/progressindicator.scss
diff --git a/WebContent/VAADIN/themes/liferay/select/select.scss b/themes/src/main/themes/VAADIN/themes/liferay/select/select.scss
index 5ae302be9a..5ae302be9a 100644
--- a/WebContent/VAADIN/themes/liferay/select/select.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/select/select.scss
diff --git a/WebContent/VAADIN/themes/liferay/slider/slider.scss b/themes/src/main/themes/VAADIN/themes/liferay/slider/slider.scss
index d30de67da0..d30de67da0 100644
--- a/WebContent/VAADIN/themes/liferay/slider/slider.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/slider/slider.scss
diff --git a/WebContent/VAADIN/themes/liferay/splitpanel/hsplit.png b/themes/src/main/themes/VAADIN/themes/liferay/splitpanel/hsplit.png
index 32e689b668..32e689b668 100644
--- a/WebContent/VAADIN/themes/liferay/splitpanel/hsplit.png
+++ b/themes/src/main/themes/VAADIN/themes/liferay/splitpanel/hsplit.png
diff --git a/WebContent/VAADIN/themes/liferay/splitpanel/splitpanel.scss b/themes/src/main/themes/VAADIN/themes/liferay/splitpanel/splitpanel.scss
index b8058f8cb1..b8058f8cb1 100644
--- a/WebContent/VAADIN/themes/liferay/splitpanel/splitpanel.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/splitpanel/splitpanel.scss
diff --git a/WebContent/VAADIN/themes/liferay/splitpanel/vsplit.png b/themes/src/main/themes/VAADIN/themes/liferay/splitpanel/vsplit.png
index 2ffe03a71b..2ffe03a71b 100644
--- a/WebContent/VAADIN/themes/liferay/splitpanel/vsplit.png
+++ b/themes/src/main/themes/VAADIN/themes/liferay/splitpanel/vsplit.png
diff --git a/WebContent/VAADIN/themes/liferay/styles.scss b/themes/src/main/themes/VAADIN/themes/liferay/styles.scss
index b76e5f756b..b76e5f756b 100644
--- a/WebContent/VAADIN/themes/liferay/styles.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/styles.scss
diff --git a/WebContent/VAADIN/themes/liferay/table/columnselect.png b/themes/src/main/themes/VAADIN/themes/liferay/table/columnselect.png
index 34b4834051..34b4834051 100644
--- a/WebContent/VAADIN/themes/liferay/table/columnselect.png
+++ b/themes/src/main/themes/VAADIN/themes/liferay/table/columnselect.png
diff --git a/WebContent/VAADIN/themes/liferay/table/table.scss b/themes/src/main/themes/VAADIN/themes/liferay/table/table.scss
index ecb260709b..ecb260709b 100644
--- a/WebContent/VAADIN/themes/liferay/table/table.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/table/table.scss
diff --git a/WebContent/VAADIN/themes/liferay/tabsheet/close.png b/themes/src/main/themes/VAADIN/themes/liferay/tabsheet/close.png
index 3b436159be..3b436159be 100644
--- a/WebContent/VAADIN/themes/liferay/tabsheet/close.png
+++ b/themes/src/main/themes/VAADIN/themes/liferay/tabsheet/close.png
diff --git a/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.scss b/themes/src/main/themes/VAADIN/themes/liferay/tabsheet/tabsheet.scss
index 83a36dd80f..83a36dd80f 100644
--- a/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/tabsheet/tabsheet.scss
diff --git a/WebContent/VAADIN/themes/liferay/textfield/textfield.scss b/themes/src/main/themes/VAADIN/themes/liferay/textfield/textfield.scss
index a260156bc8..a260156bc8 100644
--- a/WebContent/VAADIN/themes/liferay/textfield/textfield.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/textfield/textfield.scss
diff --git a/WebContent/VAADIN/themes/liferay/tree/arrows_sprites.png b/themes/src/main/themes/VAADIN/themes/liferay/tree/arrows_sprites.png
index 0a6ab35a26..0a6ab35a26 100644
--- a/WebContent/VAADIN/themes/liferay/tree/arrows_sprites.png
+++ b/themes/src/main/themes/VAADIN/themes/liferay/tree/arrows_sprites.png
diff --git a/WebContent/VAADIN/themes/liferay/tree/tree.scss b/themes/src/main/themes/VAADIN/themes/liferay/tree/tree.scss
index 99ce8e709f..99ce8e709f 100644
--- a/WebContent/VAADIN/themes/liferay/tree/tree.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/tree/tree.scss
diff --git a/WebContent/VAADIN/themes/liferay/window/closebutton_sprites.png b/themes/src/main/themes/VAADIN/themes/liferay/window/closebutton_sprites.png
index ca8eb278a1..ca8eb278a1 100644
--- a/WebContent/VAADIN/themes/liferay/window/closebutton_sprites.png
+++ b/themes/src/main/themes/VAADIN/themes/liferay/window/closebutton_sprites.png
diff --git a/WebContent/VAADIN/themes/liferay/window/maximize_sprites.png b/themes/src/main/themes/VAADIN/themes/liferay/window/maximize_sprites.png
index 06510063cd..06510063cd 100644
--- a/WebContent/VAADIN/themes/liferay/window/maximize_sprites.png
+++ b/themes/src/main/themes/VAADIN/themes/liferay/window/maximize_sprites.png
diff --git a/WebContent/VAADIN/themes/liferay/window/restore_sprites.png b/themes/src/main/themes/VAADIN/themes/liferay/window/restore_sprites.png
index 41ccfaf79f..41ccfaf79f 100644
--- a/WebContent/VAADIN/themes/liferay/window/restore_sprites.png
+++ b/themes/src/main/themes/VAADIN/themes/liferay/window/restore_sprites.png
diff --git a/WebContent/VAADIN/themes/liferay/window/top-left.png b/themes/src/main/themes/VAADIN/themes/liferay/window/top-left.png
index 3beb6bdca9..3beb6bdca9 100644
--- a/WebContent/VAADIN/themes/liferay/window/top-left.png
+++ b/themes/src/main/themes/VAADIN/themes/liferay/window/top-left.png
diff --git a/WebContent/VAADIN/themes/liferay/window/top-right.png b/themes/src/main/themes/VAADIN/themes/liferay/window/top-right.png
index dd8d61fdee..dd8d61fdee 100644
--- a/WebContent/VAADIN/themes/liferay/window/top-right.png
+++ b/themes/src/main/themes/VAADIN/themes/liferay/window/top-right.png
diff --git a/WebContent/VAADIN/themes/liferay/window/window.scss b/themes/src/main/themes/VAADIN/themes/liferay/window/window.scss
index d78c69a72f..d78c69a72f 100644
--- a/WebContent/VAADIN/themes/liferay/window/window.scss
+++ b/themes/src/main/themes/VAADIN/themes/liferay/window/window.scss
diff --git a/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.scss b/themes/src/main/themes/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.scss
index ffa7ca349a..ffa7ca349a 100644
--- a/WebContent/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.scss
diff --git a/WebContent/VAADIN/themes/reindeer/accordion/accordion.scss b/themes/src/main/themes/VAADIN/themes/reindeer/accordion/accordion.scss
index cd2ca4b21d..cd2ca4b21d 100644
--- a/WebContent/VAADIN/themes/reindeer/accordion/accordion.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/accordion/accordion.scss
diff --git a/WebContent/VAADIN/themes/reindeer/button/button-ie.scss b/themes/src/main/themes/VAADIN/themes/reindeer/button/button-ie.scss
index 6732aeb2aa..6732aeb2aa 100644
--- a/WebContent/VAADIN/themes/reindeer/button/button-ie.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/button-ie.scss
diff --git a/WebContent/VAADIN/themes/reindeer/button/button-link-style.scss b/themes/src/main/themes/VAADIN/themes/reindeer/button/button-link-style.scss
index 2064cb1650..2064cb1650 100644
--- a/WebContent/VAADIN/themes/reindeer/button/button-link-style.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/button-link-style.scss
diff --git a/WebContent/VAADIN/themes/reindeer/button/button-primary-style.scss b/themes/src/main/themes/VAADIN/themes/reindeer/button/button-primary-style.scss
index 238a694e28..238a694e28 100644
--- a/WebContent/VAADIN/themes/reindeer/button/button-primary-style.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/button-primary-style.scss
diff --git a/WebContent/VAADIN/themes/reindeer/button/button-small-style.scss b/themes/src/main/themes/VAADIN/themes/reindeer/button/button-small-style.scss
index 5c9e8a32bb..5c9e8a32bb 100644
--- a/WebContent/VAADIN/themes/reindeer/button/button-small-style.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/button-small-style.scss
diff --git a/WebContent/VAADIN/themes/reindeer/button/button-standard.scss b/themes/src/main/themes/VAADIN/themes/reindeer/button/button-standard.scss
index 632340f228..632340f228 100644
--- a/WebContent/VAADIN/themes/reindeer/button/button-standard.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/button-standard.scss
diff --git a/WebContent/VAADIN/themes/reindeer/button/button.scss b/themes/src/main/themes/VAADIN/themes/reindeer/button/button.scss
index 2fd34ef2c8..2fd34ef2c8 100644
--- a/WebContent/VAADIN/themes/reindeer/button/button.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/button.scss
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black/left-focus.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/left-focus.png
index 4361800079..4361800079 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/black/left-focus.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/left-focus.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black/left-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/left-pressed.png
index ab0d245b15..ab0d245b15 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/black/left-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/left-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black/left.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/left.png
index e77900abc5..e77900abc5 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/black/left.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/left.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black/primary-left-focus.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-left-focus.png
index 47bfc36a5b..47bfc36a5b 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/black/primary-left-focus.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-left-focus.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black/primary-left-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-left-pressed.png
index d20fa467f8..d20fa467f8 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/black/primary-left-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-left-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black/primary-left.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-left.png
index e05e8cf8ae..e05e8cf8ae 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/black/primary-left.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-left.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black/primary-right-focus.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-right-focus.png
index ecc06c52ab..ecc06c52ab 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/black/primary-right-focus.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-right-focus.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black/primary-right-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-right-pressed.png
index b71eecc3d8..b71eecc3d8 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/black/primary-right-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-right-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black/primary-right.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-right.png
index 94d5e93f85..94d5e93f85 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/black/primary-right.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-right.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black/right-focus.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/right-focus.png
index 43e6edb2b9..43e6edb2b9 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/black/right-focus.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/right-focus.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black/right-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/right-pressed.png
index 2612f6869d..2612f6869d 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/black/right-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/right-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black/right.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/right.png
index bfeafb779e..bfeafb779e 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/black/right.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/right.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black/small-left-focus.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-left-focus.png
index 55e76701b8..55e76701b8 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/black/small-left-focus.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-left-focus.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black/small-left-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-left-pressed.png
index 01eea1ea58..01eea1ea58 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/black/small-left-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-left-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black/small-left.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-left.png
index 28aca63243..28aca63243 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/black/small-left.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-left.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black/small-right-focus.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-right-focus.png
index 4415262cb6..4415262cb6 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/black/small-right-focus.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-right-focus.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black/small-right-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-right-pressed.png
index 7095241499..7095241499 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/black/small-right-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-right-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black/small-right.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-right.png
index 1be4b2c327..1be4b2c327 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/black/small-right.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-right.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/left-focus.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/left-focus.png
index 636cf840c3..636cf840c3 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/left-focus.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/left-focus.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/left-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/left-pressed.png
index e70f56b84b..e70f56b84b 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/left-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/left-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/left.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/left.png
index c4209e8119..c4209e8119 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/left.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/left.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/primary-left-focus.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-left-focus.png
index 7952ae5022..7952ae5022 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/primary-left-focus.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-left-focus.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/primary-left-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-left-pressed.png
index 7ff5296025..7ff5296025 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/primary-left-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-left-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/primary-left.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-left.png
index abb6bcc5af..abb6bcc5af 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/primary-left.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-left.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/primary-right-focus.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-right-focus.png
index 7b7ae32d84..7b7ae32d84 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/primary-right-focus.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-right-focus.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/primary-right-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-right-pressed.png
index dbcc59c906..dbcc59c906 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/primary-right-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-right-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/primary-right.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-right.png
index a600b84c34..a600b84c34 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/primary-right.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-right.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/right-focus.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/right-focus.png
index fa59dfefa3..fa59dfefa3 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/right-focus.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/right-focus.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/right-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/right-pressed.png
index 2cbe6c010f..2cbe6c010f 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/right-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/right-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/right.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/right.png
index af80f785e8..af80f785e8 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/right.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/right.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/small-left-focus.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-left-focus.png
index 96408f225f..96408f225f 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/small-left-focus.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-left-focus.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/small-left-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-left-pressed.png
index 90f0d5cbef..90f0d5cbef 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/small-left-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-left-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/small-left.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-left.png
index 4efaa98ac2..4efaa98ac2 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/small-left.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-left.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/small-right-focus.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-right-focus.png
index 03c4c92e68..03c4c92e68 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/small-right-focus.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-right-focus.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/small-right-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-right-pressed.png
index 90a22c8b8b..90a22c8b8b 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/small-right-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-right-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/img/small-right.png b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-right.png
index 96f11915c1..96f11915c1 100644
--- a/WebContent/VAADIN/themes/reindeer/button/img/small-right.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-right.png
diff --git a/WebContent/VAADIN/themes/reindeer/button/nativebutton.scss b/themes/src/main/themes/VAADIN/themes/reindeer/button/nativebutton.scss
index ca7a16e88e..ca7a16e88e 100644
--- a/WebContent/VAADIN/themes/reindeer/button/nativebutton.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/button/nativebutton.scss
diff --git a/WebContent/VAADIN/themes/reindeer/colorpicker/colorpicker.scss b/themes/src/main/themes/VAADIN/themes/reindeer/colorpicker/colorpicker.scss
index 4224691d12..4224691d12 100644
--- a/WebContent/VAADIN/themes/reindeer/colorpicker/colorpicker.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/colorpicker/colorpicker.scss
diff --git a/WebContent/VAADIN/themes/reindeer/common/common.scss b/themes/src/main/themes/VAADIN/themes/reindeer/common/common.scss
index 5e85cb09bc..5e85cb09bc 100644
--- a/WebContent/VAADIN/themes/reindeer/common/common.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/common/common.scss
diff --git a/WebContent/VAADIN/themes/reindeer/common/icons/bullet-white.png b/themes/src/main/themes/VAADIN/themes/reindeer/common/icons/bullet-white.png
index f0a0b1bfba..f0a0b1bfba 100644
--- a/WebContent/VAADIN/themes/reindeer/common/icons/bullet-white.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/common/icons/bullet-white.png
diff --git a/WebContent/VAADIN/themes/reindeer/common/icons/bullet.png b/themes/src/main/themes/VAADIN/themes/reindeer/common/icons/bullet.png
index 5047f6b27c..5047f6b27c 100644
--- a/WebContent/VAADIN/themes/reindeer/common/icons/bullet.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/common/icons/bullet.png
diff --git a/WebContent/VAADIN/themes/reindeer/common/icons/error.png b/themes/src/main/themes/VAADIN/themes/reindeer/common/icons/error.png
index 14200fcfda..14200fcfda 100644
--- a/WebContent/VAADIN/themes/reindeer/common/icons/error.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/common/icons/error.png
diff --git a/WebContent/VAADIN/themes/reindeer/common/img/sel-bg.png b/themes/src/main/themes/VAADIN/themes/reindeer/common/img/sel-bg.png
index 272db0e9f5..272db0e9f5 100644
--- a/WebContent/VAADIN/themes/reindeer/common/img/sel-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/common/img/sel-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/datefield.scss b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/datefield.scss
index d486316419..d486316419 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/datefield.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/datefield.scss
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/header-bg-black-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg-black-pressed.png
index 4da33f2113..4da33f2113 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/header-bg-black-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg-black-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/header-bg-black.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg-black.png
index 94517547c0..94517547c0 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/header-bg-black.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg-black.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/header-bg-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg-pressed.png
index 48a3bc8ff5..48a3bc8ff5 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/header-bg-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/header-bg.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg.png
index f033b5316d..f033b5316d 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/header-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/month-next-black-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next-black-pressed.png
index f4c54cd177..f4c54cd177 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/month-next-black-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next-black-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/month-next-black.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next-black.png
index 37001e2794..37001e2794 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/month-next-black.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next-black.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/month-next-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next-pressed.png
index 22393c7973..22393c7973 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/month-next-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/month-next.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next.png
index 50732c44ad..50732c44ad 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/month-next.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/month-prev-black-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev-black-pressed.png
index d57ed56a45..d57ed56a45 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/month-prev-black-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev-black-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/month-prev-black.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev-black.png
index 2d525f5751..2d525f5751 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/month-prev-black.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev-black.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/month-prev-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev-pressed.png
index ad39a9ae22..ad39a9ae22 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/month-prev-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/month-prev.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev.png
index 19bb013151..19bb013151 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/month-prev.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/popup-btn-black-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn-black-pressed.png
index 393b1c5d5f..393b1c5d5f 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/popup-btn-black-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn-black-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/popup-btn-black.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn-black.png
index 927fba5b31..927fba5b31 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/popup-btn-black.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn-black.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/popup-btn-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn-pressed.png
index 26f237ba0b..26f237ba0b 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/popup-btn-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/popup-btn.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn.png
index e51b1f0602..e51b1f0602 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/popup-btn.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-bg-black.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-bg-black.png
index f64cdafd5c..f64cdafd5c 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-bg-black.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-bg-black.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-bg.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-bg.png
index 19fd2b4288..19fd2b4288 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-first-black.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-first-black.png
index ff6ee7ba1b..ff6ee7ba1b 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-first-black.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-first-black.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-first.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-first.png
index f77ed233ae..f77ed233ae 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-first.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-first.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-last-black.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-last-black.png
index 984d2c2129..984d2c2129 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-last-black.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-last-black.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-last.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-last.png
index 500dc8bdaa..500dc8bdaa 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/weekday-last.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-last.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/year-next-black-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next-black-pressed.png
index 038f46149b..038f46149b 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/year-next-black-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next-black-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/year-next-black.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next-black.png
index 45c762fbcd..45c762fbcd 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/year-next-black.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next-black.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/year-next-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next-pressed.png
index 60b57c370b..60b57c370b 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/year-next-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/year-next.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next.png
index bb015ef73d..bb015ef73d 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/year-next.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/year-prev-black-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev-black-pressed.png
index 3df767e493..3df767e493 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/year-prev-black-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev-black-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/year-prev-black.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev-black.png
index 05b7178722..05b7178722 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/year-prev-black.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev-black.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/year-prev-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev-pressed.png
index c760d022e8..c760d022e8 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/year-prev-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/img/year-prev.png b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev.png
index 3cd62e4e95..3cd62e4e95 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/img/year-prev.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev.png
diff --git a/WebContent/VAADIN/themes/reindeer/favicon.ico b/themes/src/main/themes/VAADIN/themes/reindeer/favicon.ico
index 1f81f0de76..1f81f0de76 100644
--- a/WebContent/VAADIN/themes/reindeer/favicon.ico
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/favicon.ico
diff --git a/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss b/themes/src/main/themes/VAADIN/themes/reindeer/formlayout/formlayout.scss
index 7f8871fdac..7f8871fdac 100644
--- a/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/formlayout/formlayout.scss
diff --git a/WebContent/VAADIN/themes/reindeer/grid/grid.scss b/themes/src/main/themes/VAADIN/themes/reindeer/grid/grid.scss
index 71d7a864f6..71d7a864f6 100644
--- a/WebContent/VAADIN/themes/reindeer/grid/grid.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/grid/grid.scss
diff --git a/WebContent/VAADIN/themes/reindeer/grid/img/asc-light.png b/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/asc-light.png
index 44ed76001a..44ed76001a 100644
--- a/WebContent/VAADIN/themes/reindeer/grid/img/asc-light.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/asc-light.png
diff --git a/WebContent/VAADIN/themes/reindeer/grid/img/desc-light.png b/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/desc-light.png
index 84d15a0628..84d15a0628 100644
--- a/WebContent/VAADIN/themes/reindeer/grid/img/desc-light.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/desc-light.png
diff --git a/WebContent/VAADIN/themes/reindeer/grid/img/focus-bg-light.png b/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/focus-bg-light.png
index 20b34474c7..20b34474c7 100644
--- a/WebContent/VAADIN/themes/reindeer/grid/img/focus-bg-light.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/focus-bg-light.png
diff --git a/WebContent/VAADIN/themes/reindeer/grid/img/focus-header-bg-light.png b/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/focus-header-bg-light.png
index 4e83df03cb..4e83df03cb 100644
--- a/WebContent/VAADIN/themes/reindeer/grid/img/focus-header-bg-light.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/focus-header-bg-light.png
diff --git a/WebContent/VAADIN/themes/reindeer/grid/img/focus-sel-bg-light.png b/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/focus-sel-bg-light.png
index 249fd5917c..249fd5917c 100644
--- a/WebContent/VAADIN/themes/reindeer/grid/img/focus-sel-bg-light.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/focus-sel-bg-light.png
diff --git a/WebContent/VAADIN/themes/reindeer/grid/img/header-bg-light.png b/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/header-bg-light.png
index 0b913e2ef1..0b913e2ef1 100644
--- a/WebContent/VAADIN/themes/reindeer/grid/img/header-bg-light.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/header-bg-light.png
diff --git a/WebContent/VAADIN/themes/reindeer/inlinedatefield/inlinedatefield.scss b/themes/src/main/themes/VAADIN/themes/reindeer/inlinedatefield/inlinedatefield.scss
index 8ad3c1a012..8ad3c1a012 100644
--- a/WebContent/VAADIN/themes/reindeer/inlinedatefield/inlinedatefield.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/inlinedatefield/inlinedatefield.scss
diff --git a/WebContent/VAADIN/themes/reindeer/label/label.scss b/themes/src/main/themes/VAADIN/themes/reindeer/label/label.scss
index 9a6f9b33ad..9a6f9b33ad 100644
--- a/WebContent/VAADIN/themes/reindeer/label/label.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/label/label.scss
diff --git a/WebContent/VAADIN/themes/reindeer/layouts/img/black-bg.png b/themes/src/main/themes/VAADIN/themes/reindeer/layouts/img/black-bg.png
index f2e0ac0537..f2e0ac0537 100644
--- a/WebContent/VAADIN/themes/reindeer/layouts/img/black-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/layouts/img/black-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss b/themes/src/main/themes/VAADIN/themes/reindeer/layouts/layouts.scss
index 0b0b311daa..0b0b311daa 100644
--- a/WebContent/VAADIN/themes/reindeer/layouts/layouts.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/layouts/layouts.scss
diff --git a/WebContent/VAADIN/themes/reindeer/legacy-styles.scss b/themes/src/main/themes/VAADIN/themes/reindeer/legacy-styles.scss
index 6c59b887d8..6c59b887d8 100644
--- a/WebContent/VAADIN/themes/reindeer/legacy-styles.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/legacy-styles.scss
diff --git a/WebContent/VAADIN/themes/reindeer/link/link.scss b/themes/src/main/themes/VAADIN/themes/reindeer/link/link.scss
index f1d2a31d83..f1d2a31d83 100644
--- a/WebContent/VAADIN/themes/reindeer/link/link.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/link/link.scss
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/bg.png b/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/bg.png
index 0ce20b9aca..0ce20b9aca 100644
--- a/WebContent/VAADIN/themes/reindeer/menubar/img/bg.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/checked-selected.png b/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/checked-selected.png
index 192c404617..192c404617 100644
--- a/WebContent/VAADIN/themes/reindeer/menubar/img/checked-selected.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/checked-selected.png
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/checked.png b/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/checked.png
index 418e951166..418e951166 100644
--- a/WebContent/VAADIN/themes/reindeer/menubar/img/checked.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/checked.png
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/menu-sel-bg.png b/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/menu-sel-bg.png
index d61d9ad6df..d61d9ad6df 100644
--- a/WebContent/VAADIN/themes/reindeer/menubar/img/menu-sel-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/menu-sel-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/submenu-icon-hover.png b/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/submenu-icon-hover.png
index dcf5e1ac55..dcf5e1ac55 100644
--- a/WebContent/VAADIN/themes/reindeer/menubar/img/submenu-icon-hover.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/submenu-icon-hover.png
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/submenu-icon.png b/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/submenu-icon.png
index 4dc376b78e..4dc376b78e 100644
--- a/WebContent/VAADIN/themes/reindeer/menubar/img/submenu-icon.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/submenu-icon.png
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png b/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png
index bac6587c20..bac6587c20 100644
--- a/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked.png b/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/unchecked.png
index 92a2b582c5..92a2b582c5 100644
--- a/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/unchecked.png
diff --git a/WebContent/VAADIN/themes/reindeer/menubar/menubar.scss b/themes/src/main/themes/VAADIN/themes/reindeer/menubar/menubar.scss
index 0b1672dab1..0b1672dab1 100644
--- a/WebContent/VAADIN/themes/reindeer/menubar/menubar.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/menubar/menubar.scss
diff --git a/WebContent/VAADIN/themes/reindeer/notification/img/error-close.png b/themes/src/main/themes/VAADIN/themes/reindeer/notification/img/error-close.png
index 2ce85b628a..2ce85b628a 100644
--- a/WebContent/VAADIN/themes/reindeer/notification/img/error-close.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/notification/img/error-close.png
diff --git a/WebContent/VAADIN/themes/reindeer/notification/notification.scss b/themes/src/main/themes/VAADIN/themes/reindeer/notification/notification.scss
index 85eab598fe..85eab598fe 100644
--- a/WebContent/VAADIN/themes/reindeer/notification/notification.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/notification/notification.scss
diff --git a/WebContent/VAADIN/themes/reindeer/panel/panel.scss b/themes/src/main/themes/VAADIN/themes/reindeer/panel/panel.scss
index 74ee10837d..74ee10837d 100644
--- a/WebContent/VAADIN/themes/reindeer/panel/panel.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/panel/panel.scss
diff --git a/WebContent/VAADIN/themes/reindeer/popupview/popupview.scss b/themes/src/main/themes/VAADIN/themes/reindeer/popupview/popupview.scss
index a6e7ad9843..a6e7ad9843 100644
--- a/WebContent/VAADIN/themes/reindeer/popupview/popupview.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/popupview/popupview.scss
diff --git a/WebContent/VAADIN/themes/reindeer/progressindicator/img/base-static.gif b/themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/base-static.gif
index 474b684196..474b684196 100644
--- a/WebContent/VAADIN/themes/reindeer/progressindicator/img/base-static.gif
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/base-static.gif
diff --git a/WebContent/VAADIN/themes/reindeer/progressindicator/img/base.gif b/themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/base.gif
index 6c6f15ef9e..6c6f15ef9e 100644
--- a/WebContent/VAADIN/themes/reindeer/progressindicator/img/base.gif
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/base.gif
diff --git a/WebContent/VAADIN/themes/reindeer/progressindicator/img/disabled.gif b/themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/disabled.gif
index 7a64d034b2..7a64d034b2 100644
--- a/WebContent/VAADIN/themes/reindeer/progressindicator/img/disabled.gif
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/disabled.gif
diff --git a/WebContent/VAADIN/themes/reindeer/progressindicator/img/progress.png b/themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/progress.png
index 4a9803308c..4a9803308c 100644
--- a/WebContent/VAADIN/themes/reindeer/progressindicator/img/progress.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/progress.png
diff --git a/WebContent/VAADIN/themes/reindeer/progressindicator/progressindicator.scss b/themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/progressindicator.scss
index 2417202828..2417202828 100644
--- a/WebContent/VAADIN/themes/reindeer/progressindicator/progressindicator.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/progressindicator.scss
diff --git a/WebContent/VAADIN/themes/reindeer/reindeer.scss b/themes/src/main/themes/VAADIN/themes/reindeer/reindeer.scss
index c5d88f4a02..c5d88f4a02 100644
--- a/WebContent/VAADIN/themes/reindeer/reindeer.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/reindeer.scss
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/arrow-down-hover.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-down-hover.png
index 2061e31bee..2061e31bee 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/arrow-down-hover.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-down-hover.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/arrow-down.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-down.png
index 6fba8ab906..6fba8ab906 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/arrow-down.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-down.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/arrow-up-hover.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-up-hover.png
index a2d3ea6706..a2d3ea6706 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/arrow-up-hover.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-up-hover.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/arrow-up.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-up.png
index 3c9b52c9fc..3c9b52c9fc 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/arrow-up.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-up.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/center-black-focus.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/center-black-focus.png
index 1d47349076..1d47349076 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/black/center-black-focus.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/center-black-focus.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/center-black.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/center-black.png
index a5cfcebf3b..a5cfcebf3b 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/black/center-black.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/center-black.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-focus.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/left-black-focus.png
index 720c310c35..720c310c35 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-focus.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/left-black-focus.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/left-black.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/left-black.png
index 9908a79990..9908a79990 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/black/left-black.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/left-black.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-focus-hover.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-focus-hover.png
index 2f98d641d2..2f98d641d2 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-focus-hover.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-focus-hover.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-focus-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-focus-pressed.png
index 5a8012b861..5a8012b861 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-focus-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-focus-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-focus.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-focus.png
index a5c88ed7cb..a5c88ed7cb 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-focus.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-focus.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-hover.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-hover.png
index 8113640f15..8113640f15 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-hover.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-hover.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-pressed.png
index ef5ee44451..ef5ee44451 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/black/right-black-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/right-black.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black.png
index 1bd04abb46..1bd04abb46 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/black/right-black.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/center-focus.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/center-focus.png
index e236f2a24d..e236f2a24d 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/center-focus.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/center-focus.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/center.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/center.png
index fae6766cce..fae6766cce 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/center.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/center.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/left-focus.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/left-focus.png
index 528d53203b..528d53203b 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/left-focus.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/left-focus.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/left.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/left.png
index e4179a0078..e4179a0078 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/left.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/left.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/page-down-hover.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-down-hover.png
index 5479c21ee9..5479c21ee9 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/page-down-hover.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-down-hover.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/page-down-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-down-pressed.png
index 8d621bd96e..8d621bd96e 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/page-down-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-down-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/page-up-hover.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-up-hover.png
index ba08d141fd..ba08d141fd 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/page-up-hover.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-up-hover.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/page-up-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-up-pressed.png
index 08c044abc6..08c044abc6 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/page-up-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-up-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/right-focus-hover.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-focus-hover.png
index 9b8ddc7676..9b8ddc7676 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/right-focus-hover.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-focus-hover.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/right-focus-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-focus-pressed.png
index 9c7b6dc0ac..9c7b6dc0ac 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/right-focus-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-focus-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/right-focus.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-focus.png
index 127c3e03d2..127c3e03d2 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/right-focus.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-focus.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/right-hover.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-hover.png
index 5d1c8f8153..5d1c8f8153 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/right-hover.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-hover.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/right-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-pressed.png
index f9450d2d43..f9450d2d43 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/right-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/right.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right.png
index d341745cce..d341745cce 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/right.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/status-bg.png b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/status-bg.png
index c93bfeb350..c93bfeb350 100644
--- a/WebContent/VAADIN/themes/reindeer/select/img/status-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/img/status-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/select/select.scss b/themes/src/main/themes/VAADIN/themes/reindeer/select/select.scss
index a15ba4ab87..a15ba4ab87 100644
--- a/WebContent/VAADIN/themes/reindeer/select/select.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/select/select.scss
diff --git a/WebContent/VAADIN/themes/reindeer/slider/img/knob-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/slider/img/knob-pressed.png
index d5afcb71a0..d5afcb71a0 100644
--- a/WebContent/VAADIN/themes/reindeer/slider/img/knob-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/slider/img/knob-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/slider/img/knob.png b/themes/src/main/themes/VAADIN/themes/reindeer/slider/img/knob.png
index 897d45b415..897d45b415 100644
--- a/WebContent/VAADIN/themes/reindeer/slider/img/knob.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/slider/img/knob.png
diff --git a/WebContent/VAADIN/themes/reindeer/slider/slider.scss b/themes/src/main/themes/VAADIN/themes/reindeer/slider/slider.scss
index ed286d7c68..ed286d7c68 100644
--- a/WebContent/VAADIN/themes/reindeer/slider/slider.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/slider/slider.scss
diff --git a/WebContent/VAADIN/themes/reindeer/splitpanel/img/hor-bg.png b/themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/hor-bg.png
index 4ce1cabffc..4ce1cabffc 100644
--- a/WebContent/VAADIN/themes/reindeer/splitpanel/img/hor-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/hor-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/splitpanel/img/hor-handle.png b/themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/hor-handle.png
index 50645f41f1..50645f41f1 100644
--- a/WebContent/VAADIN/themes/reindeer/splitpanel/img/hor-handle.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/hor-handle.png
diff --git a/WebContent/VAADIN/themes/reindeer/splitpanel/img/ver-bg.png b/themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/ver-bg.png
index 1e6968dd1c..1e6968dd1c 100644
--- a/WebContent/VAADIN/themes/reindeer/splitpanel/img/ver-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/ver-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/splitpanel/img/ver-handle.png b/themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/ver-handle.png
index bf5ca89ca5..bf5ca89ca5 100644
--- a/WebContent/VAADIN/themes/reindeer/splitpanel/img/ver-handle.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/ver-handle.png
diff --git a/WebContent/VAADIN/themes/reindeer/splitpanel/splitpanel.scss b/themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/splitpanel.scss
index 2e612e2e21..2e612e2e21 100644
--- a/WebContent/VAADIN/themes/reindeer/splitpanel/splitpanel.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/splitpanel.scss
diff --git a/WebContent/VAADIN/themes/reindeer/styles.scss b/themes/src/main/themes/VAADIN/themes/reindeer/styles.scss
index 89ddb29341..89ddb29341 100644
--- a/WebContent/VAADIN/themes/reindeer/styles.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/styles.scss
diff --git a/WebContent/VAADIN/themes/reindeer/table/img/asc-light.png b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/asc-light.png
index 44ed76001a..44ed76001a 100644
--- a/WebContent/VAADIN/themes/reindeer/table/img/asc-light.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/asc-light.png
diff --git a/WebContent/VAADIN/themes/reindeer/table/img/asc.png b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/asc.png
index 050d6c715b..050d6c715b 100644
--- a/WebContent/VAADIN/themes/reindeer/table/img/asc.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/asc.png
diff --git a/WebContent/VAADIN/themes/reindeer/table/img/col-sel-black-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-black-pressed.png
index 69ed19c41f..69ed19c41f 100644
--- a/WebContent/VAADIN/themes/reindeer/table/img/col-sel-black-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-black-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/table/img/col-sel-black.png b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-black.png
index 6cf004991d..6cf004991d 100644
--- a/WebContent/VAADIN/themes/reindeer/table/img/col-sel-black.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-black.png
diff --git a/WebContent/VAADIN/themes/reindeer/table/img/col-sel-light-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-light-pressed.png
index 02afc74e14..02afc74e14 100644
--- a/WebContent/VAADIN/themes/reindeer/table/img/col-sel-light-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-light-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/table/img/col-sel-light.png b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-light.png
index 7b15cb5605..7b15cb5605 100644
--- a/WebContent/VAADIN/themes/reindeer/table/img/col-sel-light.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-light.png
diff --git a/WebContent/VAADIN/themes/reindeer/table/img/col-sel-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-pressed.png
index 774248c447..774248c447 100644
--- a/WebContent/VAADIN/themes/reindeer/table/img/col-sel-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/table/img/col-sel.png b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel.png
index 3a2a0b3f44..3a2a0b3f44 100644
--- a/WebContent/VAADIN/themes/reindeer/table/img/col-sel.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel.png
diff --git a/WebContent/VAADIN/themes/reindeer/table/img/desc-light.png b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/desc-light.png
index 84d15a0628..84d15a0628 100644
--- a/WebContent/VAADIN/themes/reindeer/table/img/desc-light.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/desc-light.png
diff --git a/WebContent/VAADIN/themes/reindeer/table/img/desc.png b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/desc.png
index c3edfa25b9..c3edfa25b9 100644
--- a/WebContent/VAADIN/themes/reindeer/table/img/desc.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/desc.png
diff --git a/WebContent/VAADIN/themes/reindeer/table/img/header-bg-black.png b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/header-bg-black.png
index 1ccbca7168..1ccbca7168 100644
--- a/WebContent/VAADIN/themes/reindeer/table/img/header-bg-black.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/header-bg-black.png
diff --git a/WebContent/VAADIN/themes/reindeer/table/img/header-bg-light.png b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/header-bg-light.png
index 0b913e2ef1..0b913e2ef1 100644
--- a/WebContent/VAADIN/themes/reindeer/table/img/header-bg-light.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/header-bg-light.png
diff --git a/WebContent/VAADIN/themes/reindeer/table/img/header-bg.png b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/header-bg.png
index a6b897199a..a6b897199a 100644
--- a/WebContent/VAADIN/themes/reindeer/table/img/header-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/header-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/table/img/scroll-indic-bg.png b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/scroll-indic-bg.png
index 060eadee5f..060eadee5f 100644
--- a/WebContent/VAADIN/themes/reindeer/table/img/scroll-indic-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/table/img/scroll-indic-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/table/table.scss b/themes/src/main/themes/VAADIN/themes/reindeer/table/table.scss
index 5896bef014..5896bef014 100644
--- a/WebContent/VAADIN/themes/reindeer/table/table.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/table/table.scss
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/bar/tab-bg-sel.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-bg-sel.png
index 3c6b3a8efb..3c6b3a8efb 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/bar/tab-bg-sel.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-bg-sel.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/bar/tab-bg.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-bg.png
index 033e1cbd6d..033e1cbd6d 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/bar/tab-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/bar/tab-first-left-sel.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-first-left-sel.png
index 30188fb070..30188fb070 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/bar/tab-first-left-sel.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-first-left-sel.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/bar/tab-first-left.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-first-left.png
index 207a0a9040..207a0a9040 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/bar/tab-first-left.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-first-left.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/bar/tab-left-sel.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-left-sel.png
index 5aa0df6736..5aa0df6736 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/bar/tab-left-sel.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-left-sel.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/bar/tab-left.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-left.png
index 78a0bd6ff6..78a0bd6ff6 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/bar/tab-left.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-left.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/bar/tab-right-sel.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-right-sel.png
index acb8aceacf..acb8aceacf 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/bar/tab-right-sel.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-right-sel.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/bar/tab-right.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-right.png
index 7aedf4c443..7aedf4c443 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/bar/tab-right.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-right.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/close-btn-hover.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-hover.png
index f548db838a..f548db838a 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/close-btn-hover.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-hover.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/close-btn-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-pressed.png
index a39a4431b3..a39a4431b3 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/close-btn-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel-hover.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel-hover.png
index 31a0d1f3f5..31a0d1f3f5 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel-hover.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel-hover.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel-pressed.png
index 9aae58c427..9aae58c427 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel.png
index e0cd398707..e0cd398707 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/close-btn.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn.png
index 9407f7b82c..9407f7b82c 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/close-btn.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg-sel.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg-sel.png
index 69cb79bb07..69cb79bb07 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg-sel.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg-sel.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg.png
index ba6ce2d1f6..ba6ce2d1f6 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left-sel.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left-sel.png
index 39e2eb907d..39e2eb907d 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left-sel.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left-sel.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left.png
index 5da4f354a7..5da4f354a7 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left-sel.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left-sel.png
index 36bda281a2..36bda281a2 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left-sel.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left-sel.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left.png
index 8debec889c..8debec889c 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right-sel.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right-sel.png
index 8dd605495f..8dd605495f 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right-sel.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right-sel.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right.png
index f02e91260e..f02e91260e 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-spacer-right.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-spacer-right.png
index a4d36b63d6..a4d36b63d6 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/framed/tab-spacer-right.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-spacer-right.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/tab-next-disabled.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-next-disabled.png
index bfdb3d60b9..bfdb3d60b9 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/tab-next-disabled.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-next-disabled.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/tab-next-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-next-pressed.png
index 3b1d688ea0..3b1d688ea0 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/tab-next-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-next-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/tab-next.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-next.png
index 10d8dd96de..10d8dd96de 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/tab-next.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-next.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/tab-prev-disabled.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-prev-disabled.png
index fbd08f74b2..fbd08f74b2 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/tab-prev-disabled.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-prev-disabled.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/tab-prev-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-prev-pressed.png
index 22923aa7e9..22923aa7e9 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/tab-prev-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-prev-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/tab-prev.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-prev.png
index aaa748424f..aaa748424f 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/tab-prev.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-prev.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/tabbar-bg-sel.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tabbar-bg-sel.png
index 7084ff1af3..7084ff1af3 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/tabbar-bg-sel.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tabbar-bg-sel.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/img/tabbar-bg.png b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tabbar-bg.png
index 76cf520e04..76cf520e04 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/img/tabbar-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tabbar-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-borderless-style.scss b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-borderless-style.scss
index e2a92730b4..e2a92730b4 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-borderless-style.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-borderless-style.scss
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-hover-closable-style.scss b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-hover-closable-style.scss
index 706aea151b..706aea151b 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-hover-closable-style.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-hover-closable-style.scss
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss
index 77d4922535..77d4922535 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss
index a2091130a1..a2091130a1 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.scss b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.scss
index 070bb2d724..070bb2d724 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.scss
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-selected-closable-style.scss b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-selected-closable-style.scss
index ed1ddcd693..ed1ddcd693 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-selected-closable-style.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-selected-closable-style.scss
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss
index 4141586d5a..4141586d5a 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.scss b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet.scss
index 35001daf4d..35001daf4d 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet.scss
diff --git a/WebContent/VAADIN/themes/reindeer/textfield/img/bg-black.png b/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-black.png
index 54c41f8bd5..54c41f8bd5 100644
--- a/WebContent/VAADIN/themes/reindeer/textfield/img/bg-black.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-black.png
diff --git a/WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image-black-focus.png b/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image-black-focus.png
index 9defe8108a..9defe8108a 100644
--- a/WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image-black-focus.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image-black-focus.png
diff --git a/WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image-black.png b/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image-black.png
index 2f501f3866..2f501f3866 100644
--- a/WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image-black.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image-black.png
diff --git a/WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image-focus.png b/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image-focus.png
index 673212b408..673212b408 100644
--- a/WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image-focus.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image-focus.png
diff --git a/WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image.png b/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image.png
index 38fe3e6d7b..38fe3e6d7b 100644
--- a/WebContent/VAADIN/themes/reindeer/textfield/img/bg-border-image.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image.png
diff --git a/WebContent/VAADIN/themes/reindeer/textfield/img/bg.png b/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg.png
index 4096e9d524..4096e9d524 100644
--- a/WebContent/VAADIN/themes/reindeer/textfield/img/bg.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/textfield/textfield.scss b/themes/src/main/themes/VAADIN/themes/reindeer/textfield/textfield.scss
index 4bca7dbeb6..4bca7dbeb6 100644
--- a/WebContent/VAADIN/themes/reindeer/textfield/textfield.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/textfield/textfield.scss
diff --git a/WebContent/VAADIN/themes/reindeer/tree/img/arrows.png b/themes/src/main/themes/VAADIN/themes/reindeer/tree/img/arrows.png
index 3f657e34c9..3f657e34c9 100644
--- a/WebContent/VAADIN/themes/reindeer/tree/img/arrows.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tree/img/arrows.png
diff --git a/WebContent/VAADIN/themes/reindeer/tree/tree.scss b/themes/src/main/themes/VAADIN/themes/reindeer/tree/tree.scss
index 15e7092dd6..15e7092dd6 100644
--- a/WebContent/VAADIN/themes/reindeer/tree/tree.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/tree/tree.scss
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/close-hover.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/close-hover.png
index bb0a080373..bb0a080373 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/black/close-hover.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/close-hover.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/close-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/close-pressed.png
index 07a837b619..07a837b619 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/black/close-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/close-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/close.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/close.png
index b26cfb5d57..b26cfb5d57 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/black/close.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/close.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/content-bg.png
index caaee49b32..caaee49b32 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/content-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/header-bg.png
index a956a6b27d..a956a6b27d 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/header-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/maximize-active.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/maximize-active.png
index 526563c94f..526563c94f 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/black/maximize-active.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/maximize-active.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/maximize-hover.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/maximize-hover.png
index 76d0fdf040..76d0fdf040 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/black/maximize-hover.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/maximize-hover.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/maximize.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/maximize.png
index ecf4cbed35..ecf4cbed35 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/black/maximize.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/maximize.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/resize.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/resize.png
index 91e0b742d9..91e0b742d9 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/black/resize.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/resize.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/restore-active.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/restore-active.png
index 96f9672605..96f9672605 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/black/restore-active.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/restore-active.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/restore-hover.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/restore-hover.png
index b319f07684..b319f07684 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/black/restore-hover.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/restore-hover.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/restore.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/restore.png
index b440383b91..b440383b91 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/black/restore.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/restore.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/close-hover.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/close-hover.png
index 78bb84d869..78bb84d869 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/close-hover.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/close-hover.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/close-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/close-pressed.png
index 4618ad5e0d..4618ad5e0d 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/close-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/close-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/close.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/close.png
index e04f31d882..e04f31d882 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/close.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/close.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/footer-bg.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/footer-bg.png
index 28839748e6..28839748e6 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/footer-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/footer-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/header-bg.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/header-bg.png
index 27f1bf92a7..27f1bf92a7 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/header-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/header-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/light/close-hover.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/close-hover.png
index 17ac9b8457..17ac9b8457 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/light/close-hover.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/close-hover.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/light/close-pressed.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/close-pressed.png
index 2c84b5bcfb..2c84b5bcfb 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/light/close-pressed.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/close-pressed.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/light/close.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/close.png
index 4bbc89cee9..4bbc89cee9 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/light/close.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/close.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/light/content-bg.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/content-bg.png
index b38c902d83..b38c902d83 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/light/content-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/content-bg.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/light/maximize-active.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/maximize-active.png
index 5ca4e2e6eb..5ca4e2e6eb 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/light/maximize-active.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/maximize-active.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/light/maximize-hover.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/maximize-hover.png
index c7930c2f4a..c7930c2f4a 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/light/maximize-hover.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/maximize-hover.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/light/maximize.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/maximize.png
index a4965ef19c..a4965ef19c 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/light/maximize.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/maximize.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/light/resize.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/resize.png
index 0c0c9123b9..0c0c9123b9 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/light/resize.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/resize.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/light/restore-active.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/restore-active.png
index d135c4d66c..d135c4d66c 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/light/restore-active.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/restore-active.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/light/restore-hover.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/restore-hover.png
index b03639c001..b03639c001 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/light/restore-hover.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/restore-hover.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/light/restore.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/restore.png
index 1c3fba4020..1c3fba4020 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/light/restore.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/restore.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/maximize.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/maximize.png
index 86ffff9760..86ffff9760 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/maximize.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/maximize.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/resize.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/resize.png
index 828bb346cc..828bb346cc 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/resize.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/resize.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/restore.png b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/restore.png
index 119ea04259..119ea04259 100644
--- a/WebContent/VAADIN/themes/reindeer/window/img/restore.png
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/img/restore.png
diff --git a/WebContent/VAADIN/themes/reindeer/window/window.scss b/themes/src/main/themes/VAADIN/themes/reindeer/window/window.scss
index 66c80c6a44..66c80c6a44 100644
--- a/WebContent/VAADIN/themes/reindeer/window/window.scss
+++ b/themes/src/main/themes/VAADIN/themes/reindeer/window/window.scss
diff --git a/WebContent/VAADIN/themes/runo/absolutelayout/absolutelayout.scss b/themes/src/main/themes/VAADIN/themes/runo/absolutelayout/absolutelayout.scss
index e87d9f64ad..e87d9f64ad 100644
--- a/WebContent/VAADIN/themes/runo/absolutelayout/absolutelayout.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/absolutelayout/absolutelayout.scss
diff --git a/WebContent/VAADIN/themes/runo/accordion/accordion.scss b/themes/src/main/themes/VAADIN/themes/runo/accordion/accordion.scss
index 69a52dd22a..69a52dd22a 100644
--- a/WebContent/VAADIN/themes/runo/accordion/accordion.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/accordion/accordion.scss
diff --git a/WebContent/VAADIN/themes/runo/accordion/img/bg.png b/themes/src/main/themes/VAADIN/themes/runo/accordion/img/bg.png
index 0015e4cd0e..0015e4cd0e 100644
--- a/WebContent/VAADIN/themes/runo/accordion/img/bg.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/accordion/img/bg.png
diff --git a/WebContent/VAADIN/themes/runo/accordion/img/collapsed-icon.png b/themes/src/main/themes/VAADIN/themes/runo/accordion/img/collapsed-icon.png
index dc13f0f786..dc13f0f786 100644
--- a/WebContent/VAADIN/themes/runo/accordion/img/collapsed-icon.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/accordion/img/collapsed-icon.png
diff --git a/WebContent/VAADIN/themes/runo/accordion/img/expanded-icon.png b/themes/src/main/themes/VAADIN/themes/runo/accordion/img/expanded-icon.png
index 0ad8eb074f..0ad8eb074f 100644
--- a/WebContent/VAADIN/themes/runo/accordion/img/expanded-icon.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/accordion/img/expanded-icon.png
diff --git a/WebContent/VAADIN/themes/runo/accordion/img/selected-bg.png b/themes/src/main/themes/VAADIN/themes/runo/accordion/img/selected-bg.png
index 1c599db14e..1c599db14e 100644
--- a/WebContent/VAADIN/themes/runo/accordion/img/selected-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/accordion/img/selected-bg.png
diff --git a/WebContent/VAADIN/themes/runo/button/button.scss b/themes/src/main/themes/VAADIN/themes/runo/button/button.scss
index b303dd2e02..b303dd2e02 100644
--- a/WebContent/VAADIN/themes/runo/button/button.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/button/button.scss
diff --git a/WebContent/VAADIN/themes/runo/button/img/bg-default.png b/themes/src/main/themes/VAADIN/themes/runo/button/img/bg-default.png
index bb655872e3..bb655872e3 100644
--- a/WebContent/VAADIN/themes/runo/button/img/bg-default.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/button/img/bg-default.png
diff --git a/WebContent/VAADIN/themes/runo/button/img/bg.png b/themes/src/main/themes/VAADIN/themes/runo/button/img/bg.png
index 4552879208..4552879208 100644
--- a/WebContent/VAADIN/themes/runo/button/img/bg.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/button/img/bg.png
diff --git a/WebContent/VAADIN/themes/runo/caption/caption.scss b/themes/src/main/themes/VAADIN/themes/runo/caption/caption.scss
index dab33c99c7..dab33c99c7 100644
--- a/WebContent/VAADIN/themes/runo/caption/caption.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/caption/caption.scss
diff --git a/WebContent/VAADIN/themes/runo/colorpicker/colorpicker.scss b/themes/src/main/themes/VAADIN/themes/runo/colorpicker/colorpicker.scss
index df48c10a86..df48c10a86 100644
--- a/WebContent/VAADIN/themes/runo/colorpicker/colorpicker.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/colorpicker/colorpicker.scss
diff --git a/WebContent/VAADIN/themes/runo/common/common.scss b/themes/src/main/themes/VAADIN/themes/runo/common/common.scss
index 207660c08e..207660c08e 100644
--- a/WebContent/VAADIN/themes/runo/common/common.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/common/common.scss
diff --git a/WebContent/VAADIN/themes/runo/common/img/blank.gif b/themes/src/main/themes/VAADIN/themes/runo/common/img/blank.gif
index 3776af0784..3776af0784 100644
--- a/WebContent/VAADIN/themes/runo/common/img/blank.gif
+++ b/themes/src/main/themes/VAADIN/themes/runo/common/img/blank.gif
diff --git a/WebContent/VAADIN/themes/runo/common/img/main-bg.png b/themes/src/main/themes/VAADIN/themes/runo/common/img/main-bg.png
index a6cd9288f7..a6cd9288f7 100644
--- a/WebContent/VAADIN/themes/runo/common/img/main-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/common/img/main-bg.png
diff --git a/WebContent/VAADIN/themes/runo/datefield/datefield.scss b/themes/src/main/themes/VAADIN/themes/runo/datefield/datefield.scss
index d89fdf786e..d89fdf786e 100644
--- a/WebContent/VAADIN/themes/runo/datefield/datefield.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/datefield/datefield.scss
diff --git a/WebContent/VAADIN/themes/runo/datefield/img/nextmonth.png b/themes/src/main/themes/VAADIN/themes/runo/datefield/img/nextmonth.png
index 3315125dd1..3315125dd1 100644
--- a/WebContent/VAADIN/themes/runo/datefield/img/nextmonth.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/datefield/img/nextmonth.png
diff --git a/WebContent/VAADIN/themes/runo/datefield/img/nextyear.png b/themes/src/main/themes/VAADIN/themes/runo/datefield/img/nextyear.png
index 22633fd31a..22633fd31a 100644
--- a/WebContent/VAADIN/themes/runo/datefield/img/nextyear.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/datefield/img/nextyear.png
diff --git a/WebContent/VAADIN/themes/runo/datefield/img/open-button.png b/themes/src/main/themes/VAADIN/themes/runo/datefield/img/open-button.png
index 548ca12f70..548ca12f70 100644
--- a/WebContent/VAADIN/themes/runo/datefield/img/open-button.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/datefield/img/open-button.png
diff --git a/WebContent/VAADIN/themes/runo/datefield/img/prevmonth.png b/themes/src/main/themes/VAADIN/themes/runo/datefield/img/prevmonth.png
index d114632fef..d114632fef 100644
--- a/WebContent/VAADIN/themes/runo/datefield/img/prevmonth.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/datefield/img/prevmonth.png
diff --git a/WebContent/VAADIN/themes/runo/datefield/img/prevyear.png b/themes/src/main/themes/VAADIN/themes/runo/datefield/img/prevyear.png
index f174713092..f174713092 100644
--- a/WebContent/VAADIN/themes/runo/datefield/img/prevyear.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/datefield/img/prevyear.png
diff --git a/WebContent/VAADIN/themes/runo/datefield/img/selected-bg.png b/themes/src/main/themes/VAADIN/themes/runo/datefield/img/selected-bg.png
index 799915ab8f..799915ab8f 100644
--- a/WebContent/VAADIN/themes/runo/datefield/img/selected-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/datefield/img/selected-bg.png
diff --git a/WebContent/VAADIN/themes/runo/favicon.ico b/themes/src/main/themes/VAADIN/themes/runo/favicon.ico
index 1f81f0de76..1f81f0de76 100644
--- a/WebContent/VAADIN/themes/runo/favicon.ico
+++ b/themes/src/main/themes/VAADIN/themes/runo/favicon.ico
diff --git a/WebContent/VAADIN/themes/runo/formlayout/formlayout.scss b/themes/src/main/themes/VAADIN/themes/runo/formlayout/formlayout.scss
index 59151feeb7..59151feeb7 100644
--- a/WebContent/VAADIN/themes/runo/formlayout/formlayout.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/formlayout/formlayout.scss
diff --git a/WebContent/VAADIN/themes/runo/grid/grid.scss b/themes/src/main/themes/VAADIN/themes/runo/grid/grid.scss
index 87fe88b9a2..87fe88b9a2 100644
--- a/WebContent/VAADIN/themes/runo/grid/grid.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/grid/grid.scss
diff --git a/WebContent/VAADIN/themes/runo/grid/img/header-bg.png b/themes/src/main/themes/VAADIN/themes/runo/grid/img/header-bg.png
index 275fbc4382..275fbc4382 100644
--- a/WebContent/VAADIN/themes/runo/grid/img/header-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/grid/img/header-bg.png
diff --git a/WebContent/VAADIN/themes/runo/grid/img/resizer-bg.png b/themes/src/main/themes/VAADIN/themes/runo/grid/img/resizer-bg.png
index d9089775cb..d9089775cb 100644
--- a/WebContent/VAADIN/themes/runo/grid/img/resizer-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/grid/img/resizer-bg.png
diff --git a/WebContent/VAADIN/themes/runo/grid/img/sort-asc.png b/themes/src/main/themes/VAADIN/themes/runo/grid/img/sort-asc.png
index 44e17d5446..44e17d5446 100644
--- a/WebContent/VAADIN/themes/runo/grid/img/sort-asc.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/grid/img/sort-asc.png
diff --git a/WebContent/VAADIN/themes/runo/grid/img/sort-desc.png b/themes/src/main/themes/VAADIN/themes/runo/grid/img/sort-desc.png
index 35fd0595f8..35fd0595f8 100644
--- a/WebContent/VAADIN/themes/runo/grid/img/sort-desc.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/grid/img/sort-desc.png
diff --git a/WebContent/VAADIN/themes/runo/gridlayout/gridlayout.scss b/themes/src/main/themes/VAADIN/themes/runo/gridlayout/gridlayout.scss
index e3fb628a6b..e3fb628a6b 100644
--- a/WebContent/VAADIN/themes/runo/gridlayout/gridlayout.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/gridlayout/gridlayout.scss
diff --git a/WebContent/VAADIN/themes/runo/icons/16/arrow-down.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-down.png
index ffd0ee50a5..ffd0ee50a5 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/arrow-down.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-down.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/arrow-left.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-left.png
index 27dd25110d..27dd25110d 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/arrow-left.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-left.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/arrow-right.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-right.png
index 69bf88da8a..69bf88da8a 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/arrow-right.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-right.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/arrow-up.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-up.png
index 76e5b43e08..76e5b43e08 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/arrow-up.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-up.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/attention.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/attention.png
index 350de56aa5..350de56aa5 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/attention.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/attention.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/calendar.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/calendar.png
index 7717a5e220..7717a5e220 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/calendar.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/calendar.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/cancel.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/cancel.png
index 19a0783733..19a0783733 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/cancel.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/cancel.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/document-add.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-add.png
index d84e349526..d84e349526 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/document-add.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-add.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/document-delete.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-delete.png
index cc3172224a..cc3172224a 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/document-delete.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-delete.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/document-doc.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-doc.png
index 7def77428a..7def77428a 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/document-doc.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-doc.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/document-image.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-image.png
index 8a1bf253e8..8a1bf253e8 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/document-image.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-image.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/document-pdf.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-pdf.png
index b58ccf7567..b58ccf7567 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/document-pdf.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-pdf.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/document-ppt.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-ppt.png
index b60f429be2..b60f429be2 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/document-ppt.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-ppt.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/document-txt.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-txt.png
index 05659b19b2..05659b19b2 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/document-txt.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-txt.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/document-web.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-web.png
index fcfd8685f0..fcfd8685f0 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/document-web.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-web.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/document-xsl.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-xsl.png
index 571823847f..571823847f 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/document-xsl.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-xsl.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/document.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/document.png
index a2bab1bb0b..a2bab1bb0b 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/document.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/document.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/email-reply.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/email-reply.png
index be7fd2244d..be7fd2244d 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/email-reply.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/email-reply.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/email-send.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/email-send.png
index 0ef7a1c398..0ef7a1c398 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/email-send.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/email-send.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/email.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/email.png
index 68d6c93465..68d6c93465 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/email.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/email.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/error.gif b/themes/src/main/themes/VAADIN/themes/runo/icons/16/error.gif
index c9582b2c28..c9582b2c28 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/error.gif
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/error.gif
diff --git a/WebContent/VAADIN/themes/runo/icons/16/error.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/error.png
index 0141e4dfc3..0141e4dfc3 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/error.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/error.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/folder-add.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/folder-add.png
index 48aa7c9220..48aa7c9220 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/folder-add.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/folder-add.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/folder-delete.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/folder-delete.png
index 7cc389d6b2..7cc389d6b2 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/folder-delete.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/folder-delete.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/folder.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/folder.png
index f4fec377c6..f4fec377c6 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/folder.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/folder.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/globe.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/globe.png
index ea4034c149..ea4034c149 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/globe.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/globe.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/help.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/help.png
index d82a8852bf..d82a8852bf 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/help.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/help.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/lock.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/lock.png
index 29f1023613..29f1023613 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/lock.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/lock.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/note.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/note.png
index efafae5570..efafae5570 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/note.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/note.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/ok.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/ok.png
index 89591faef2..89591faef2 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/ok.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/ok.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/reload.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/reload.png
index 2c54836bff..2c54836bff 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/reload.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/reload.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/settings.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/settings.png
index 019f0df663..019f0df663 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/settings.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/settings.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/trash-full.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/trash-full.png
index 7d790e6c9a..7d790e6c9a 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/trash-full.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/trash-full.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/trash.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/trash.png
index 8875ae322e..8875ae322e 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/trash.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/trash.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/user.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/user.png
index 522f864884..522f864884 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/user.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/user.png
diff --git a/WebContent/VAADIN/themes/runo/icons/16/users.png b/themes/src/main/themes/VAADIN/themes/runo/icons/16/users.png
index 01f2a1251c..01f2a1251c 100644
--- a/WebContent/VAADIN/themes/runo/icons/16/users.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/16/users.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/arrow-down.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-down.png
index 20c33b70fb..20c33b70fb 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/arrow-down.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-down.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/arrow-left.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-left.png
index ed2aae2cb0..ed2aae2cb0 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/arrow-left.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-left.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/arrow-right.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-right.png
index bd7707ec8a..bd7707ec8a 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/arrow-right.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-right.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/arrow-up.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-up.png
index 01c1a8ec83..01c1a8ec83 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/arrow-up.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-up.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/attention.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/attention.png
index 6b00733567..6b00733567 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/attention.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/attention.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/calendar.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/calendar.png
index 789ad9031c..789ad9031c 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/calendar.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/calendar.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/cancel.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/cancel.png
index 725240d558..725240d558 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/cancel.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/cancel.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/document-add.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-add.png
index 26bca0d112..26bca0d112 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/document-add.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-add.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/document-delete.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-delete.png
index 43e9a43e5b..43e9a43e5b 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/document-delete.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-delete.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/document-doc.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-doc.png
index 8df20cfdcf..8df20cfdcf 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/document-doc.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-doc.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/document-edit.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-edit.png
index 1d17383ca7..1d17383ca7 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/document-edit.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-edit.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/document-image.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-image.png
index 88c78665b8..88c78665b8 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/document-image.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-image.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/document-pdf.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-pdf.png
index 048a02fddf..048a02fddf 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/document-pdf.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-pdf.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/document-ppt.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-ppt.png
index 7fd7385cbd..7fd7385cbd 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/document-ppt.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-ppt.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/document-txt.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-txt.png
index 25264732c6..25264732c6 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/document-txt.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-txt.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/document-web.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-web.png
index 72fd847ac3..72fd847ac3 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/document-web.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-web.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/document-xsl.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-xsl.png
index 2ff4607ad3..2ff4607ad3 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/document-xsl.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-xsl.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/document.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document.png
index 1a38dcc304..1a38dcc304 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/document.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/document.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/email-reply.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/email-reply.png
index fd0203f768..fd0203f768 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/email-reply.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/email-reply.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/email-send.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/email-send.png
index dc34ac694d..dc34ac694d 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/email-send.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/email-send.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/email.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/email.png
index bef86e6cbb..bef86e6cbb 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/email.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/email.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/folder-add.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/folder-add.png
index e0b78d6e1d..e0b78d6e1d 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/folder-add.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/folder-add.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/folder-delete.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/folder-delete.png
index 8e3c4a404c..8e3c4a404c 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/folder-delete.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/folder-delete.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/folder.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/folder.png
index 7577a17ac3..7577a17ac3 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/folder.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/folder.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/globe.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/globe.png
index 6c7d469ba2..6c7d469ba2 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/globe.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/globe.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/help.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/help.png
index 218910c98d..218910c98d 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/help.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/help.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/lock.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/lock.png
index 4fc16565f0..4fc16565f0 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/lock.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/lock.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/note.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/note.png
index e7e035dc8c..e7e035dc8c 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/note.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/note.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/ok.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/ok.png
index ac0438828c..ac0438828c 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/ok.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/ok.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/reload.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/reload.png
index c3556ec890..c3556ec890 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/reload.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/reload.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/settings.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/settings.png
index 92eda74c54..92eda74c54 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/settings.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/settings.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/trash-full.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/trash-full.png
index a9707e76d6..a9707e76d6 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/trash-full.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/trash-full.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/trash.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/trash.png
index 6eaac86166..6eaac86166 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/trash.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/trash.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/user.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/user.png
index ebb5a7f9f8..ebb5a7f9f8 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/user.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/user.png
diff --git a/WebContent/VAADIN/themes/runo/icons/32/users.png b/themes/src/main/themes/VAADIN/themes/runo/icons/32/users.png
index af225a9e46..af225a9e46 100644
--- a/WebContent/VAADIN/themes/runo/icons/32/users.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/32/users.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/arrow-down.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-down.png
index bdf5d0474e..bdf5d0474e 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/arrow-down.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-down.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/arrow-left.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-left.png
index b90ed88840..b90ed88840 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/arrow-left.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-left.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/arrow-right.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-right.png
index 6331a5ddf3..6331a5ddf3 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/arrow-right.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-right.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/arrow-up.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-up.png
index 821fbe348f..821fbe348f 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/arrow-up.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-up.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/attention.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/attention.png
index 77265e48ee..77265e48ee 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/attention.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/attention.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/calendar.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/calendar.png
index f13fbd6efb..f13fbd6efb 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/calendar.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/calendar.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/cancel.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/cancel.png
index 1d1a719a6c..1d1a719a6c 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/cancel.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/cancel.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/document-add.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-add.png
index acdcb06123..acdcb06123 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/document-add.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-add.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/document-delete.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-delete.png
index 2a46863b7f..2a46863b7f 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/document-delete.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-delete.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/document-doc.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-doc.png
index 455c1f15bd..455c1f15bd 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/document-doc.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-doc.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/document-edit.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-edit.png
index 6af96c9b77..6af96c9b77 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/document-edit.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-edit.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/document-image.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-image.png
index 079978e850..079978e850 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/document-image.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-image.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/document-pdf.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-pdf.png
index cb6bc59675..cb6bc59675 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/document-pdf.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-pdf.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/document-ppt.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-ppt.png
index dd501bfbc9..dd501bfbc9 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/document-ppt.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-ppt.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/document-txt.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-txt.png
index e64f746bd9..e64f746bd9 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/document-txt.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-txt.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/document-web.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-web.png
index 9d81eb5702..9d81eb5702 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/document-web.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-web.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/document-xsl.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-xsl.png
index 6008085a34..6008085a34 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/document-xsl.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-xsl.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/document.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document.png
index 224de0bc84..224de0bc84 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/document.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/document.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/email-reply.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/email-reply.png
index 2c6f7b690d..2c6f7b690d 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/email-reply.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/email-reply.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/email-send.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/email-send.png
index 9ec7198853..9ec7198853 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/email-send.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/email-send.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/email.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/email.png
index e11245b2f5..e11245b2f5 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/email.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/email.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/folder-add.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/folder-add.png
index 111318cc3c..111318cc3c 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/folder-add.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/folder-add.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/folder-delete.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/folder-delete.png
index d249983eac..d249983eac 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/folder-delete.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/folder-delete.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/folder.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/folder.png
index edb7b9f786..edb7b9f786 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/folder.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/folder.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/globe.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/globe.png
index 1786635b45..1786635b45 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/globe.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/globe.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/help.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/help.png
index a66e8aafa6..a66e8aafa6 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/help.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/help.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/lock.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/lock.png
index deaf7db0a4..deaf7db0a4 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/lock.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/lock.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/note.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/note.png
index 1383847ed1..1383847ed1 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/note.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/note.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/ok.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/ok.png
index dc0d00c38b..dc0d00c38b 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/ok.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/ok.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/reload.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/reload.png
index b91f51c67f..b91f51c67f 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/reload.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/reload.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/settings.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/settings.png
index 1c9b794ab0..1c9b794ab0 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/settings.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/settings.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/trash-full.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/trash-full.png
index 81d060e509..81d060e509 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/trash-full.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/trash-full.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/trash.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/trash.png
index 41ef761061..41ef761061 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/trash.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/trash.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/user.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/user.png
index 60d6c6e1b3..60d6c6e1b3 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/user.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/user.png
diff --git a/WebContent/VAADIN/themes/runo/icons/64/users.png b/themes/src/main/themes/VAADIN/themes/runo/icons/64/users.png
index 3a42c17790..3a42c17790 100644
--- a/WebContent/VAADIN/themes/runo/icons/64/users.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/64/users.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/arrow-down.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-down.png
index ffd0ee50a5..ffd0ee50a5 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/arrow-down.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-down.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/arrow-left.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-left.png
index 27dd25110d..27dd25110d 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/arrow-left.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-left.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/arrow-right.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-right.png
index 69bf88da8a..69bf88da8a 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/arrow-right.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-right.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/arrow-up.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-up.png
index 76e5b43e08..76e5b43e08 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/arrow-up.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-up.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/attention.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/attention.png
index 350de56aa5..350de56aa5 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/attention.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/attention.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/calendar.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/calendar.png
index 7717a5e220..7717a5e220 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/calendar.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/calendar.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/cancel.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/cancel.png
index 19a0783733..19a0783733 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/cancel.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/cancel.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/document-add.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-add.png
index d84e349526..d84e349526 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/document-add.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-add.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/document-delete.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-delete.png
index cc3172224a..cc3172224a 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/document-delete.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-delete.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/document-doc.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-doc.png
index 7def77428a..7def77428a 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/document-doc.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-doc.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/document-image.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-image.png
index 8a1bf253e8..8a1bf253e8 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/document-image.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-image.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/document-pdf.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-pdf.png
index b58ccf7567..b58ccf7567 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/document-pdf.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-pdf.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/document-ppt.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-ppt.png
index b60f429be2..b60f429be2 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/document-ppt.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-ppt.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/document-txt.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-txt.png
index 05659b19b2..05659b19b2 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/document-txt.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-txt.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/document-web.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-web.png
index fcfd8685f0..fcfd8685f0 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/document-web.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-web.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/document-xsl.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-xsl.png
index 571823847f..571823847f 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/document-xsl.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-xsl.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/document.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document.png
index a2bab1bb0b..a2bab1bb0b 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/document.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/email-reply.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/email-reply.png
index be7fd2244d..be7fd2244d 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/email-reply.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/email-reply.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/email-send.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/email-send.png
index 0ef7a1c398..0ef7a1c398 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/email-send.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/email-send.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/email.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/email.png
index 68d6c93465..68d6c93465 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/email.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/email.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/error.gif b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/error.gif
index c9582b2c28..c9582b2c28 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/error.gif
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/error.gif
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/error.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/error.png
index 0141e4dfc3..0141e4dfc3 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/error.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/error.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/folder-add.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/folder-add.png
index 48aa7c9220..48aa7c9220 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/folder-add.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/folder-add.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/folder-delete.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/folder-delete.png
index 7cc389d6b2..7cc389d6b2 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/folder-delete.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/folder-delete.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/folder.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/folder.png
index f4fec377c6..f4fec377c6 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/folder.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/folder.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/globe.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/globe.png
index ea4034c149..ea4034c149 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/globe.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/globe.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/help.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/help.png
index d82a8852bf..d82a8852bf 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/help.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/help.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/lock.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/lock.png
index 29f1023613..29f1023613 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/lock.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/lock.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/note.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/note.png
index efafae5570..efafae5570 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/note.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/note.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/ok.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/ok.png
index 89591faef2..89591faef2 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/ok.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/ok.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/reload.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/reload.png
index 2c54836bff..2c54836bff 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/reload.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/reload.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/settings.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/settings.png
index 019f0df663..019f0df663 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/settings.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/settings.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/trash-full.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/trash-full.png
index 7d790e6c9a..7d790e6c9a 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/trash-full.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/trash-full.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/trash.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/trash.png
index 8875ae322e..8875ae322e 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/trash.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/trash.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/user.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/user.png
index 522f864884..522f864884 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/user.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/user.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons16/users.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/users.png
index 01f2a1251c..01f2a1251c 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons16/users.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/users.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/arrow-down.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-down.png
index 20c33b70fb..20c33b70fb 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/arrow-down.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-down.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/arrow-left.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-left.png
index ed2aae2cb0..ed2aae2cb0 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/arrow-left.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-left.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/arrow-right.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-right.png
index bd7707ec8a..bd7707ec8a 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/arrow-right.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-right.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/arrow-up.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-up.png
index 01c1a8ec83..01c1a8ec83 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/arrow-up.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-up.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/attention.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/attention.png
index 6b00733567..6b00733567 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/attention.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/attention.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/calendar.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/calendar.png
index 789ad9031c..789ad9031c 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/calendar.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/calendar.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/cancel.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/cancel.png
index 725240d558..725240d558 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/cancel.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/cancel.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/document-add.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-add.png
index 26bca0d112..26bca0d112 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/document-add.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-add.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/document-delete.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-delete.png
index 43e9a43e5b..43e9a43e5b 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/document-delete.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-delete.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/document-doc.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-doc.png
index 8df20cfdcf..8df20cfdcf 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/document-doc.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-doc.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/document-edit.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-edit.png
index 1d17383ca7..1d17383ca7 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/document-edit.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-edit.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/document-image.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-image.png
index 88c78665b8..88c78665b8 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/document-image.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-image.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/document-pdf.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-pdf.png
index 048a02fddf..048a02fddf 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/document-pdf.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-pdf.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/document-ppt.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-ppt.png
index 7fd7385cbd..7fd7385cbd 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/document-ppt.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-ppt.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/document-txt.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-txt.png
index 25264732c6..25264732c6 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/document-txt.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-txt.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/document-web.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-web.png
index 72fd847ac3..72fd847ac3 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/document-web.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-web.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/document-xsl.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-xsl.png
index 2ff4607ad3..2ff4607ad3 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/document-xsl.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-xsl.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/document.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document.png
index 1a38dcc304..1a38dcc304 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/document.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/email-reply.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/email-reply.png
index fd0203f768..fd0203f768 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/email-reply.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/email-reply.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/email-send.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/email-send.png
index dc34ac694d..dc34ac694d 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/email-send.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/email-send.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/email.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/email.png
index bef86e6cbb..bef86e6cbb 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/email.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/email.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/folder-add.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/folder-add.png
index e0b78d6e1d..e0b78d6e1d 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/folder-add.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/folder-add.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/folder-delete.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/folder-delete.png
index 8e3c4a404c..8e3c4a404c 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/folder-delete.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/folder-delete.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/folder.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/folder.png
index 7577a17ac3..7577a17ac3 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/folder.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/folder.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/globe.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/globe.png
index 6c7d469ba2..6c7d469ba2 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/globe.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/globe.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/help.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/help.png
index 218910c98d..218910c98d 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/help.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/help.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/lock.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/lock.png
index 4fc16565f0..4fc16565f0 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/lock.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/lock.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/note.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/note.png
index e7e035dc8c..e7e035dc8c 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/note.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/note.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/ok.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/ok.png
index ac0438828c..ac0438828c 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/ok.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/ok.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/reload.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/reload.png
index c3556ec890..c3556ec890 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/reload.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/reload.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/settings.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/settings.png
index 92eda74c54..92eda74c54 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/settings.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/settings.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/trash-full.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/trash-full.png
index a9707e76d6..a9707e76d6 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/trash-full.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/trash-full.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/trash.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/trash.png
index 6eaac86166..6eaac86166 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/trash.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/trash.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/user.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/user.png
index ebb5a7f9f8..ebb5a7f9f8 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/user.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/user.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons32/users.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/users.png
index af225a9e46..af225a9e46 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons32/users.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/users.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/arrow-down.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-down.png
index bdf5d0474e..bdf5d0474e 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/arrow-down.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-down.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/arrow-left.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-left.png
index b90ed88840..b90ed88840 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/arrow-left.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-left.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/arrow-right.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-right.png
index 6331a5ddf3..6331a5ddf3 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/arrow-right.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-right.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/arrow-up.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-up.png
index 821fbe348f..821fbe348f 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/arrow-up.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-up.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/attention.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/attention.png
index 77265e48ee..77265e48ee 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/attention.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/attention.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/calendar.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/calendar.png
index f13fbd6efb..f13fbd6efb 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/calendar.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/calendar.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/cancel.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/cancel.png
index 1d1a719a6c..1d1a719a6c 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/cancel.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/cancel.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/document-add.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-add.png
index acdcb06123..acdcb06123 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/document-add.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-add.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/document-delete.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-delete.png
index 2a46863b7f..2a46863b7f 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/document-delete.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-delete.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/document-doc.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-doc.png
index 455c1f15bd..455c1f15bd 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/document-doc.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-doc.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/document-edit.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-edit.png
index 6af96c9b77..6af96c9b77 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/document-edit.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-edit.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/document-image.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-image.png
index 079978e850..079978e850 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/document-image.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-image.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/document-pdf.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-pdf.png
index cb6bc59675..cb6bc59675 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/document-pdf.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-pdf.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/document-ppt.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-ppt.png
index dd501bfbc9..dd501bfbc9 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/document-ppt.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-ppt.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/document-txt.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-txt.png
index e64f746bd9..e64f746bd9 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/document-txt.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-txt.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/document-web.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-web.png
index 9d81eb5702..9d81eb5702 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/document-web.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-web.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/document-xsl.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-xsl.png
index 6008085a34..6008085a34 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/document-xsl.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-xsl.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/document.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document.png
index 224de0bc84..224de0bc84 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/document.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/email-reply.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/email-reply.png
index 2c6f7b690d..2c6f7b690d 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/email-reply.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/email-reply.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/email-send.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/email-send.png
index 9ec7198853..9ec7198853 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/email-send.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/email-send.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/email.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/email.png
index e11245b2f5..e11245b2f5 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/email.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/email.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/folder-add.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/folder-add.png
index 111318cc3c..111318cc3c 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/folder-add.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/folder-add.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/folder-delete.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/folder-delete.png
index d249983eac..d249983eac 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/folder-delete.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/folder-delete.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/folder.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/folder.png
index edb7b9f786..edb7b9f786 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/folder.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/folder.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/globe.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/globe.png
index 1786635b45..1786635b45 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/globe.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/globe.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/help.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/help.png
index a66e8aafa6..a66e8aafa6 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/help.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/help.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/lock.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/lock.png
index deaf7db0a4..deaf7db0a4 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/lock.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/lock.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/note.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/note.png
index 1383847ed1..1383847ed1 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/note.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/note.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/ok.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/ok.png
index dc0d00c38b..dc0d00c38b 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/ok.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/ok.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/reload.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/reload.png
index b91f51c67f..b91f51c67f 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/reload.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/reload.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/settings.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/settings.png
index 1c9b794ab0..1c9b794ab0 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/settings.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/settings.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/trash-full.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/trash-full.png
index 81d060e509..81d060e509 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/trash-full.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/trash-full.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/trash.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/trash.png
index 41ef761061..41ef761061 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/trash.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/trash.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/user.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/user.png
index 60d6c6e1b3..60d6c6e1b3 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/user.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/user.png
diff --git a/WebContent/VAADIN/themes/runo/icons/icons64/users.png b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/users.png
index 3a42c17790..3a42c17790 100644
--- a/WebContent/VAADIN/themes/runo/icons/icons64/users.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/users.png
diff --git a/WebContent/VAADIN/themes/runo/inlinedatefield/inlinedatefield.scss b/themes/src/main/themes/VAADIN/themes/runo/inlinedatefield/inlinedatefield.scss
index ff0d5f5bb1..ff0d5f5bb1 100644
--- a/WebContent/VAADIN/themes/runo/inlinedatefield/inlinedatefield.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/inlinedatefield/inlinedatefield.scss
diff --git a/WebContent/VAADIN/themes/runo/label/label.scss b/themes/src/main/themes/VAADIN/themes/runo/label/label.scss
index 50792d61a1..50792d61a1 100644
--- a/WebContent/VAADIN/themes/runo/label/label.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/label/label.scss
diff --git a/WebContent/VAADIN/themes/runo/legacy-styles.scss b/themes/src/main/themes/VAADIN/themes/runo/legacy-styles.scss
index 29ccb22aa5..29ccb22aa5 100644
--- a/WebContent/VAADIN/themes/runo/legacy-styles.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/legacy-styles.scss
diff --git a/WebContent/VAADIN/themes/runo/link/link.scss b/themes/src/main/themes/VAADIN/themes/runo/link/link.scss
index 6970c6b2d8..6970c6b2d8 100644
--- a/WebContent/VAADIN/themes/runo/link/link.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/link/link.scss
diff --git a/WebContent/VAADIN/themes/runo/menubar/menubar.scss b/themes/src/main/themes/VAADIN/themes/runo/menubar/menubar.scss
index d4cb22794b..d4cb22794b 100644
--- a/WebContent/VAADIN/themes/runo/menubar/menubar.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/menubar/menubar.scss
diff --git a/WebContent/VAADIN/themes/runo/notification/img/close-error.png b/themes/src/main/themes/VAADIN/themes/runo/notification/img/close-error.png
index f52c922111..f52c922111 100644
--- a/WebContent/VAADIN/themes/runo/notification/img/close-error.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/notification/img/close-error.png
diff --git a/WebContent/VAADIN/themes/runo/notification/notification.scss b/themes/src/main/themes/VAADIN/themes/runo/notification/notification.scss
index 1bf77a68ba..1bf77a68ba 100644
--- a/WebContent/VAADIN/themes/runo/notification/notification.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/notification/notification.scss
diff --git a/WebContent/VAADIN/themes/runo/orderedlayout/orderedlayout.scss b/themes/src/main/themes/VAADIN/themes/runo/orderedlayout/orderedlayout.scss
index d01371599c..d01371599c 100644
--- a/WebContent/VAADIN/themes/runo/orderedlayout/orderedlayout.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/orderedlayout/orderedlayout.scss
diff --git a/WebContent/VAADIN/themes/runo/panel/img/bottom-left.png b/themes/src/main/themes/VAADIN/themes/runo/panel/img/bottom-left.png
index 9306fac21e..9306fac21e 100644
--- a/WebContent/VAADIN/themes/runo/panel/img/bottom-left.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/panel/img/bottom-left.png
diff --git a/WebContent/VAADIN/themes/runo/panel/img/bottom-right.png b/themes/src/main/themes/VAADIN/themes/runo/panel/img/bottom-right.png
index 08f53ff470..08f53ff470 100644
--- a/WebContent/VAADIN/themes/runo/panel/img/bottom-right.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/panel/img/bottom-right.png
diff --git a/WebContent/VAADIN/themes/runo/panel/img/top-left.png b/themes/src/main/themes/VAADIN/themes/runo/panel/img/top-left.png
index 2d59a76c06..2d59a76c06 100644
--- a/WebContent/VAADIN/themes/runo/panel/img/top-left.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/panel/img/top-left.png
diff --git a/WebContent/VAADIN/themes/runo/panel/img/top-right.png b/themes/src/main/themes/VAADIN/themes/runo/panel/img/top-right.png
index e981d430ce..e981d430ce 100644
--- a/WebContent/VAADIN/themes/runo/panel/img/top-right.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/panel/img/top-right.png
diff --git a/WebContent/VAADIN/themes/runo/panel/panel.scss b/themes/src/main/themes/VAADIN/themes/runo/panel/panel.scss
index 66fb751d88..66fb751d88 100644
--- a/WebContent/VAADIN/themes/runo/panel/panel.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/panel/panel.scss
diff --git a/WebContent/VAADIN/themes/runo/popupview/popupview.scss b/themes/src/main/themes/VAADIN/themes/runo/popupview/popupview.scss
index e5bc664fdd..e5bc664fdd 100644
--- a/WebContent/VAADIN/themes/runo/popupview/popupview.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/popupview/popupview.scss
diff --git a/WebContent/VAADIN/themes/runo/progressindicator/img/base-static.gif b/themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/base-static.gif
index 474b684196..474b684196 100644
--- a/WebContent/VAADIN/themes/runo/progressindicator/img/base-static.gif
+++ b/themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/base-static.gif
diff --git a/WebContent/VAADIN/themes/runo/progressindicator/img/base.gif b/themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/base.gif
index 6c6f15ef9e..6c6f15ef9e 100644
--- a/WebContent/VAADIN/themes/runo/progressindicator/img/base.gif
+++ b/themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/base.gif
diff --git a/WebContent/VAADIN/themes/runo/progressindicator/img/disabled.gif b/themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/disabled.gif
index 7a64d034b2..7a64d034b2 100644
--- a/WebContent/VAADIN/themes/runo/progressindicator/img/disabled.gif
+++ b/themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/disabled.gif
diff --git a/WebContent/VAADIN/themes/runo/progressindicator/img/progress.png b/themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/progress.png
index c1aca57369..c1aca57369 100644
--- a/WebContent/VAADIN/themes/runo/progressindicator/img/progress.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/progress.png
diff --git a/WebContent/VAADIN/themes/runo/progressindicator/progressindicator.scss b/themes/src/main/themes/VAADIN/themes/runo/progressindicator/progressindicator.scss
index 432123cf1f..432123cf1f 100644
--- a/WebContent/VAADIN/themes/runo/progressindicator/progressindicator.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/progressindicator/progressindicator.scss
diff --git a/WebContent/VAADIN/themes/runo/runo.scss b/themes/src/main/themes/VAADIN/themes/runo/runo.scss
index d481476d4c..d481476d4c 100644
--- a/WebContent/VAADIN/themes/runo/runo.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/runo.scss
diff --git a/WebContent/VAADIN/themes/runo/select/img/arrow-down.png b/themes/src/main/themes/VAADIN/themes/runo/select/img/arrow-down.png
index ee795fd069..ee795fd069 100644
--- a/WebContent/VAADIN/themes/runo/select/img/arrow-down.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/select/img/arrow-down.png
diff --git a/WebContent/VAADIN/themes/runo/select/img/arrow-up.png b/themes/src/main/themes/VAADIN/themes/runo/select/img/arrow-up.png
index 055ad61ef1..055ad61ef1 100644
--- a/WebContent/VAADIN/themes/runo/select/img/arrow-up.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/select/img/arrow-up.png
diff --git a/WebContent/VAADIN/themes/runo/select/img/bg-center-filter-error.png b/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-center-filter-error.png
index 72f74f16ab..72f74f16ab 100644
--- a/WebContent/VAADIN/themes/runo/select/img/bg-center-filter-error.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-center-filter-error.png
diff --git a/WebContent/VAADIN/themes/runo/select/img/bg-center-filter.png b/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-center-filter.png
index 03e7384343..03e7384343 100644
--- a/WebContent/VAADIN/themes/runo/select/img/bg-center-filter.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-center-filter.png
diff --git a/WebContent/VAADIN/themes/runo/select/img/bg-left-filter-error.png b/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-left-filter-error.png
index da4a4e4cc9..da4a4e4cc9 100644
--- a/WebContent/VAADIN/themes/runo/select/img/bg-left-filter-error.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-left-filter-error.png
diff --git a/WebContent/VAADIN/themes/runo/select/img/bg-left-filter.png b/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-left-filter.png
index 4a1d2a2966..4a1d2a2966 100644
--- a/WebContent/VAADIN/themes/runo/select/img/bg-left-filter.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-left-filter.png
diff --git a/WebContent/VAADIN/themes/runo/select/img/bg-right-filter-error.png b/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-right-filter-error.png
index 72ed791760..72ed791760 100644
--- a/WebContent/VAADIN/themes/runo/select/img/bg-right-filter-error.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-right-filter-error.png
diff --git a/WebContent/VAADIN/themes/runo/select/img/bg-right-filter.png b/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-right-filter.png
index 04cb8e4089..04cb8e4089 100644
--- a/WebContent/VAADIN/themes/runo/select/img/bg-right-filter.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-right-filter.png
diff --git a/WebContent/VAADIN/themes/runo/select/img/button-bg.png b/themes/src/main/themes/VAADIN/themes/runo/select/img/button-bg.png
index 9653ed949b..9653ed949b 100644
--- a/WebContent/VAADIN/themes/runo/select/img/button-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/select/img/button-bg.png
diff --git a/WebContent/VAADIN/themes/runo/select/select.scss b/themes/src/main/themes/VAADIN/themes/runo/select/select.scss
index 39eb0c9bde..39eb0c9bde 100644
--- a/WebContent/VAADIN/themes/runo/select/select.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/select/select.scss
diff --git a/WebContent/VAADIN/themes/runo/shadow/img/bottom-left.png b/themes/src/main/themes/VAADIN/themes/runo/shadow/img/bottom-left.png
index b119a13119..b119a13119 100644
--- a/WebContent/VAADIN/themes/runo/shadow/img/bottom-left.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/shadow/img/bottom-left.png
diff --git a/WebContent/VAADIN/themes/runo/shadow/img/bottom-right.png b/themes/src/main/themes/VAADIN/themes/runo/shadow/img/bottom-right.png
index 50aaa3bedc..50aaa3bedc 100644
--- a/WebContent/VAADIN/themes/runo/shadow/img/bottom-right.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/shadow/img/bottom-right.png
diff --git a/WebContent/VAADIN/themes/runo/shadow/img/bottom.png b/themes/src/main/themes/VAADIN/themes/runo/shadow/img/bottom.png
index 96af859986..96af859986 100644
--- a/WebContent/VAADIN/themes/runo/shadow/img/bottom.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/shadow/img/bottom.png
diff --git a/WebContent/VAADIN/themes/runo/shadow/img/center.png b/themes/src/main/themes/VAADIN/themes/runo/shadow/img/center.png
index d6fb99a889..d6fb99a889 100644
--- a/WebContent/VAADIN/themes/runo/shadow/img/center.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/shadow/img/center.png
diff --git a/WebContent/VAADIN/themes/runo/shadow/img/left.png b/themes/src/main/themes/VAADIN/themes/runo/shadow/img/left.png
index 4c3611c842..4c3611c842 100644
--- a/WebContent/VAADIN/themes/runo/shadow/img/left.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/shadow/img/left.png
diff --git a/WebContent/VAADIN/themes/runo/shadow/img/right.png b/themes/src/main/themes/VAADIN/themes/runo/shadow/img/right.png
index 34a46e7b13..34a46e7b13 100644
--- a/WebContent/VAADIN/themes/runo/shadow/img/right.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/shadow/img/right.png
diff --git a/WebContent/VAADIN/themes/runo/shadow/img/top-left.png b/themes/src/main/themes/VAADIN/themes/runo/shadow/img/top-left.png
index 27cf4d3f61..27cf4d3f61 100644
--- a/WebContent/VAADIN/themes/runo/shadow/img/top-left.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/shadow/img/top-left.png
diff --git a/WebContent/VAADIN/themes/runo/shadow/img/top-right.png b/themes/src/main/themes/VAADIN/themes/runo/shadow/img/top-right.png
index 7f187ca556..7f187ca556 100644
--- a/WebContent/VAADIN/themes/runo/shadow/img/top-right.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/shadow/img/top-right.png
diff --git a/WebContent/VAADIN/themes/runo/shadow/img/top.png b/themes/src/main/themes/VAADIN/themes/runo/shadow/img/top.png
index b654d78da9..b654d78da9 100644
--- a/WebContent/VAADIN/themes/runo/shadow/img/top.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/shadow/img/top.png
diff --git a/WebContent/VAADIN/themes/runo/shadow/shadow.scss b/themes/src/main/themes/VAADIN/themes/runo/shadow/shadow.scss
index f24cab1bd2..f24cab1bd2 100644
--- a/WebContent/VAADIN/themes/runo/shadow/shadow.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/shadow/shadow.scss
diff --git a/WebContent/VAADIN/themes/runo/slider/img/handle-horizontal.png b/themes/src/main/themes/VAADIN/themes/runo/slider/img/handle-horizontal.png
index 620b86f1da..620b86f1da 100644
--- a/WebContent/VAADIN/themes/runo/slider/img/handle-horizontal.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/slider/img/handle-horizontal.png
diff --git a/WebContent/VAADIN/themes/runo/slider/img/handle-vertical.png b/themes/src/main/themes/VAADIN/themes/runo/slider/img/handle-vertical.png
index b7f63b91b7..b7f63b91b7 100644
--- a/WebContent/VAADIN/themes/runo/slider/img/handle-vertical.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/slider/img/handle-vertical.png
diff --git a/WebContent/VAADIN/themes/runo/slider/slider.scss b/themes/src/main/themes/VAADIN/themes/runo/slider/slider.scss
index aa8cbe3e7a..aa8cbe3e7a 100644
--- a/WebContent/VAADIN/themes/runo/slider/slider.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/slider/slider.scss
diff --git a/WebContent/VAADIN/themes/runo/splitpanel/img/bg_hor.png b/themes/src/main/themes/VAADIN/themes/runo/splitpanel/img/bg_hor.png
index f50f81aa35..f50f81aa35 100644
--- a/WebContent/VAADIN/themes/runo/splitpanel/img/bg_hor.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/splitpanel/img/bg_hor.png
diff --git a/WebContent/VAADIN/themes/runo/splitpanel/img/bg_ver.png b/themes/src/main/themes/VAADIN/themes/runo/splitpanel/img/bg_ver.png
index 6846e47096..6846e47096 100644
--- a/WebContent/VAADIN/themes/runo/splitpanel/img/bg_ver.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/splitpanel/img/bg_ver.png
diff --git a/WebContent/VAADIN/themes/runo/splitpanel/splitpanel.scss b/themes/src/main/themes/VAADIN/themes/runo/splitpanel/splitpanel.scss
index 84b8f5cd44..84b8f5cd44 100644
--- a/WebContent/VAADIN/themes/runo/splitpanel/splitpanel.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/splitpanel/splitpanel.scss
diff --git a/WebContent/VAADIN/themes/runo/styles.scss b/themes/src/main/themes/VAADIN/themes/runo/styles.scss
index cfcb8bfa78..cfcb8bfa78 100644
--- a/WebContent/VAADIN/themes/runo/styles.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/styles.scss
diff --git a/WebContent/VAADIN/themes/runo/table/img/check.gif b/themes/src/main/themes/VAADIN/themes/runo/table/img/check.gif
index 0a89195168..0a89195168 100644
--- a/WebContent/VAADIN/themes/runo/table/img/check.gif
+++ b/themes/src/main/themes/VAADIN/themes/runo/table/img/check.gif
diff --git a/WebContent/VAADIN/themes/runo/table/img/colsel.png b/themes/src/main/themes/VAADIN/themes/runo/table/img/colsel.png
index 7cf5abc8b2..7cf5abc8b2 100644
--- a/WebContent/VAADIN/themes/runo/table/img/colsel.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/table/img/colsel.png
diff --git a/WebContent/VAADIN/themes/runo/table/img/header-bg-over.png b/themes/src/main/themes/VAADIN/themes/runo/table/img/header-bg-over.png
index 6c888676e9..6c888676e9 100644
--- a/WebContent/VAADIN/themes/runo/table/img/header-bg-over.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/table/img/header-bg-over.png
diff --git a/WebContent/VAADIN/themes/runo/table/img/header-bg.png b/themes/src/main/themes/VAADIN/themes/runo/table/img/header-bg.png
index 275fbc4382..275fbc4382 100644
--- a/WebContent/VAADIN/themes/runo/table/img/header-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/table/img/header-bg.png
diff --git a/WebContent/VAADIN/themes/runo/table/img/resizer-bg.png b/themes/src/main/themes/VAADIN/themes/runo/table/img/resizer-bg.png
index d9089775cb..d9089775cb 100644
--- a/WebContent/VAADIN/themes/runo/table/img/resizer-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/table/img/resizer-bg.png
diff --git a/WebContent/VAADIN/themes/runo/table/img/scroll-position-bg.png b/themes/src/main/themes/VAADIN/themes/runo/table/img/scroll-position-bg.png
index d5968fdf51..d5968fdf51 100644
--- a/WebContent/VAADIN/themes/runo/table/img/scroll-position-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/table/img/scroll-position-bg.png
diff --git a/WebContent/VAADIN/themes/runo/table/img/sort-asc.png b/themes/src/main/themes/VAADIN/themes/runo/table/img/sort-asc.png
index 44e17d5446..44e17d5446 100644
--- a/WebContent/VAADIN/themes/runo/table/img/sort-asc.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/table/img/sort-asc.png
diff --git a/WebContent/VAADIN/themes/runo/table/img/sort-desc.png b/themes/src/main/themes/VAADIN/themes/runo/table/img/sort-desc.png
index 35fd0595f8..35fd0595f8 100644
--- a/WebContent/VAADIN/themes/runo/table/img/sort-desc.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/table/img/sort-desc.png
diff --git a/WebContent/VAADIN/themes/runo/table/table.scss b/themes/src/main/themes/VAADIN/themes/runo/table/table.scss
index 3902ed7cb0..3902ed7cb0 100644
--- a/WebContent/VAADIN/themes/runo/table/table.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/table/table.scss
diff --git a/WebContent/VAADIN/themes/runo/tabsheet/img/inline-tab-bg.png b/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-bg.png
index 501876fb36..501876fb36 100644
--- a/WebContent/VAADIN/themes/runo/tabsheet/img/inline-tab-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-bg.png
diff --git a/WebContent/VAADIN/themes/runo/tabsheet/img/inline-tab-border.png b/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-border.png
index 26c63f6882..26c63f6882 100644
--- a/WebContent/VAADIN/themes/runo/tabsheet/img/inline-tab-border.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-border.png
diff --git a/WebContent/VAADIN/themes/runo/tabsheet/img/inline-tab-left.png b/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-left.png
index 0e0a841a87..0e0a841a87 100644
--- a/WebContent/VAADIN/themes/runo/tabsheet/img/inline-tab-left.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-left.png
diff --git a/WebContent/VAADIN/themes/runo/tabsheet/img/inline-tab-right.png b/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-right.png
index 0696ff8c3b..0696ff8c3b 100644
--- a/WebContent/VAADIN/themes/runo/tabsheet/img/inline-tab-right.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-right.png
diff --git a/WebContent/VAADIN/themes/runo/tabsheet/img/next.png b/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/next.png
index f43dd1abf0..f43dd1abf0 100644
--- a/WebContent/VAADIN/themes/runo/tabsheet/img/next.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/next.png
diff --git a/WebContent/VAADIN/themes/runo/tabsheet/img/prev.png b/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/prev.png
index 5e111b4aa0..5e111b4aa0 100644
--- a/WebContent/VAADIN/themes/runo/tabsheet/img/prev.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/prev.png
diff --git a/WebContent/VAADIN/themes/runo/tabsheet/img/tab-bg.png b/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/tab-bg.png
index a4235e9a83..a4235e9a83 100644
--- a/WebContent/VAADIN/themes/runo/tabsheet/img/tab-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/tab-bg.png
diff --git a/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.scss b/themes/src/main/themes/VAADIN/themes/runo/tabsheet/tabsheet.scss
index ab4afb1c69..ab4afb1c69 100644
--- a/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/tabsheet/tabsheet.scss
diff --git a/WebContent/VAADIN/themes/runo/textfield/img/bg.png b/themes/src/main/themes/VAADIN/themes/runo/textfield/img/bg.png
index 43c7ac7b47..43c7ac7b47 100644
--- a/WebContent/VAADIN/themes/runo/textfield/img/bg.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/textfield/img/bg.png
diff --git a/WebContent/VAADIN/themes/runo/textfield/textfield.scss b/themes/src/main/themes/VAADIN/themes/runo/textfield/textfield.scss
index 3516f529ce..3516f529ce 100644
--- a/WebContent/VAADIN/themes/runo/textfield/textfield.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/textfield/textfield.scss
diff --git a/WebContent/VAADIN/themes/runo/tree/img/collapsed.png b/themes/src/main/themes/VAADIN/themes/runo/tree/img/collapsed.png
index 8d4064de0a..8d4064de0a 100644
--- a/WebContent/VAADIN/themes/runo/tree/img/collapsed.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/tree/img/collapsed.png
diff --git a/WebContent/VAADIN/themes/runo/tree/img/connectors/collapsed-last.png b/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/collapsed-last.png
index 28b3626d79..28b3626d79 100644
--- a/WebContent/VAADIN/themes/runo/tree/img/connectors/collapsed-last.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/collapsed-last.png
diff --git a/WebContent/VAADIN/themes/runo/tree/img/connectors/collapsed.png b/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/collapsed.png
index db4d41cccd..db4d41cccd 100644
--- a/WebContent/VAADIN/themes/runo/tree/img/connectors/collapsed.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/collapsed.png
diff --git a/WebContent/VAADIN/themes/runo/tree/img/connectors/connector-item.png b/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/connector-item.png
index b4d0d7aa56..b4d0d7aa56 100644
--- a/WebContent/VAADIN/themes/runo/tree/img/connectors/connector-item.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/connector-item.png
diff --git a/WebContent/VAADIN/themes/runo/tree/img/connectors/connector.png b/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/connector.png
index a93f458787..a93f458787 100644
--- a/WebContent/VAADIN/themes/runo/tree/img/connectors/connector.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/connector.png
diff --git a/WebContent/VAADIN/themes/runo/tree/img/connectors/expanded-last.png b/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/expanded-last.png
index 504b715122..504b715122 100644
--- a/WebContent/VAADIN/themes/runo/tree/img/connectors/expanded-last.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/expanded-last.png
diff --git a/WebContent/VAADIN/themes/runo/tree/img/connectors/expanded.png b/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/expanded.png
index 5c036ed038..5c036ed038 100644
--- a/WebContent/VAADIN/themes/runo/tree/img/connectors/expanded.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/expanded.png
diff --git a/WebContent/VAADIN/themes/runo/tree/img/expanded.png b/themes/src/main/themes/VAADIN/themes/runo/tree/img/expanded.png
index 4ac2554eac..4ac2554eac 100644
--- a/WebContent/VAADIN/themes/runo/tree/img/expanded.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/tree/img/expanded.png
diff --git a/WebContent/VAADIN/themes/runo/tree/tree.scss b/themes/src/main/themes/VAADIN/themes/runo/tree/tree.scss
index 677e0e8a93..677e0e8a93 100644
--- a/WebContent/VAADIN/themes/runo/tree/tree.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/tree/tree.scss
diff --git a/WebContent/VAADIN/themes/runo/window/img/bg-color.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/bg-color.png
index 08cdb43bce..08cdb43bce 100644
--- a/WebContent/VAADIN/themes/runo/window/img/bg-color.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/bg-color.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/bottom-left.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/bottom-left.png
index e7728b5172..e7728b5172 100644
--- a/WebContent/VAADIN/themes/runo/window/img/bottom-left.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/bottom-left.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/bottom-right.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/bottom-right.png
index 56c654f41d..56c654f41d 100644
--- a/WebContent/VAADIN/themes/runo/window/img/bottom-right.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/bottom-right.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/close.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/close.png
index 55f1a686dd..55f1a686dd 100644
--- a/WebContent/VAADIN/themes/runo/window/img/close.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/close.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/dialog/bottom-left.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/bottom-left.png
index 438b50f419..438b50f419 100644
--- a/WebContent/VAADIN/themes/runo/window/img/dialog/bottom-left.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/bottom-left.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/dialog/bottom-right.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/bottom-right.png
index 3ceb3c92fe..3ceb3c92fe 100644
--- a/WebContent/VAADIN/themes/runo/window/img/dialog/bottom-right.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/bottom-right.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/dialog/close.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/close.png
index bb39f7a1f8..bb39f7a1f8 100644
--- a/WebContent/VAADIN/themes/runo/window/img/dialog/close.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/close.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/dialog/maximize.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/maximize.png
index cbbc0f6691..cbbc0f6691 100644
--- a/WebContent/VAADIN/themes/runo/window/img/dialog/maximize.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/maximize.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/dialog/restore.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/restore.png
index a4e9d257e1..a4e9d257e1 100644
--- a/WebContent/VAADIN/themes/runo/window/img/dialog/restore.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/restore.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/left-bg.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/left-bg.png
index e9fd861993..e9fd861993 100644
--- a/WebContent/VAADIN/themes/runo/window/img/left-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/left-bg.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/maximize.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/maximize.png
index c7a1a8d418..c7a1a8d418 100644
--- a/WebContent/VAADIN/themes/runo/window/img/maximize.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/maximize.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/notification-error.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/notification-error.png
index 32852d5907..32852d5907 100644
--- a/WebContent/VAADIN/themes/runo/window/img/notification-error.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/notification-error.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/resize.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/resize.png
index e0a8759f64..e0a8759f64 100644
--- a/WebContent/VAADIN/themes/runo/window/img/resize.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/resize.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/restore.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/restore.png
index 15ac00ddb2..15ac00ddb2 100644
--- a/WebContent/VAADIN/themes/runo/window/img/restore.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/restore.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/right-bg.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/right-bg.png
index 35d39c772f..35d39c772f 100644
--- a/WebContent/VAADIN/themes/runo/window/img/right-bg.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/right-bg.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/shadow/bottom-left.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/shadow/bottom-left.png
index 1ffd763faf..1ffd763faf 100644
--- a/WebContent/VAADIN/themes/runo/window/img/shadow/bottom-left.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/shadow/bottom-left.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/shadow/bottom-right.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/shadow/bottom-right.png
index af3552a4bc..af3552a4bc 100644
--- a/WebContent/VAADIN/themes/runo/window/img/shadow/bottom-right.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/shadow/bottom-right.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/shadow/bottom.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/shadow/bottom.png
index ed24b66705..ed24b66705 100644
--- a/WebContent/VAADIN/themes/runo/window/img/shadow/bottom.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/shadow/bottom.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/shadow/center.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/shadow/center.png
index f3825db0fb..f3825db0fb 100644
--- a/WebContent/VAADIN/themes/runo/window/img/shadow/center.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/shadow/center.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/shadow/left.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/shadow/left.png
index 4c0b430f22..4c0b430f22 100644
--- a/WebContent/VAADIN/themes/runo/window/img/shadow/left.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/shadow/left.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/shadow/right.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/shadow/right.png
index f81cfa0ce4..f81cfa0ce4 100644
--- a/WebContent/VAADIN/themes/runo/window/img/shadow/right.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/shadow/right.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/shadow/top-left.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/shadow/top-left.png
index 7f79389398..7f79389398 100644
--- a/WebContent/VAADIN/themes/runo/window/img/shadow/top-left.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/shadow/top-left.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/shadow/top-right.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/shadow/top-right.png
index feb490d565..feb490d565 100644
--- a/WebContent/VAADIN/themes/runo/window/img/shadow/top-right.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/shadow/top-right.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/shadow/top.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/shadow/top.png
index 10bcc450ee..10bcc450ee 100644
--- a/WebContent/VAADIN/themes/runo/window/img/shadow/top.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/shadow/top.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/top-left.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/top-left.png
index ae8aee8ade..ae8aee8ade 100644
--- a/WebContent/VAADIN/themes/runo/window/img/top-left.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/top-left.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/top-right.png b/themes/src/main/themes/VAADIN/themes/runo/window/img/top-right.png
index 7030dc30e0..7030dc30e0 100644
--- a/WebContent/VAADIN/themes/runo/window/img/top-right.png
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/img/top-right.png
diff --git a/WebContent/VAADIN/themes/runo/window/window.scss b/themes/src/main/themes/VAADIN/themes/runo/window/window.scss
index bf2081674c..bf2081674c 100644
--- a/WebContent/VAADIN/themes/runo/window/window.scss
+++ b/themes/src/main/themes/VAADIN/themes/runo/window/window.scss
diff --git a/WebContent/VAADIN/themes/valo/_valo.scss b/themes/src/main/themes/VAADIN/themes/valo/_valo.scss
index 8a2da5b789..8a2da5b789 100644
--- a/WebContent/VAADIN/themes/valo/_valo.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/_valo.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_absolutelayout.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_absolutelayout.scss
index 5f1ef9281e..5f1ef9281e 100755
--- a/WebContent/VAADIN/themes/valo/components/_absolutelayout.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_absolutelayout.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_accordion.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_accordion.scss
index 40ab29f862..40ab29f862 100644
--- a/WebContent/VAADIN/themes/valo/components/_accordion.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_accordion.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_all.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_all.scss
index 52f1d696aa..52f1d696aa 100644
--- a/WebContent/VAADIN/themes/valo/components/_all.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_all.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_button.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_button.scss
index 3a4bca615d..3a4bca615d 100644
--- a/WebContent/VAADIN/themes/valo/components/_button.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_button.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_calendar.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_calendar.scss
index bf1dc1c3dc..bf1dc1c3dc 100644
--- a/WebContent/VAADIN/themes/valo/components/_calendar.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_calendar.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_checkbox.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_checkbox.scss
index 569a414734..569a414734 100644
--- a/WebContent/VAADIN/themes/valo/components/_checkbox.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_checkbox.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_colorpicker.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_colorpicker.scss
index 3f334e893c..3f334e893c 100644
--- a/WebContent/VAADIN/themes/valo/components/_colorpicker.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_colorpicker.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_combobox.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_combobox.scss
index d240be56b8..d240be56b8 100644
--- a/WebContent/VAADIN/themes/valo/components/_combobox.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_combobox.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_csslayout.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_csslayout.scss
index c06d3c2441..c06d3c2441 100644
--- a/WebContent/VAADIN/themes/valo/components/_csslayout.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_csslayout.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_customcomponent.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_customcomponent.scss
index e9d94b7274..e9d94b7274 100644
--- a/WebContent/VAADIN/themes/valo/components/_customcomponent.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_customcomponent.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_customlayout.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_customlayout.scss
index c9eddc5306..c9eddc5306 100644
--- a/WebContent/VAADIN/themes/valo/components/_customlayout.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_customlayout.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_datefield.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_datefield.scss
index 6ff8a70dba..6ff8a70dba 100644
--- a/WebContent/VAADIN/themes/valo/components/_datefield.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_datefield.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_dragwrapper.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_dragwrapper.scss
index 6e4859b82c..6e4859b82c 100644
--- a/WebContent/VAADIN/themes/valo/components/_dragwrapper.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_dragwrapper.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_form.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_form.scss
index 6b15d2a7cd..6b15d2a7cd 100644
--- a/WebContent/VAADIN/themes/valo/components/_form.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_form.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_formlayout.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_formlayout.scss
index 35627ebd79..35627ebd79 100644
--- a/WebContent/VAADIN/themes/valo/components/_formlayout.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_formlayout.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_grid.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_grid.scss
index 4a0715b2d2..4a0715b2d2 100644
--- a/WebContent/VAADIN/themes/valo/components/_grid.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_grid.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_gridlayout.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_gridlayout.scss
index e1777750cd..e1777750cd 100644
--- a/WebContent/VAADIN/themes/valo/components/_gridlayout.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_gridlayout.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_label.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_label.scss
index 95500ceafe..95500ceafe 100644
--- a/WebContent/VAADIN/themes/valo/components/_label.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_label.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_link.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_link.scss
index 270de1aace..270de1aace 100644
--- a/WebContent/VAADIN/themes/valo/components/_link.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_link.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_loginform.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_loginform.scss
index 88745d649d..88745d649d 100644
--- a/WebContent/VAADIN/themes/valo/components/_loginform.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_loginform.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_menubar.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_menubar.scss
index 4b4a657d6a..4b4a657d6a 100644
--- a/WebContent/VAADIN/themes/valo/components/_menubar.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_menubar.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_nativebutton.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_nativebutton.scss
index 9bfca4f396..9bfca4f396 100644
--- a/WebContent/VAADIN/themes/valo/components/_nativebutton.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_nativebutton.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_nativeselect.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_nativeselect.scss
index d0b2caf745..d0b2caf745 100644
--- a/WebContent/VAADIN/themes/valo/components/_nativeselect.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_nativeselect.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_notification.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_notification.scss
index ee3cf67a7c..ee3cf67a7c 100644
--- a/WebContent/VAADIN/themes/valo/components/_notification.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_notification.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_optiongroup.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_optiongroup.scss
index 84e0a821d3..84e0a821d3 100644
--- a/WebContent/VAADIN/themes/valo/components/_optiongroup.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_optiongroup.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_orderedlayout.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_orderedlayout.scss
index 8a7c877d69..8a7c877d69 100644
--- a/WebContent/VAADIN/themes/valo/components/_orderedlayout.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_orderedlayout.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_panel.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_panel.scss
index 42a4ff3a3d..42a4ff3a3d 100644
--- a/WebContent/VAADIN/themes/valo/components/_panel.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_panel.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_popupview.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_popupview.scss
index f7f8ef35b7..f7f8ef35b7 100644
--- a/WebContent/VAADIN/themes/valo/components/_popupview.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_popupview.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_progressbar.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_progressbar.scss
index 1dc8ef1b63..1dc8ef1b63 100644
--- a/WebContent/VAADIN/themes/valo/components/_progressbar.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_progressbar.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_richtextarea.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_richtextarea.scss
index 7aa55b0fce..7aa55b0fce 100644
--- a/WebContent/VAADIN/themes/valo/components/_richtextarea.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_richtextarea.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_slider.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_slider.scss
index 6dab5be94b..6dab5be94b 100644
--- a/WebContent/VAADIN/themes/valo/components/_slider.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_slider.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_splitpanel.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_splitpanel.scss
index 6877b8327e..6877b8327e 100644
--- a/WebContent/VAADIN/themes/valo/components/_splitpanel.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_splitpanel.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_table.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_table.scss
index a832b3a4da..a832b3a4da 100644
--- a/WebContent/VAADIN/themes/valo/components/_table.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_table.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_tabsheet.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_tabsheet.scss
index 07fdb4650b..07fdb4650b 100644
--- a/WebContent/VAADIN/themes/valo/components/_tabsheet.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_tabsheet.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_textarea.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_textarea.scss
index d600bc14c2..d600bc14c2 100644
--- a/WebContent/VAADIN/themes/valo/components/_textarea.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_textarea.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_textfield.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_textfield.scss
index 50cb7b8042..50cb7b8042 100644
--- a/WebContent/VAADIN/themes/valo/components/_textfield.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_textfield.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_tree.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_tree.scss
index 95ae8d3b5e..95ae8d3b5e 100644
--- a/WebContent/VAADIN/themes/valo/components/_tree.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_tree.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_treetable.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_treetable.scss
index 60b696315b..60b696315b 100644
--- a/WebContent/VAADIN/themes/valo/components/_treetable.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_treetable.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_twincolselect.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_twincolselect.scss
index 51063e236f..51063e236f 100644
--- a/WebContent/VAADIN/themes/valo/components/_twincolselect.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_twincolselect.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_upload.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_upload.scss
index 1616e80563..1616e80563 100644
--- a/WebContent/VAADIN/themes/valo/components/_upload.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_upload.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_valo-menu.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_valo-menu.scss
index 48ba22174b..48ba22174b 100644
--- a/WebContent/VAADIN/themes/valo/components/_valo-menu.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_valo-menu.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_widget.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_widget.scss
index 85bc96ba9f..85bc96ba9f 100644
--- a/WebContent/VAADIN/themes/valo/components/_widget.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_widget.scss
diff --git a/WebContent/VAADIN/themes/valo/components/_window.scss b/themes/src/main/themes/VAADIN/themes/valo/components/_window.scss
index 0b01949593..0b01949593 100644
--- a/WebContent/VAADIN/themes/valo/components/_window.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/_window.scss
diff --git a/WebContent/VAADIN/themes/valo/components/img/colorpicker/gradient.png b/themes/src/main/themes/VAADIN/themes/valo/components/img/colorpicker/gradient.png
index def063a8ab..def063a8ab 100644
--- a/WebContent/VAADIN/themes/valo/components/img/colorpicker/gradient.png
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/img/colorpicker/gradient.png
diff --git a/WebContent/VAADIN/themes/valo/components/img/colorpicker/gradient2.png b/themes/src/main/themes/VAADIN/themes/valo/components/img/colorpicker/gradient2.png
index f51ed752a7..f51ed752a7 100644
--- a/WebContent/VAADIN/themes/valo/components/img/colorpicker/gradient2.png
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/img/colorpicker/gradient2.png
diff --git a/WebContent/VAADIN/themes/valo/components/img/colorpicker/slider_hue_bg.png b/themes/src/main/themes/VAADIN/themes/valo/components/img/colorpicker/slider_hue_bg.png
index bcef2c5575..bcef2c5575 100644
--- a/WebContent/VAADIN/themes/valo/components/img/colorpicker/slider_hue_bg.png
+++ b/themes/src/main/themes/VAADIN/themes/valo/components/img/colorpicker/slider_hue_bg.png
diff --git a/WebContent/VAADIN/themes/valo/favicon.ico b/themes/src/main/themes/VAADIN/themes/valo/favicon.ico
index ffb34a65c7..ffb34a65c7 100644
--- a/WebContent/VAADIN/themes/valo/favicon.ico
+++ b/themes/src/main/themes/VAADIN/themes/valo/favicon.ico
diff --git a/WebContent/VAADIN/themes/valo/fonts/_fonts.scss b/themes/src/main/themes/VAADIN/themes/valo/fonts/_fonts.scss
index b947106f38..b947106f38 100644
--- a/WebContent/VAADIN/themes/valo/fonts/_fonts.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/_fonts.scss
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/_lato.scss b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/_lato.scss
index 152082689c..152082689c 100644
--- a/WebContent/VAADIN/themes/valo/fonts/lato/_lato.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/_lato.scss
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-black-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-black-webfont.eot
index 254f92b5b6..254f92b5b6 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-black-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-black-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-black-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-black-webfont.ttf
index 1ecfb60748..1ecfb60748 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-black-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-black-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-black-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-black-webfont.woff
index 2269286e11..2269286e11 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-black-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-black-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-blackitalic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-blackitalic-webfont.eot
index 5e6889cc4f..5e6889cc4f 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-blackitalic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-blackitalic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-blackitalic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-blackitalic-webfont.ttf
index bd334e9bea..bd334e9bea 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-blackitalic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-blackitalic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-blackitalic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-blackitalic-webfont.woff
index 6e41ed94fc..6e41ed94fc 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-blackitalic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-blackitalic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-bold-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-bold-webfont.eot
index 00954909c8..00954909c8 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-bold-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-bold-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-bold-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-bold-webfont.ttf
index 695afc99a0..695afc99a0 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-bold-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-bold-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-bold-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-bold-webfont.woff
index 6c2eb81d98..6c2eb81d98 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-bold-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-bold-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-bolditalic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-bolditalic-webfont.eot
index 0994180ad6..0994180ad6 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-bolditalic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-bolditalic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-bolditalic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-bolditalic-webfont.ttf
index 321368dac1..321368dac1 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-bolditalic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-bolditalic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-bolditalic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-bolditalic-webfont.woff
index 8782b4792b..8782b4792b 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-bolditalic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-bolditalic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-hairline-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-hairline-webfont.eot
index dc400174fc..dc400174fc 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-hairline-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-hairline-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-hairline-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-hairline-webfont.ttf
index 9041e647f3..9041e647f3 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-hairline-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-hairline-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-hairline-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-hairline-webfont.woff
index 19acf444be..19acf444be 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-hairline-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-hairline-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-hairlineitalic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-hairlineitalic-webfont.eot
index 0ba065fe8f..0ba065fe8f 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-hairlineitalic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-hairlineitalic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-hairlineitalic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-hairlineitalic-webfont.ttf
index 05aa693e4d..05aa693e4d 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-hairlineitalic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-hairlineitalic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-hairlineitalic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-hairlineitalic-webfont.woff
index d63f45aa24..d63f45aa24 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-hairlineitalic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-hairlineitalic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-italic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-italic-webfont.eot
index b0e5bb354f..b0e5bb354f 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-italic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-italic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-italic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-italic-webfont.ttf
index 368cf111e6..368cf111e6 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-italic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-italic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-italic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-italic-webfont.woff
index 9d0784d5e4..9d0784d5e4 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-italic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-italic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-light-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-light-webfont.eot
index 2233ada12e..2233ada12e 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-light-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-light-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-light-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-light-webfont.ttf
index b9ad943886..b9ad943886 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-light-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-light-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-light-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-light-webfont.woff
index c0270e2863..c0270e2863 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-light-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-light-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-lightitalic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-lightitalic-webfont.eot
index 54635135a9..54635135a9 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-lightitalic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-lightitalic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-lightitalic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-lightitalic-webfont.ttf
index da3ad35f8b..da3ad35f8b 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-lightitalic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-lightitalic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-lightitalic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-lightitalic-webfont.woff
index 80f3d711a0..80f3d711a0 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-lightitalic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-lightitalic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-regular-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-regular-webfont.eot
index db0507682a..db0507682a 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-regular-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-regular-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-regular-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-regular-webfont.ttf
index 33743b52d9..33743b52d9 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-regular-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-regular-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/lato/lato-regular-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-regular-webfont.woff
index c287ffcdf3..c287ffcdf3 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lato/lato-regular-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lato/lato-regular-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/lora/_lora.scss b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/_lora.scss
index a40f800b5a..a40f800b5a 100644
--- a/WebContent/VAADIN/themes/valo/fonts/lora/_lora.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/_lora.scss
diff --git a/WebContent/VAADIN/themes/valo/fonts/lora/lora-bold-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-bold-webfont.eot
index bfd15013c4..bfd15013c4 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lora/lora-bold-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-bold-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/lora/lora-bold-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-bold-webfont.ttf
index 1785809e73..1785809e73 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lora/lora-bold-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-bold-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/lora/lora-bold-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-bold-webfont.woff
index d09efc35bb..d09efc35bb 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lora/lora-bold-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-bold-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/lora/lora-bolditalic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-bolditalic-webfont.eot
index 507a689c63..507a689c63 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lora/lora-bolditalic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-bolditalic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/lora/lora-bolditalic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-bolditalic-webfont.ttf
index 19e1459eb0..19e1459eb0 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lora/lora-bolditalic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-bolditalic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/lora/lora-bolditalic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-bolditalic-webfont.woff
index 848e03d916..848e03d916 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lora/lora-bolditalic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-bolditalic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/lora/lora-italic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-italic-webfont.eot
index f966a9fcf9..f966a9fcf9 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lora/lora-italic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-italic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/lora/lora-italic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-italic-webfont.ttf
index aa0bd01b58..aa0bd01b58 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lora/lora-italic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-italic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/lora/lora-italic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-italic-webfont.woff
index 2cfc2df1d7..2cfc2df1d7 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lora/lora-italic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-italic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/lora/lora-regular-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-regular-webfont.eot
index 8c218880c8..8c218880c8 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lora/lora-regular-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-regular-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/lora/lora-regular-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-regular-webfont.ttf
index 908f2e34f4..908f2e34f4 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lora/lora-regular-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-regular-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/lora/lora-regular-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-regular-webfont.woff
index 2b15bf776e..2b15bf776e 100755
--- a/WebContent/VAADIN/themes/valo/fonts/lora/lora-regular-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/lora/lora-regular-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.eot
index 5d20d91633..5d20d91633 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.ttf
index 2109c958e3..2109c958e3 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.woff
index 1205787b0e..1205787b0e 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Bold-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.eot
index 1f639a15ff..1f639a15ff 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.ttf
index 242d6b25c3..242d6b25c3 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.woff
index ed760c0628..ed760c0628 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-BoldItalic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.eot
index 1e29ad5954..1e29ad5954 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.ttf
index 6b9118ee35..6b9118ee35 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.woff
index a7b99d2552..a7b99d2552 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBold-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.eot
index 77184af422..77184af422 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.ttf
index 26a07e9392..26a07e9392 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.woff
index 45395d1bbe..45395d1bbe 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.eot
index 0c8a0ae06e..0c8a0ae06e 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.ttf
index 12d25d9a73..12d25d9a73 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.woff
index ff652e6435..ff652e6435 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Italic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.eot
index 14868406aa..14868406aa 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.ttf
index 63af664cde..63af664cde 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.woff
index e786074813..e786074813 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Light-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.eot
index 8f445929ff..8f445929ff 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.ttf
index 01dda2858a..01dda2858a 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.woff
index 43e8b9e6cc..43e8b9e6cc 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-LightItalic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.eot
index 6bbc3cf58c..6bbc3cf58c 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.ttf
index c537f8382a..c537f8382a 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.woff
index e231183dce..e231183dce 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Regular-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.eot
index d8375dd0ab..d8375dd0ab 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.ttf
index b3290843a7..b3290843a7 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.woff
index 28d6adee03..28d6adee03 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-Semibold-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.eot
index 0ab1db22e6..0ab1db22e6 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.ttf
index d2d6318f66..d2d6318f66 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.woff
index d4dfca402e..d4dfca402e 100755
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/OpenSans-SemiboldItalic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/open-sans/_open-sans.scss b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/_open-sans.scss
index ca5851a99d..ca5851a99d 100644
--- a/WebContent/VAADIN/themes/valo/fonts/open-sans/_open-sans.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/open-sans/_open-sans.scss
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Black-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Black-webfont.eot
index fa326d1d12..fa326d1d12 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Black-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Black-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Black-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Black-webfont.ttf
index 3c3b2b8ae6..3c3b2b8ae6 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Black-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Black-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Black-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Black-webfont.woff
index 0229086571..0229086571 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Black-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Black-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-BlackItalic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-BlackItalic-webfont.eot
index a2aebfb7da..a2aebfb7da 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-BlackItalic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-BlackItalic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-BlackItalic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-BlackItalic-webfont.ttf
index 2020dcbc9c..2020dcbc9c 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-BlackItalic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-BlackItalic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-BlackItalic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-BlackItalic-webfont.woff
index 1875c0b950..1875c0b950 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-BlackItalic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-BlackItalic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Bold-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Bold-webfont.eot
index b73776ee3b..b73776ee3b 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Bold-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Bold-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Bold-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Bold-webfont.ttf
index 1da72769a8..1da72769a8 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Bold-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Bold-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Bold-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Bold-webfont.woff
index 0c6994871e..0c6994871e 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Bold-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Bold-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-BoldItalic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-BoldItalic-webfont.eot
index b803ec1687..b803ec1687 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-BoldItalic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-BoldItalic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-BoldItalic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-BoldItalic-webfont.ttf
index 78bab05c8c..78bab05c8c 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-BoldItalic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-BoldItalic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-BoldItalic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-BoldItalic-webfont.woff
index 99de61af52..99de61af52 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-BoldItalic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-BoldItalic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Italic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Italic-webfont.eot
index b708f047ff..b708f047ff 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Italic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Italic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Italic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Italic-webfont.ttf
index ae258e8416..ae258e8416 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Italic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Italic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Italic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Italic-webfont.woff
index dd74244382..dd74244382 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Italic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Italic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Light-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Light-webfont.eot
index 072cdc480c..072cdc480c 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Light-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Light-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Light-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Light-webfont.ttf
index 3b2fea0ace..3b2fea0ace 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Light-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Light-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Light-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Light-webfont.woff
index cc534a3815..cc534a3815 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Light-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Light-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-LightItalic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-LightItalic-webfont.eot
index 77396a1ff9..77396a1ff9 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-LightItalic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-LightItalic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-LightItalic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-LightItalic-webfont.ttf
index b9b38118a3..b9b38118a3 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-LightItalic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-LightItalic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-LightItalic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-LightItalic-webfont.woff
index 3071ff4f23..3071ff4f23 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-LightItalic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-LightItalic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Medium-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Medium-webfont.eot
index f9ad99566d..f9ad99566d 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Medium-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Medium-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Medium-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Medium-webfont.ttf
index 8aa64d8232..8aa64d8232 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Medium-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Medium-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Medium-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Medium-webfont.woff
index cd810ef929..cd810ef929 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Medium-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Medium-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-MediumItalic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-MediumItalic-webfont.eot
index a03fe4b248..a03fe4b248 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-MediumItalic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-MediumItalic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-MediumItalic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-MediumItalic-webfont.ttf
index 6439927f16..6439927f16 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-MediumItalic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-MediumItalic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-MediumItalic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-MediumItalic-webfont.woff
index 69a1458011..69a1458011 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-MediumItalic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-MediumItalic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Regular-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Regular-webfont.eot
index 9b5e8e4138..9b5e8e4138 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Regular-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Regular-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Regular-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Regular-webfont.ttf
index 44dd78d5e1..44dd78d5e1 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Regular-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Regular-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Regular-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Regular-webfont.woff
index bfa05d53f4..bfa05d53f4 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Regular-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Regular-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Thin-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Thin-webfont.eot
index 2284a3b3ef..2284a3b3ef 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Thin-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Thin-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Thin-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Thin-webfont.ttf
index 18919f7a96..18919f7a96 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Thin-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Thin-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Thin-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Thin-webfont.woff
index f10b831e85..f10b831e85 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-Thin-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-Thin-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-ThinItalic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-ThinItalic-webfont.eot
index e6291f2657..e6291f2657 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-ThinItalic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-ThinItalic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-ThinItalic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-ThinItalic-webfont.ttf
index a4e7ae08e0..a4e7ae08e0 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-ThinItalic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-ThinItalic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-ThinItalic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-ThinItalic-webfont.woff
index 9ef17a8681..9ef17a8681 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/Roboto-ThinItalic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/Roboto-ThinItalic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Bold-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Bold-webfont.eot
index bbc67d825b..bbc67d825b 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Bold-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Bold-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Bold-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Bold-webfont.ttf
index 87256d3a34..87256d3a34 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Bold-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Bold-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Bold-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Bold-webfont.woff
index 235c963d69..235c963d69 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Bold-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Bold-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-BoldItalic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-BoldItalic-webfont.eot
index 5a95d1a144..5a95d1a144 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-BoldItalic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-BoldItalic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-BoldItalic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-BoldItalic-webfont.ttf
index 059feb39c5..059feb39c5 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-BoldItalic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-BoldItalic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-BoldItalic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-BoldItalic-webfont.woff
index df69b95291..df69b95291 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-BoldItalic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-BoldItalic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Italic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Italic-webfont.eot
index 985364ffed..985364ffed 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Italic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Italic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Italic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Italic-webfont.ttf
index d804301e70..d804301e70 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Italic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Italic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Italic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Italic-webfont.woff
index 67804e1e4d..67804e1e4d 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Italic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Italic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Light-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Light-webfont.eot
index d492665160..d492665160 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Light-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Light-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Light-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Light-webfont.ttf
index 321c450f22..321c450f22 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Light-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Light-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Light-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Light-webfont.woff
index c414478ca5..c414478ca5 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Light-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Light-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-LightItalic-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-LightItalic-webfont.eot
index c169648374..c169648374 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-LightItalic-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-LightItalic-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-LightItalic-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-LightItalic-webfont.ttf
index 905604d021..905604d021 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-LightItalic-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-LightItalic-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-LightItalic-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-LightItalic-webfont.woff
index 5536e16c5d..5536e16c5d 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-LightItalic-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-LightItalic-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Regular-webfont.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Regular-webfont.eot
index 5710fe6ead..5710fe6ead 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Regular-webfont.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Regular-webfont.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Regular-webfont.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Regular-webfont.ttf
index be9f6f8ab9..be9f6f8ab9 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Regular-webfont.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Regular-webfont.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Regular-webfont.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Regular-webfont.woff
index ec28f95c87..ec28f95c87 100755
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Regular-webfont.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/RobotoCondensed-Regular-webfont.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/roboto/_roboto.scss b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/_roboto.scss
index ddc6b4f5a7..ddc6b4f5a7 100644
--- a/WebContent/VAADIN/themes/valo/fonts/roboto/_roboto.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/roboto/_roboto.scss
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/_source-sans-pro.scss b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/_source-sans-pro.scss
index f324e8f1fb..f324e8f1fb 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/_source-sans-pro.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/_source-sans-pro.scss
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-black.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-black.eot
index 52d89ee8c2..52d89ee8c2 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-black.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-black.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-black.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-black.ttf
index 0d727c31f0..0d727c31f0 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-black.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-black.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-black.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-black.woff
index 2c80d40f53..2c80d40f53 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-black.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-black.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-blackit.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-blackit.eot
index a6e65ae2c2..a6e65ae2c2 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-blackit.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-blackit.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-blackit.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-blackit.ttf
index d40b74c1a6..d40b74c1a6 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-blackit.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-blackit.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-blackit.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-blackit.woff
index e48d2d80cb..e48d2d80cb 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-blackit.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-blackit.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-bold.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-bold.eot
index b255c35b76..b255c35b76 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-bold.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-bold.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-bold.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-bold.ttf
index 47468b5140..47468b5140 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-bold.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-bold.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-bold.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-bold.woff
index 454b77ff0d..454b77ff0d 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-bold.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-bold.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-boldit.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-boldit.eot
index a5565ddebb..a5565ddebb 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-boldit.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-boldit.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-boldit.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-boldit.ttf
index 2fb6404d6e..2fb6404d6e 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-boldit.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-boldit.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-boldit.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-boldit.woff
index 57bd10d301..57bd10d301 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-boldit.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-boldit.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralight.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralight.eot
index 2c588f017a..2c588f017a 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralight.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralight.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralight.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralight.ttf
index e4d3b9245b..e4d3b9245b 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralight.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralight.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralight.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralight.woff
index 709eae0398..709eae0398 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralight.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralight.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralightit.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralightit.eot
index 0fe99615a2..0fe99615a2 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralightit.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralightit.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralightit.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralightit.ttf
index 314d9b1226..314d9b1226 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralightit.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralightit.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralightit.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralightit.woff
index 14038f36eb..14038f36eb 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralightit.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-extralightit.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-it.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-it.eot
index 989e7dd271..989e7dd271 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-it.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-it.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-it.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-it.ttf
index 076a656119..076a656119 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-it.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-it.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-it.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-it.woff
index 94a41380e2..94a41380e2 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-it.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-it.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-light.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-light.eot
index 5618f2748d..5618f2748d 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-light.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-light.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-light.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-light.ttf
index 483301619e..483301619e 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-light.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-light.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-light.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-light.woff
index f9f0aa1198..f9f0aa1198 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-light.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-light.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-lightit.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-lightit.eot
index 3cce3f54df..3cce3f54df 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-lightit.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-lightit.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-lightit.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-lightit.ttf
index fb2f58f981..fb2f58f981 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-lightit.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-lightit.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-lightit.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-lightit.woff
index d8ea82bae2..d8ea82bae2 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-lightit.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-lightit.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-regular.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-regular.eot
index 4968aa134a..4968aa134a 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-regular.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-regular.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-regular.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-regular.ttf
index 3939d7019d..3939d7019d 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-regular.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-regular.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-regular.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-regular.woff
index 5b3283af6a..5b3283af6a 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-regular.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-regular.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semibold.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semibold.eot
index 7d8014869c..7d8014869c 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semibold.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semibold.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semibold.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semibold.ttf
index b108896526..b108896526 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semibold.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semibold.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semibold.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semibold.woff
index a138eb3076..a138eb3076 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semibold.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semibold.woff
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semiboldit.eot b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semiboldit.eot
index 53093c24c4..53093c24c4 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semiboldit.eot
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semiboldit.eot
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semiboldit.ttf b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semiboldit.ttf
index dc5c032c73..dc5c032c73 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semiboldit.ttf
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semiboldit.ttf
diff --git a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semiboldit.woff b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semiboldit.woff
index e7a09d7141..e7a09d7141 100644
--- a/WebContent/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semiboldit.woff
+++ b/themes/src/main/themes/VAADIN/themes/valo/fonts/source-sans-pro/sourcesanspro-semiboldit.woff
diff --git a/WebContent/VAADIN/themes/valo/shared/_contextmenu.scss b/themes/src/main/themes/VAADIN/themes/valo/shared/_contextmenu.scss
index 7fd182b6cd..7fd182b6cd 100644
--- a/WebContent/VAADIN/themes/valo/shared/_contextmenu.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/shared/_contextmenu.scss
diff --git a/WebContent/VAADIN/themes/valo/shared/_global.scss b/themes/src/main/themes/VAADIN/themes/valo/shared/_global.scss
index 39b5a4e7d9..55de987120 100644
--- a/WebContent/VAADIN/themes/valo/shared/_global.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/shared/_global.scss
@@ -26,7 +26,7 @@ $valo-global-included: false !default;
 
     // Version info for the debug window
     .v-vaadin-version:after {
-      content: "@version@";
+      content: "${project.version}";
     }
 
     // Core widget styles come before any other component (and are always included),
diff --git a/WebContent/VAADIN/themes/valo/shared/_loading-indicator.scss b/themes/src/main/themes/VAADIN/themes/valo/shared/_loading-indicator.scss
index 645e188b09..645e188b09 100644
--- a/WebContent/VAADIN/themes/valo/shared/_loading-indicator.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/shared/_loading-indicator.scss
diff --git a/WebContent/VAADIN/themes/valo/shared/_overlay.scss b/themes/src/main/themes/VAADIN/themes/valo/shared/_overlay.scss
index 926b00f529..926b00f529 100644
--- a/WebContent/VAADIN/themes/valo/shared/_overlay.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/shared/_overlay.scss
diff --git a/WebContent/VAADIN/themes/valo/shared/_reconnect-dialog.scss b/themes/src/main/themes/VAADIN/themes/valo/shared/_reconnect-dialog.scss
index e648795b5a..e648795b5a 100644
--- a/WebContent/VAADIN/themes/valo/shared/_reconnect-dialog.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/shared/_reconnect-dialog.scss
diff --git a/WebContent/VAADIN/themes/valo/shared/_tooltip.scss b/themes/src/main/themes/VAADIN/themes/valo/shared/_tooltip.scss
index 3c9c914499..3c9c914499 100644
--- a/WebContent/VAADIN/themes/valo/shared/_tooltip.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/shared/_tooltip.scss
diff --git a/WebContent/VAADIN/themes/valo/shared/_variables.scss b/themes/src/main/themes/VAADIN/themes/valo/shared/_variables.scss
index 4634a71fea..4634a71fea 100644
--- a/WebContent/VAADIN/themes/valo/shared/_variables.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/shared/_variables.scss
diff --git a/WebContent/VAADIN/themes/valo/shared/img/spinner.gif b/themes/src/main/themes/VAADIN/themes/valo/shared/img/spinner.gif
index a91347a730..a91347a730 100644
--- a/WebContent/VAADIN/themes/valo/shared/img/spinner.gif
+++ b/themes/src/main/themes/VAADIN/themes/valo/shared/img/spinner.gif
diff --git a/WebContent/VAADIN/themes/valo/styles.scss b/themes/src/main/themes/VAADIN/themes/valo/styles.scss
index 5760440179..5760440179 100644
--- a/WebContent/VAADIN/themes/valo/styles.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/styles.scss
diff --git a/WebContent/VAADIN/themes/valo/util/_anim.scss b/themes/src/main/themes/VAADIN/themes/valo/util/_anim.scss
index 12c557d7de..12c557d7de 100644
--- a/WebContent/VAADIN/themes/valo/util/_anim.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/_anim.scss
diff --git a/WebContent/VAADIN/themes/valo/util/_bevel-and-shadow.scss b/themes/src/main/themes/VAADIN/themes/valo/util/_bevel-and-shadow.scss
index 1065161bfc..1065161bfc 100644
--- a/WebContent/VAADIN/themes/valo/util/_bevel-and-shadow.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/_bevel-and-shadow.scss
diff --git a/WebContent/VAADIN/themes/valo/util/_blend-modes.scss b/themes/src/main/themes/VAADIN/themes/valo/util/_blend-modes.scss
index 40d4defbdb..40d4defbdb 100644
--- a/WebContent/VAADIN/themes/valo/util/_blend-modes.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/_blend-modes.scss
diff --git a/WebContent/VAADIN/themes/valo/util/_color.scss b/themes/src/main/themes/VAADIN/themes/valo/util/_color.scss
index e4aab4596d..e4aab4596d 100644
--- a/WebContent/VAADIN/themes/valo/util/_color.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/_color.scss
diff --git a/WebContent/VAADIN/themes/valo/util/_css3.scss b/themes/src/main/themes/VAADIN/themes/valo/util/_css3.scss
index dc2dc781a7..dc2dc781a7 100644
--- a/WebContent/VAADIN/themes/valo/util/_css3.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/_css3.scss
diff --git a/WebContent/VAADIN/themes/valo/util/_gradient.scss b/themes/src/main/themes/VAADIN/themes/valo/util/_gradient.scss
index a38dca704c..a38dca704c 100644
--- a/WebContent/VAADIN/themes/valo/util/_gradient.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/_gradient.scss
diff --git a/WebContent/VAADIN/themes/valo/util/_lists.scss b/themes/src/main/themes/VAADIN/themes/valo/util/_lists.scss
index e21c69fd01..e21c69fd01 100644
--- a/WebContent/VAADIN/themes/valo/util/_lists.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/_lists.scss
diff --git a/WebContent/VAADIN/themes/valo/util/_util.scss b/themes/src/main/themes/VAADIN/themes/valo/util/_util.scss
index 3430263d90..3430263d90 100644
--- a/WebContent/VAADIN/themes/valo/util/_util.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/_util.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/_bourbon-deprecated-upcoming.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/_bourbon-deprecated-upcoming.scss
index 5332496d82..5332496d82 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/_bourbon-deprecated-upcoming.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/_bourbon-deprecated-upcoming.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/_bourbon.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/_bourbon.scss
index c94d48ae14..c94d48ae14 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/_bourbon.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/_bourbon.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_button.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_button.scss
index 14a89e480c..14a89e480c 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_button.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_button.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_clearfix.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_clearfix.scss
index 783cfbc792..783cfbc792 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_clearfix.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_clearfix.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_directional-values.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_directional-values.scss
index 742f1031a4..742f1031a4 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_directional-values.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_directional-values.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_ellipsis.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_ellipsis.scss
index a8ea2a4a86..a8ea2a4a86 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_ellipsis.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_ellipsis.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_font-family.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_font-family.scss
index 31f5d9ca75..31f5d9ca75 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_font-family.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_font-family.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_hide-text.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_hide-text.scss
index fc7943811d..fc7943811d 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_hide-text.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_hide-text.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_html5-input-types.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_html5-input-types.scss
index 8428e4e194..8428e4e194 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_html5-input-types.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_html5-input-types.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_position.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_position.scss
index 31a0699769..31a0699769 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_position.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_position.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_prefixer.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_prefixer.scss
index bac1aed2cc..bac1aed2cc 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_prefixer.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_prefixer.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_retina-image.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_retina-image.scss
index 3995c1970a..3995c1970a 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_retina-image.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_retina-image.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_size.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_size.scss
index 342e41b79f..342e41b79f 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_size.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_size.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_timing-functions.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_timing-functions.scss
index 5ecc6f9dcf..5ecc6f9dcf 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_timing-functions.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_timing-functions.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_triangle.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_triangle.scss
index 3b29e2c3c0..3b29e2c3c0 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_triangle.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_triangle.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_word-wrap.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_word-wrap.scss
index 9734a597cd..9734a597cd 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/addons/_word-wrap.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/addons/_word-wrap.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_animation.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_animation.scss
index 08c3dbf157..08c3dbf157 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_animation.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_animation.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_appearance.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_appearance.scss
index 3eb16e45de..3eb16e45de 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_appearance.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_appearance.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_backface-visibility.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_backface-visibility.scss
index 1161fe60dd..1161fe60dd 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_backface-visibility.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_backface-visibility.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_background-image.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_background-image.scss
index 17016b91b9..17016b91b9 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_background-image.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_background-image.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_background.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_background.scss
index 975f0a6e5f..975f0a6e5f 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_background.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_background.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_border-image.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_border-image.scss
index e552ee442e..e552ee442e 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_border-image.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_border-image.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_border-radius.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_border-radius.scss
index 7c17190109..7c17190109 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_border-radius.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_border-radius.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_box-sizing.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_box-sizing.scss
index f07e1d412e..f07e1d412e 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_box-sizing.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_box-sizing.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_calc.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_calc.scss
index 94d7e4cef3..94d7e4cef3 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_calc.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_calc.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_columns.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_columns.scss
index 96f601c1a8..96f601c1a8 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_columns.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_columns.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_filter.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_filter.scss
index 8560d77676..8560d77676 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_filter.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_filter.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_flex-box.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_flex-box.scss
index 34a3a0522b..34a3a0522b 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_flex-box.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_flex-box.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_font-face.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_font-face.scss
index fbf483fde9..fbf483fde9 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_font-face.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_font-face.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_font-feature-settings.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_font-feature-settings.scss
index 8a9f536775..8a9f536775 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_font-feature-settings.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_font-feature-settings.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_hidpi-media-query.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_hidpi-media-query.scss
index 111e4009b5..111e4009b5 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_hidpi-media-query.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_hidpi-media-query.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_hyphens.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_hyphens.scss
index 5f8bddafa5..5f8bddafa5 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_hyphens.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_hyphens.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_image-rendering.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_image-rendering.scss
index 03432c637d..03432c637d 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_image-rendering.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_image-rendering.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_inline-block.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_inline-block.scss
index 3272a0010b..3272a0010b 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_inline-block.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_inline-block.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_keyframes.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_keyframes.scss
index cc12be79bd..cc12be79bd 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_keyframes.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_keyframes.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_linear-gradient.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_linear-gradient.scss
index e0da35128b..e0da35128b 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_linear-gradient.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_linear-gradient.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_perspective.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_perspective.scss
index 0e4deb80f3..0e4deb80f3 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_perspective.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_perspective.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_placeholder.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_placeholder.scss
index 5682fd097a..5682fd097a 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_placeholder.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_placeholder.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_radial-gradient.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_radial-gradient.scss
index 7a8c3765f1..7a8c3765f1 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_radial-gradient.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_radial-gradient.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_transform.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_transform.scss
index 8cc35963d5..8cc35963d5 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_transform.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_transform.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_transition.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_transition.scss
index 5ad4c0aed2..5ad4c0aed2 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_transition.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_transition.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_user-select.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_user-select.scss
index 1380aa8baa..1380aa8baa 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/css3/_user-select.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/css3/_user-select.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_color-lightness.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_color-lightness.scss
index 8c6df4e256..8c6df4e256 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_color-lightness.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_color-lightness.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_flex-grid.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_flex-grid.scss
index 3bbd866573..3bbd866573 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_flex-grid.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_flex-grid.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_golden-ratio.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_golden-ratio.scss
index 463d14a00c..463d14a00c 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_golden-ratio.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_golden-ratio.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_grid-width.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_grid-width.scss
index 8e63d83d60..8e63d83d60 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_grid-width.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_grid-width.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_linear-gradient.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_linear-gradient.scss
index c8454d83f0..c8454d83f0 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_linear-gradient.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_linear-gradient.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_modular-scale.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_modular-scale.scss
index afc59eb954..afc59eb954 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_modular-scale.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_modular-scale.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_px-to-em.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_px-to-em.scss
index 4832245e45..4832245e45 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_px-to-em.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_px-to-em.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_px-to-rem.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_px-to-rem.scss
index 96b244e4cb..96b244e4cb 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_px-to-rem.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_px-to-rem.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_radial-gradient.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_radial-gradient.scss
index 4466a9c9af..4466a9c9af 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_radial-gradient.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_radial-gradient.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_strip-units.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_strip-units.scss
index 6afc6e601c..6afc6e601c 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_strip-units.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_strip-units.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_tint-shade.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_tint-shade.scss
index f7172004ac..f7172004ac 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_tint-shade.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_tint-shade.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_transition-property-name.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_transition-property-name.scss
index 49e621d63d..49e621d63d 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_transition-property-name.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_transition-property-name.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_unpack.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_unpack.scss
index 377596365c..377596365c 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/functions/_unpack.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/functions/_unpack.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/helpers/_gradient-positions-parser.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/helpers/_gradient-positions-parser.scss
index 07d30b6cf9..07d30b6cf9 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/helpers/_gradient-positions-parser.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/helpers/_gradient-positions-parser.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/helpers/_linear-positions-parser.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/helpers/_linear-positions-parser.scss
index d26383edce..d26383edce 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/helpers/_linear-positions-parser.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/helpers/_linear-positions-parser.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/helpers/_radial-arg-parser.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/helpers/_radial-arg-parser.scss
index a3a3704af5..a3a3704af5 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/helpers/_radial-arg-parser.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/helpers/_radial-arg-parser.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/helpers/_radial-positions-parser.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/helpers/_radial-positions-parser.scss
index 6a5b477778..6a5b477778 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/helpers/_radial-positions-parser.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/helpers/_radial-positions-parser.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/helpers/_render-gradients.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/helpers/_render-gradients.scss
index c145110a17..c145110a17 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/helpers/_render-gradients.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/helpers/_render-gradients.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/helpers/_shape-size-stripper.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/helpers/_shape-size-stripper.scss
index ee5eda4220..ee5eda4220 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/helpers/_shape-size-stripper.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/helpers/_shape-size-stripper.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/settings/_asset-pipeline.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/settings/_asset-pipeline.scss
index d481a6afb1..d481a6afb1 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/settings/_asset-pipeline.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/settings/_asset-pipeline.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/settings/_prefixer.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/settings/_prefixer.scss
index ecab49fb54..ecab49fb54 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/settings/_prefixer.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/settings/_prefixer.scss
diff --git a/WebContent/VAADIN/themes/valo/util/bourbon/settings/_px-to-em.scss b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/settings/_px-to-em.scss
index f2f9a3e8de..f2f9a3e8de 100644
--- a/WebContent/VAADIN/themes/valo/util/bourbon/settings/_px-to-em.scss
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/bourbon/settings/_px-to-em.scss
diff --git a/WebContent/VAADIN/themes/valo/util/readme.txt b/themes/src/main/themes/VAADIN/themes/valo/util/readme.txt
index 6da898220f..6da898220f 100644
--- a/WebContent/VAADIN/themes/valo/util/readme.txt
+++ b/themes/src/main/themes/VAADIN/themes/valo/util/readme.txt
diff --git a/uitest/build.xml b/uitest/build.xml
index 99c0302abc..335c837f5a 100644
--- a/uitest/build.xml
+++ b/uitest/build.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0"?>
 
-<project name="vaadin-uitest" basedir="." default="publish-local"
+<project name="vaadin-uitest" basedir="." default="test-tb3"
     xmlns:ivy="antlib:org.apache.ivy.ant">
     <description>
         Provides a uitest WAR containing Vaadin UI tests
     </description>
     <include file="../common.xml" as="common" />
-    <include file="../build.xml" as="vaadin" />
 
     <!-- global properties -->
     <property name="module.name" value="vaadin-uitest" />
@@ -16,195 +15,22 @@
     <property name="result.war"
         location="${result.dir}/lib/${module.name}-${vaadin.version}.war" />
 
-    <path id="classpath.compile.custom">
-    </path>
-
-    <target name="dependencies">
-        <!-- This is copied from common.xml to be able to add server.test.source 
-            to the source path -->
-
-        <ivy:resolve log="download-only" resolveid="common"
-            conf="build, build-provided" />
-        <ivy:cachepath pathid="classpath.compile.dependencies"
-            conf="build, build-provided" />
-    </target>
-
-    <target name="compile" description="Compiles the module"
-        depends="dependencies">
-
-        <fail unless="module.name" message="No module name given" />
-        <property name="result.dir" location="result" />
-        <property name="src" location="${result.dir}/../src" />
-        <property name="classes" location="${result.dir}/classes" />
-        <property name="server.test.sources" location="${result.dir}/../../server/tests/src" />
-        <mkdir dir="${classes}" />
-
-        <!-- TODO: Get rid of this -->
-        <javac destdir="${classes}" source="${vaadin.java.version}"
-            target="${vaadin.java.version}" debug="true" encoding="UTF-8"
-            includeantruntime="false">
-            <src path="${server.test.sources}" />
-            <include name="com/vaadin/tests/data/bean/**" />
-            <include name="com/vaadin/tests/VaadinClasses.java" />
-            <include
-                name="com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java" />
-            <classpath refid="classpath.compile.dependencies" />
-            <classpath refid="classpath.compile.custom" />
-        </javac>
-
-        <javac destdir="${classes}" source="${vaadin.java.version}"
-            target="${vaadin.java.version}" debug="true" encoding="UTF-8"
-            includeantruntime="false">
-            <src path="${src}" />
-            <classpath location="${classes}" />
-            <classpath refid="classpath.compile.dependencies" />
-            <classpath refid="classpath.compile.custom" />
-        </javac>
-    </target>
-
-    <target name="testing-widgetset" depends="dependencies,compile">
-        <property name="module"
-            value="com.vaadin.tests.widgetset.TestingWidgetSet" />
-        <property name="style" value="OBF" />
-        <property name="localWorkers" value="6" />
-        <property name="extraParams" value="" />
-        <property name="module.output.dir" location="${result.dir}/VAADIN/widgetsets" />
-        <property name="work.dir" location="${result.dir}/work" />
-
-        <mkdir dir="${module.output.dir}" />
-
-        <echo>Compiling ${module} to ${module.output.dir}</echo>
-
-        <!-- compile the module -->
-        <java classname="com.google.gwt.dev.Compiler" classpathref="classpath.compile.dependencies"
-            failonerror="yes" fork="yes" maxmemory="512m">
-            <classpath location="src" />
-            <classpath location="${classes}" />
-            <arg value="-workDir" />
-            <arg value="${work.dir}" />
-            <arg value="-logLevel" />
-            <arg value="TRACE" />
-            <arg value="-war" />
-            <arg value="${module.output.dir}" />
-            <arg value="-style" />
-            <arg value="${style}" />
-
-            <arg value="-localWorkers" />
-            <arg value="${localWorkers}" />
-            <arg value="-strict" />
-            <arg line="${extraParams}" />
-            <arg value="${module}" />
-
-            <sysproperty key="vFailIfNotSerializable" value="true" />
-
-            <jvmarg value="-Xss8M" />
-            <jvmarg value="-XX:MaxPermSize=256M" />
-            <jvmarg value="-Djava.awt.headless=true" />
-        </java>
-
-    </target>
-
-    <target name="war"
-        depends="dependencies, compile, compile-test-themes, testing-widgetset">
-        <property name="result.dir" location="result" />
-        <property name="classes" location="${result.dir}/classes" />
-        <property name="WebContent.dir" location="${vaadin.basedir}/WebContent" />
-        <property name="deps.dir" location="${result.dir}/deps" />
-        <property name="src" location="${result.dir}/../src" />
-
-        <ivy:resolve log="download-only" resolveid="common"
-            conf="build" />
-        <ivy:cachepath pathid="classpath.runtime.dependencies"
-            conf="build" />
-
-        <delete dir="${deps.dir}" />
-        <mkdir dir="${deps.dir}" />
-
-        <copy todir="${deps.dir}" flatten="true">
-            <path refid="classpath.runtime.dependencies" />
-        </copy>
-
-        <delete>
-            <!-- Avoid including some potentially conflicting jars in the 
-                war -->
-            <fileset dir="${deps.dir}" includes="jetty-*.jar" />
-            <fileset dir="${deps.dir}" includes="servlet-api-*.jar" />
-        </delete>
-
-        <war destfile="${result.war}" duplicate="fail" index="true">
-            <fileset dir="${common.jarfiles.dir}" />
-            <fileset dir="${result.dir}">
-                <include name="VAADIN/widgetsets/**/*" />
-                <include name="VAADIN/themes/tests-valo*/**" />
-            </fileset>
-            <fileset dir="${WebContent.dir}">
-                <include name="statictestfiles/**" />
-                <include name="VAADIN/themes/tests-*/**" />
-                <!-- Scss themes compiled and included above -->
-                <exclude name="VAADIN/themes/tests-valo*/**" />
-                <include name="VAADIN/themes/reindeer-tests/**" />
-                <include name="VAADIN/jquery.atmosphere.js" />
-                <include name="WEB-INF/*.xml" />
-                <include name="WEB-INF/web.xml.2.4" />
-            </fileset>
-            <classes dir="${classes}" />
-            <classes dir="${src}" />
-            <lib dir="${deps.dir}" />
-        </war>
-
-    </target>
-
-    <target name="publish-local" depends="war">
-        <antcall target="common.publish-local">
-            <param name="conf" value="build" />
-        </antcall>
-    </target>
+    <!-- Need to give a default value to keep Ivy happy -->
+    <property name="vaadin.build.repository" value="http://maven.vaadin.com/vaadin-prereleases"/>
 
     <target name="clean">
-        <antcall target="common.clean" />
-    </target>
-    <target name="checkstyle">
-        <echo>Checkstyle is disabled for uitest for now</echo>
-    </target>
-    <target name="test" depends="checkstyle">
+        <fail unless="result.dir" message="No result.dir parameter given" />
+        <delete dir="${result.dir}" />
     </target>
 
-    <target name="test-testbench" depends="clean-testbench-errors"
-        description="Run all TestBench based tests, including server tests">
-        <parallel>
-            <daemons>
-                <!-- Start server -->
-                <ant antfile="${uitest.dir}/vaadin-server.xml"
-                    inheritall="true" inheritrefs="true" target="deploy-and-start" />
-            </daemons>
-            <sequential>
-                <!-- Server tests -->
-
-                <!-- Sleep before running integration tests so testbench 
-                    2 tests have time to compile and start -->
-                <sleep minutes="4" />
-                <ant antfile="${uitest.dir}/integration_tests.xml"
-                    target="integration-test-all" inheritall="false"
-                    inheritrefs="false">
-                    <property name="demo.war" value="${war.file}" />
-                </ant>
-            </sequential>
-            <sequential>
-                <!-- Wait for server to start -->
-                <ant antfile="${uitest.dir}/vaadin-server.xml"
-                    target="wait-for-startup" />
-
-                    <!-- TestBench 3 tests -->
-                    <ant antfile="${uitest.dir}/tb3test.xml"
-                        target="run-all-tb3-tests" inheritall="true" />
-                    <echo message="TestBench 3 tests complete" />
-            </sequential>
-        </parallel>
+    <target name="fetch-war">
+        <mkdir dir="${vaadin.basedir}/uitest/target"/>
+        <get src="${vaadin.build.repository}/com/vaadin/vaadin-uitest/${vaadin.version}/vaadin-uitest-${vaadin.version}.war" dest="${vaadin.basedir}/uitest/target/vaadin-uitest-${vaadin.version}.war"/>
     </target>
 
     <target name="test-server" depends="clean-testbench-errors">
         <property name="war.file"
-            location="${vaadin.basedir}/result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />
+            location="${vaadin.basedir}/uitest/target/vaadin-uitest-${vaadin.version}.war" />
         <parallel>
             <daemons>
                 <ant antfile="${uitest.dir}/vaadin-server.xml"
@@ -222,7 +48,8 @@
 
     <target name="test-tb3" depends="clean-testbench-errors">
         <property name="war.file"
-            location="${vaadin.basedir}/result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />
+            location="${vaadin.basedir}/uitest/target/vaadin-uitest-${vaadin.version}.war" />
+        <mkdir dir="${vaadin.basedir}/result" />
         <parallel>
             <daemons>
                 <ant antfile="${uitest.dir}/vaadin-server.xml"
@@ -231,7 +58,7 @@
             <sequential>
                 <ant antfile="${uitest.dir}/vaadin-server.xml"
                     target="wait-for-startup" />
-                <ant antfile="${uitest.dir}/tb3test.xml" target="run-all-tb3-tests"
+            	<ant antfile="${uitest.dir}/tb3test.xml" target="run-all-tb3-tests"
                     inheritall="true" />
             </sequential>
         </parallel>
@@ -249,87 +76,5 @@
         </delete>
     </target>
 
-    <target name="compile-test-themes">
-        <antcall target="compile-theme">
-            <param name="theme" value="tests-valo" />
-        </antcall>
-        <antcall target="compile-theme">
-            <param name="theme" value="tests-valo-dark" />
-        </antcall>
-        <antcall target="compile-theme">
-            <param name="theme" value="tests-valo-metro" />
-        </antcall>
-        <antcall target="compile-theme">
-            <param name="theme" value="tests-valo-flat" />
-        </antcall>
-        <antcall target="compile-theme">
-            <param name="theme" value="tests-valo-flatdark" />
-        </antcall>
-        <antcall target="compile-theme">
-            <param name="theme" value="tests-valo-facebook" />
-        </antcall>
-        <antcall target="compile-theme">
-            <param name="theme" value="tests-valo-blueprint" />
-        </antcall>
-        <antcall target="compile-theme">
-            <param name="theme" value="tests-valo-light" />
-        </antcall>
-        <antcall target="compile-theme">
-            <param name="theme" value="tests-valo-disabled-animations" />
-        </antcall>
-        <antcall target="compile-theme">
-            <param name="theme" value="tests-valo-no-font-awesome" />
-        </antcall>
-
-    </target>
-    <target name="compile-theme" depends="copy-theme">
-        <fail unless="theme"
-            message="You must give the theme name to compile in the 'theme' parameter" />
-
-        <ivy:resolve log="download-only" resolveid="common"
-            conf="compile-theme" />
-        <ivy:cachepath pathid="classpath.compile.theme"
-            conf="compile-theme" />
-        <ivy:cachepath pathid="classpath.runtime.theme"
-            conf="build" />
-
-        <echo>Compiling ${theme}</echo>
-        <mkdir dir="${theme.result.dir}" />
-
-        <!-- compile the theme -->
-        <java classname="com.vaadin.buildhelpers.CompileTheme"
-            classpathref="classpath.compile.theme" failonerror="yes"
-            fork="yes" maxmemory="512m">
-            <arg value="--theme" />
-            <arg value="${theme}" />
-            <arg value="--theme-folder" />
-            <arg value="${theme.result.dir}" />
-            <arg value="--version" />
-            <arg value="${vaadin.version}" />
-            <jvmarg value="-Xss8M" />
-            <jvmarg value="-XX:MaxPermSize=256M" />
-            <jvmarg value="-Djava.awt.headless=true" />
-        </java>
-
-    </target>
-
-    <target name="copy-theme">
-        <fail unless="theme"
-            message="You must give the theme name to copy n the 'theme' parameter" />
-        <property name="theme.source.dir" location="../WebContent/VAADIN/themes" />
-
-        <copy todir="${theme.result.dir}">
-            <fileset dir="${theme.source.dir}">
-                <include name="${theme}/**/*.scss" />
-            </fileset>
-            <filterset refid="filter-vaadin.version" />
-        </copy>
-        <copy todir="${theme.result.dir}">
-            <fileset dir="${theme.source.dir}">
-                <exclude name="${theme}/**/*.scss" />
-            </fileset>
-        </copy>
-    </target>
-
 
 </project>
diff --git a/uitest/integration_tests.xml b/uitest/integration_tests.xml
index c69e3f123a..d83f077049 100644
--- a/uitest/integration_tests.xml
+++ b/uitest/integration_tests.xml
@@ -41,7 +41,8 @@
     <ivy:cachepath pathid="classpath.tb3.lib" conf="build, build-provided" />
     <path id="classpath.tb3">
         <path refid="classpath.tb3.lib" />
-        <path location="result/classes" />
+        <path location="target/classes" />
+        <path location="target/test-classes" />
     </path>
 
     <!-- Upload war to deploy to ssh host -->
diff --git a/uitest/ivy.xml b/uitest/ivy.xml
index e17e094f79..be1f7acc34 100644
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@ -13,113 +13,104 @@
     <configurations>
         <conf name="build" />
         <conf name="build-provided" visibility="private" />
-        <conf name="ide" visibility="private" />
         <conf name="jetty-run" visibility="private" />
-        <conf name="compile-theme" visibility="private" />
     </configurations>
-    <publications>
-        <artifact type="war" ext="war" />
-    </publications>
-    <dependencies defaultconf="build" defaultconfmapping="build,ide->default">
+    <dependencies defaultconf="build" defaultconfmapping="build->default">
         <!-- API DEPENDENCIES -->
         <dependency org="javax.portlet" name="portlet-api"
-            rev="2.0" conf="build-provided,ide -> default" />
+            rev="2.0" conf="build-provided -> default" />
 
         <dependency org="javax.validation" name="validation-api"
-            rev="1.0.0.GA" conf="build,ide -> default,sources" />
+            rev="1.0.0.GA" conf="build -> default,sources" />
         <dependency org="org.hibernate" name="hibernate-validator"
-            rev="4.2.0.Final" conf="build,ide -> default" />
+            rev="4.2.0.Final" conf="build -> default" />
         <!-- Google App Engine -->
         <dependency org="com.google.appengine" name="appengine-api-1.0-sdk"
-            rev="1.7.7" conf="build-provided,ide -> default" />
+            rev="1.7.7" conf="build-provided -> default" />
 
         <!-- LIBRARY DEPENDENCIES (compile time) -->
         <!-- Project modules -->
         <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" conf="build->build">
+            rev="${vaadin.version}" conf="build->default">
             <exclude org="javax.servlet"></exclude>
             <exclude type="pom" />
         </dependency>
         <dependency org="com.vaadin" name="vaadin-client"
-            rev="${vaadin.version}" conf="build->build">
+            rev="${vaadin.version}" conf="build->default">
+            <exclude org="javax.validation"></exclude>
             <exclude type="pom" />
         </dependency>
         <dependency org="com.vaadin" name="vaadin-client-compiled"
-            rev="${vaadin.version}" conf="build->build">
+            rev="${vaadin.version}" conf="build->default">
             <exclude type="pom" />
         </dependency>
         <dependency org="com.vaadin" name="vaadin-themes"
-            rev="${vaadin.version}" conf="build->build">
+            rev="${vaadin.version}" conf="build->default">
             <exclude type="pom" />
         </dependency>
         <dependency org="com.vaadin" name="vaadin-push" rev="${vaadin.version}"
-            conf="build->build">
+            conf="build->default">
             <exclude org="javax.servlet"></exclude>
             <exclude type="pom" />
         </dependency>
 
         <!-- For compiling TestingWidgetSet -->
         <dependency org="com.vaadin" name="vaadin-client-compiler"
-            rev="${vaadin.version}" conf="build-provided-> build">
+            rev="${vaadin.version}" conf="build-provided-> default">
             <exclude type="pom" />
         </dependency>
 
         <!-- Servlet 3.0 API -->
         <dependency org="javax.servlet" name="javax.servlet-api"
-            rev="3.0.1" conf="build-provided,ide -> default" />
+            rev="3.0.1" conf="build-provided -> default" />
 
         <dependency org="org.eclipse.jetty" name="jetty-server"
-            rev="&jetty.version;" conf="ide, build-provided, jetty-run->default">
+            rev="&jetty.version;" conf="build-provided, jetty-run->default">
             <exclude org="org.eclipse.jetty.orbit"></exclude>
         </dependency>
         <!-- jetty-servlets needed by ProxyTest, but not by jetty-runner -->
         <dependency org="org.eclipse.jetty" name="jetty-servlets"
-            rev="&jetty.version;" conf="ide, build-provided, jetty-run->default">
+            rev="&jetty.version;" conf="build-provided, jetty-run->default">
             <exclude org="org.eclipse.jetty.orbit"></exclude>
         </dependency>
         <dependency org="org.eclipse.jetty" name="jetty-websocket"
-            rev="&jetty.version;" conf="ide, build-provided, jetty-run->default">
+            rev="&jetty.version;" conf="build-provided, jetty-run->default">
             <exclude org="org.eclipse.jetty.orbit"></exclude>
         </dependency>
         <dependency org="org.eclipse.jetty" name="jetty-webapp"
-            rev="&jetty.version;" conf="ide, build-provided, jetty-run->default">
+            rev="&jetty.version;" conf="build-provided, jetty-run->default">
             <exclude org="org.eclipse.jetty.orbit"></exclude>
         </dependency>
         <dependency org="org.eclipse.jetty" name="jetty-util"
-            rev="&jetty.version;" conf="ide, build-provided, jetty-run->default">
+            rev="&jetty.version;" conf="build-provided, jetty-run->default">
             <exclude org="org.eclipse.jetty.orbit"></exclude>
         </dependency>
         <dependency org="org.mortbay.jetty" name="jetty-runner"
-            rev="&jetty.version;" conf="ide, build-provided, jetty-run->default">
+            rev="&jetty.version;" conf="build-provided, jetty-run->default">
             <exclude org="org.eclipse.jetty.orbit"></exclude>
         </dependency>
 
         <dependency org="junit" name="junit" rev="4.11"
-            conf="build,ide -> default" />
+            conf="build -> default" />
         <dependency org="org.hamcrest" name="hamcrest-all"
-            rev="1.3" conf="build,ide->default" />
+            rev="1.3" conf="build->default" />
         <dependency org="com.jcraft" name="jsch" rev="0.1.52"
-            conf="ide, build->default" />
+            conf="build->default" />
         <dependency org="commons-codec" name="commons-codec"
-            rev="1.5" conf="build,ide->default" />
+            rev="1.5" conf="build->default" />
         <dependency org="commons-io" name="commons-io"
-            rev="${commons-io.version}" conf="build,ide->default" />
+            rev="${commons-io.version}" conf="build->default" />
         <!-- Mainly for SQLContainer tests -->
         <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6"
-            conf="build,ide -> default" />
+            conf="build -> default" />
         <dependency org="com.vaadin" name="vaadin-testbench"
-            rev="4.0.3" conf="build-provided,ide -> default" />
+            rev="4.0.3" conf="build-provided -> default" />
         <!-- This should be removed once tests have been updated to use lang3 -->
         <dependency org="commons-lang" name="commons-lang"
-            rev="2.6" conf="build,ide -> default" />
+            rev="2.6" conf="build -> default" />
 
-        <dependency org="com.vaadin" name="vaadin-sass-compiler"
-            rev="${vaadin.sass.version}" conf="compile-theme->default" />
-
-        <dependency org="com.vaadin" name="vaadin-buildhelpers"
-            rev="${vaadin.version}" conf="compile-theme->build" />
         <dependency org="org.eclipse.jgit" name="org.eclipse.jgit"
-            rev="3.5.1.201410131835-r" conf="ide,build->default">
+            rev="3.5.1.201410131835-r" conf="build->default">
             <exclude org="org.apache.httpcomponents"></exclude>
         </dependency>
 
diff --git a/uitest/pom.xml b/uitest/pom.xml
new file mode 100644
index 0000000000..ab3d3db20c
--- /dev/null
+++ b/uitest/pom.xml
@@ -0,0 +1,379 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.vaadin</groupId>
+		<artifactId>vaadin-root</artifactId>
+		<version>7.7.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>vaadin-uitest</artifactId>
+	<name>vaadin-uitest</name>
+	<packaging>war</packaging>
+	<properties>
+		<jetty.version>8.1.12.v20130726</jetty.version>
+		<skip.uitest.deployment>true</skip.uitest.deployment>
+	</properties>
+
+	<url>https://vaadin.com/</url>
+	<description>Vaadin UI tests</description>
+
+	<repositories>
+		<repository>
+			<id>vaadin-addons</id>
+			<url>http://maven.vaadin.com/vaadin-addons</url>
+		</repository>
+	</repositories>
+
+	<dependencies>
+
+		<!-- API DEPENDENCIES -->
+		<dependency>
+			<groupId>javax.portlet</groupId>
+			<artifactId>portlet-api</artifactId>
+			<version>2.0</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>1.0.0.GA</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>4.2.0.Final</version>
+		</dependency>
+		<!-- Google App Engine -->
+		<dependency>
+			<groupId>com.google.appengine</groupId>
+			<artifactId>appengine-api-1.0-sdk</artifactId>
+			<version>1.7.7</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- LIBRARY DEPENDENCIES (compile time) -->
+		<!-- Project modules -->
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-server</artifactId>
+			<version>${project.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.servlet</groupId>
+					<artifactId>javax.servlet-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-client</artifactId>
+			<version>${project.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.validation</groupId>
+					<artifactId>javax.servlet-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-client-compiled</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-themes</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-push</artifactId>
+			<version>${project.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.validation</groupId>
+					<artifactId>javax.servlet-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<!-- For compiling TestingWidgetSet -->
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-client-compiler</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- Servlet 3.0 API -->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.0.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-server</artifactId>
+			<version>${jetty.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.eclipse.jetty</groupId>
+					<artifactId>orbit</artifactId>
+				</exclusion>
+			</exclusions>
+			<scope>provided</scope>
+		</dependency>
+		<!-- jetty-servlets needed by ProxyTest, but not by jetty-runner -->
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-servlets</artifactId>
+			<version>${jetty.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.eclipse.jetty</groupId>
+					<artifactId>orbit</artifactId>
+				</exclusion>
+			</exclusions>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-websocket</artifactId>
+			<version>${jetty.version}</version>
+
+			<exclusions>
+				<exclusion>
+					<groupId>org.eclipse.jetty</groupId>
+					<artifactId>orbit</artifactId>
+				</exclusion>
+			</exclusions>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-webapp</artifactId>
+			<version>${jetty.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.eclipse.jetty</groupId>
+					<artifactId>orbit</artifactId>
+				</exclusion>
+			</exclusions>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-util</artifactId>
+			<version>${jetty.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.eclipse.jetty</groupId>
+					<artifactId>orbit</artifactId>
+				</exclusion>
+			</exclusions>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>jetty-runner</artifactId>
+			<version>${jetty.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.eclipse.jetty</groupId>
+					<artifactId>orbit</artifactId>
+				</exclusion>
+			</exclusions>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.11</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-all</artifactId>
+			<version>1.3</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.jcraft</groupId>
+			<artifactId>jsch</artifactId>
+			<version>0.1.52</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.5</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>${commons-io.version}</version>
+		</dependency>
+		<!-- Mainly for SQLContainer tests -->
+		<dependency>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<version>2.2.6</version>
+		</dependency>
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-testbench</artifactId>
+			<version>4.0.3</version>
+            <scope>test</scope>
+		</dependency>
+		<!-- This should be removed once tests have been updated to use lang3 -->
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.6</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.vaadin</groupId>
+			<artifactId>vaadin-sass-compiler</artifactId>
+			<version>${vaadin.sass.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jgit</groupId>
+			<artifactId>org.eclipse.jgit</artifactId>
+			<version>3.5.1.201410131835-r</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.httpcomponents</groupId>
+					<artifactId>httpclient</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>com.vaadin</groupId>
+				<artifactId>vaadin-maven-plugin</artifactId>
+				<configuration>
+					<warSourceDirectory>${project.build.directory}/compile-themes</warSourceDirectory>
+					<webappDirectory>${project.build.directory}/${project.build.finalName}/VAADIN/widgetsets</webappDirectory>
+					<persistentunitcachedir>${project.build.directory}/gwt-unitCache</persistentunitcachedir>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>compile</goal>
+							<goal>compile-theme</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.mortbay.jetty</groupId>
+				<artifactId>jetty-maven-plugin</artifactId>
+				<version>${jetty.version}</version>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-theme-sources</id>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/compile-themes</outputDirectory>
+							<resources>
+								<resource>
+									<directory>src/main/themes</directory>
+									<filtering>false</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+					<execution>
+						<id>copy-compiled-themes</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${project.build.directory}/compile-themes</directory>
+									<filtering>false</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-install-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>${skip.uitest.deployment}</skip>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>animal-sniffer-maven-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.sonatype.plugins</groupId>
+					<artifactId>nexus-staging-maven-plugin</artifactId>
+					<configuration>
+						<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+					</configuration>
+				</plugin>
+				<plugin>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<configuration>
+						<skip>true</skip>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+
+	<profiles>
+		<profile>
+			<!-- Profile used to deploy the uitest war for testing -->
+			<id>dev-build</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<properties>
+				<skip.uitest.deployment>false</skip.uitest.deployment>
+			</properties>
+		</profile>
+	</profiles>
+
+</project>
diff --git a/uitest/src/main/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java b/uitest/src/main/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java
new file mode 100755
index 0000000000..e03e970048
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.data.util.sqlcontainer;
+
+import com.vaadin.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;
+import com.vaadin.data.util.sqlcontainer.query.generator.MSSQLGenerator;
+import com.vaadin.data.util.sqlcontainer.query.generator.OracleGenerator;
+import com.vaadin.data.util.sqlcontainer.query.generator.SQLGenerator;
+
+public class SQLTestsConstants {
+
+    /* Set the DB used for testing here! */
+    public enum DB {
+        HSQLDB, MYSQL, POSTGRESQL, MSSQL, ORACLE;
+    }
+
+    /* 0 = HSQLDB, 1 = MYSQL, 2 = POSTGRESQL, 3 = MSSQL, 4 = ORACLE */
+    public static final DB db = DB.HSQLDB;
+
+    /* Auto-increment column offset (HSQLDB = 0, MYSQL = 1, POSTGRES = 1) */
+    public static int offset;
+    /* Garbage table creation query (=three queries for oracle) */
+    public static String createGarbage;
+    public static String createGarbageSecond;
+    public static String createGarbageThird;
+    /* DB Drivers, urls, usernames and passwords */
+    public static String dbDriver;
+    public static String dbURL;
+    public static String dbUser;
+    public static String dbPwd;
+    /* People -test table creation statement(s) */
+    public static String peopleFirst;
+    public static String peopleSecond;
+    public static String peopleThird;
+    /* Schema test creation statement(s) */
+    public static String createSchema;
+    public static String createProductTable;
+    public static String dropSchema;
+    /* Versioned -test table createion statement(s) */
+    public static String[] versionStatements;
+    /* SQL Generator used during the testing */
+    public static SQLGenerator sqlGen;
+
+    /* Set DB-specific settings based on selected DB */
+    static {
+        sqlGen = new DefaultSQLGenerator();
+        switch (db) {
+        case HSQLDB:
+            offset = 0;
+            createGarbage = "create table garbage (id integer generated always as identity, type varchar(32), PRIMARY KEY(id))";
+            dbDriver = "org.hsqldb.jdbc.JDBCDriver";
+            dbURL = "jdbc:hsqldb:mem:sqlcontainer";
+            dbUser = "SA";
+            dbPwd = "";
+            peopleFirst = "create table people (id integer generated always as identity, name varchar(32), AGE INTEGER)";
+            peopleSecond = "alter table people add primary key (id)";
+            versionStatements = new String[] {
+                    "create table versioned (id integer generated always as identity, text varchar(255), version tinyint default 0)",
+                    "alter table versioned add primary key (id)" };
+            // TODO these should ideally exist for all databases
+            createSchema = "create schema oaas authorization DBA";
+            createProductTable = "create table oaas.product (\"ID\" integer generated always as identity primary key, \"NAME\" VARCHAR(32))";
+            dropSchema = "drop schema if exists oaas cascade";
+            break;
+        case MYSQL:
+            offset = 1;
+            createGarbage = "create table GARBAGE (ID integer auto_increment, type varchar(32), PRIMARY KEY(ID))";
+            dbDriver = "com.mysql.jdbc.Driver";
+            dbURL = "jdbc:mysql:///sqlcontainer";
+            dbUser = "sqlcontainer";
+            dbPwd = "sqlcontainer";
+            peopleFirst = "create table PEOPLE (ID integer auto_increment not null, NAME varchar(32), AGE INTEGER, primary key(ID))";
+            peopleSecond = null;
+            versionStatements = new String[] {
+                    "create table VERSIONED (ID integer auto_increment not null, TEXT varchar(255), VERSION tinyint default 0, primary key(ID))",
+                    "CREATE TRIGGER upd_version BEFORE UPDATE ON VERSIONED"
+                            + " FOR EACH ROW SET NEW.VERSION = OLD.VERSION+1" };
+            break;
+        case POSTGRESQL:
+            offset = 1;
+            createGarbage = "create table GARBAGE (\"ID\" serial PRIMARY KEY, \"TYPE\" varchar(32))";
+            dbDriver = "org.postgresql.Driver";
+            dbURL = "jdbc:postgresql://localhost:5432/test";
+            dbUser = "postgres";
+            dbPwd = "postgres";
+            peopleFirst = "create table PEOPLE (\"ID\" serial primary key, \"NAME\" VARCHAR(32), \"AGE\" INTEGER)";
+            peopleSecond = null;
+            versionStatements = new String[] {
+                    "create table VERSIONED (\"ID\" serial primary key, \"TEXT\" VARCHAR(255), \"VERSION\" INTEGER DEFAULT 0)",
+                    "CREATE OR REPLACE FUNCTION zz_row_version() RETURNS TRIGGER AS $$"
+                            + "BEGIN"
+                            + "   IF TG_OP = 'UPDATE'"
+                            + "       AND NEW.\"VERSION\" = old.\"VERSION\""
+                            + "       AND ROW(NEW.*) IS DISTINCT FROM ROW (old.*)"
+                            + "   THEN"
+                            + "       NEW.\"VERSION\" := NEW.\"VERSION\" + 1;"
+                            + "   END IF;" + "   RETURN NEW;" + "END;"
+                            + "$$ LANGUAGE plpgsql;",
+                    "CREATE TRIGGER \"mytable_modify_dt_tr\" BEFORE UPDATE"
+                            + "   ON VERSIONED FOR EACH ROW"
+                            + "   EXECUTE PROCEDURE \"public\".\"zz_row_version\"();" };
+            createSchema = "create schema oaas";
+            createProductTable = "create table oaas.product (\"ID\" serial primary key, \"NAME\" VARCHAR(32))";
+            dropSchema = "drop schema oaas cascade";
+            break;
+        case MSSQL:
+            offset = 1;
+            createGarbage = "create table GARBAGE (\"ID\" int identity(1,1) primary key, \"TYPE\" varchar(32))";
+            dbDriver = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
+            dbURL = "jdbc:sqlserver://localhost:1433;databaseName=tempdb;";
+            dbUser = "sa";
+            dbPwd = "sa";
+            peopleFirst = "create table PEOPLE (\"ID\" int identity(1,1) primary key, \"NAME\" VARCHAR(32), \"AGE\" INTEGER)";
+            peopleSecond = null;
+            versionStatements = new String[] { "create table VERSIONED (\"ID\" int identity(1,1) primary key, \"TEXT\" VARCHAR(255), \"VERSION\" rowversion not null)" };
+            sqlGen = new MSSQLGenerator();
+            break;
+        case ORACLE:
+            offset = 1;
+            createGarbage = "create table GARBAGE (\"ID\" integer primary key, \"TYPE\" varchar2(32))";
+            createGarbageSecond = "create sequence garbage_seq start with 1 increment by 1 nomaxvalue";
+            createGarbageThird = "create trigger garbage_trigger before insert on GARBAGE for each row begin select garbage_seq.nextval into :new.ID from dual; end;";
+            dbDriver = "oracle.jdbc.OracleDriver";
+            dbURL = "jdbc:oracle:thin:test/test@localhost:1521:XE";
+            dbUser = "test";
+            dbPwd = "test";
+            peopleFirst = "create table PEOPLE (\"ID\" integer primary key, \"NAME\" VARCHAR2(32), \"AGE\" INTEGER)";
+            peopleSecond = "create sequence people_seq start with 1 increment by 1 nomaxvalue";
+            peopleThird = "create trigger people_trigger before insert on PEOPLE for each row begin select people_seq.nextval into :new.ID from dual; end;";
+            versionStatements = new String[] {
+                    "create table VERSIONED (\"ID\" integer primary key, \"TEXT\" VARCHAR(255), \"VERSION\" INTEGER DEFAULT 0)",
+                    "create sequence versioned_seq start with 1 increment by 1 nomaxvalue",
+                    "create trigger versioned_trigger before insert on VERSIONED for each row begin select versioned_seq.nextval into :new.ID from dual; end;",
+                    "create sequence versioned_version start with 1 increment by 1 nomaxvalue",
+                    "create trigger versioned_version_trigger before insert or update on VERSIONED for each row begin select versioned_version.nextval into :new.VERSION from dual; end;" };
+            sqlGen = new OracleGenerator();
+            break;
+        }
+    }
+
+}
diff --git a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java
index 34c82ae4ed..34c82ae4ed 100644
--- a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
+++ b/uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java
diff --git a/uitest/src/com/vaadin/launcher/CustomDeploymentConfiguration.java b/uitest/src/main/java/com/vaadin/launcher/CustomDeploymentConfiguration.java
index da903c13e0..da903c13e0 100644
--- a/uitest/src/com/vaadin/launcher/CustomDeploymentConfiguration.java
+++ b/uitest/src/main/java/com/vaadin/launcher/CustomDeploymentConfiguration.java
diff --git a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java b/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java
index aa2c63393b..8f86c2d288 100644
--- a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
+++ b/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java
@@ -61,7 +61,7 @@ import com.vaadin.launcher.util.BrowserLauncher;
  */
 public class DevelopmentServerLauncher {
 
-    private static final String KEYSTORE = "uitest/src/com/vaadin/launcher/keystore";
+    private static final String KEYSTORE = "src/main/resources/com/vaadin/launcher/keystore";
     private final static int serverPort = 8888;
 
     /**
@@ -142,7 +142,7 @@ public class DevelopmentServerLauncher {
             String mode) throws Exception {
 
         // Assign default values for some arguments
-        assignDefault(serverArgs, "webroot", "WebContent");
+        assignDefault(serverArgs, "webroot", "src/main/webapp");
         assignDefault(serverArgs, "httpPort", "" + serverPort);
         assignDefault(serverArgs, "context", "");
         assignDefault(serverArgs, "slowdown", "/run/APP/PUBLISHED/js_label.js");
diff --git a/uitest/src/com/vaadin/launcher/util/BrowserLauncher.java b/uitest/src/main/java/com/vaadin/launcher/util/BrowserLauncher.java
index 04c6a46e64..04c6a46e64 100644
--- a/uitest/src/com/vaadin/launcher/util/BrowserLauncher.java
+++ b/uitest/src/main/java/com/vaadin/launcher/util/BrowserLauncher.java
diff --git a/uitest/src/com/vaadin/screenshotbrowser/ScreenshotBrowser.java b/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java
index 7ed96b38d8..a3fc282131 100644
--- a/uitest/src/com/vaadin/screenshotbrowser/ScreenshotBrowser.java
+++ b/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java
@@ -398,7 +398,7 @@ public class ScreenshotBrowser extends UI {
 
     private static File findScreenshotDir() {
         File propertiesFile = new File(
-                "work/eclipse-run-selected-test.properties");
+                "../work/eclipse-run-selected-test.properties");
         if (!propertiesFile.exists()) {
             throw new RuntimeException("File "
                     + propertiesFile.getAbsolutePath() + " not found.");
diff --git a/uitest/src/com/vaadin/tests/Components.java b/uitest/src/main/java/com/vaadin/tests/Components.java
index 7f024e774a..7f024e774a 100644
--- a/uitest/src/com/vaadin/tests/Components.java
+++ b/uitest/src/main/java/com/vaadin/tests/Components.java
diff --git a/uitest/src/com/vaadin/tests/CurrentTimeMillis.java b/uitest/src/main/java/com/vaadin/tests/CurrentTimeMillis.java
index 0937c53864..0937c53864 100644
--- a/uitest/src/com/vaadin/tests/CurrentTimeMillis.java
+++ b/uitest/src/main/java/com/vaadin/tests/CurrentTimeMillis.java
diff --git a/uitest/src/com/vaadin/tests/CustomLayoutDemo.java b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
index 7b9f3d9926..7b9f3d9926 100644
--- a/uitest/src/com/vaadin/tests/CustomLayoutDemo.java
+++ b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
diff --git a/uitest/src/com/vaadin/tests/FocusingComponents.java b/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java
index f63989fafb..f63989fafb 100644
--- a/uitest/src/com/vaadin/tests/FocusingComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java
diff --git a/uitest/src/com/vaadin/tests/LayoutDemo.java b/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java
index c62a9ea51b..c62a9ea51b 100644
--- a/uitest/src/com/vaadin/tests/LayoutDemo.java
+++ b/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java
diff --git a/uitest/src/com/vaadin/tests/ListenerOrder.java b/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java
index 8375b75f4b..8375b75f4b 100644
--- a/uitest/src/com/vaadin/tests/ListenerOrder.java
+++ b/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java
diff --git a/uitest/src/com/vaadin/tests/ModalWindow.java b/uitest/src/main/java/com/vaadin/tests/ModalWindow.java
index 559fc5ca0e..559fc5ca0e 100644
--- a/uitest/src/com/vaadin/tests/ModalWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/ModalWindow.java
diff --git a/uitest/src/com/vaadin/tests/NativeWindowing.java b/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java
index b646655c35..b646655c35 100644
--- a/uitest/src/com/vaadin/tests/NativeWindowing.java
+++ b/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java
diff --git a/uitest/src/com/vaadin/tests/OrderedLayoutSwapComponents.java b/uitest/src/main/java/com/vaadin/tests/OrderedLayoutSwapComponents.java
index 1474afe28c..1474afe28c 100644
--- a/uitest/src/com/vaadin/tests/OrderedLayoutSwapComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/OrderedLayoutSwapComponents.java
diff --git a/uitest/src/com/vaadin/tests/Parameters.java b/uitest/src/main/java/com/vaadin/tests/Parameters.java
index 7e71c4dc76..7e71c4dc76 100644
--- a/uitest/src/com/vaadin/tests/Parameters.java
+++ b/uitest/src/main/java/com/vaadin/tests/Parameters.java
diff --git a/uitest/src/com/vaadin/tests/PerformanceTestBasicComponentRendering.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
index c58c73753f..c58c73753f 100644
--- a/uitest/src/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
+++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
diff --git a/uitest/src/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
index 08f8bc4d7a..08f8bc4d7a 100644
--- a/uitest/src/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
+++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
diff --git a/uitest/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java
index a6f112cff0..a6f112cff0 100644
--- a/uitest/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java
+++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java
diff --git a/uitest/src/com/vaadin/tests/RandomLayoutStress.java b/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java
index e9f04a4c85..e9f04a4c85 100644
--- a/uitest/src/com/vaadin/tests/RandomLayoutStress.java
+++ b/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java
diff --git a/uitest/src/com/vaadin/tests/ScrollbarStressTest.java b/uitest/src/main/java/com/vaadin/tests/ScrollbarStressTest.java
index c72817ac41..c72817ac41 100644
--- a/uitest/src/com/vaadin/tests/ScrollbarStressTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/ScrollbarStressTest.java
diff --git a/uitest/src/com/vaadin/tests/StressComponentsInTable.java b/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java
index 84c9d70299..84c9d70299 100644
--- a/uitest/src/com/vaadin/tests/StressComponentsInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java
diff --git a/uitest/src/com/vaadin/tests/TableChangingDatasource.java b/uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java
index 162c850fb5..162c850fb5 100644
--- a/uitest/src/com/vaadin/tests/TableChangingDatasource.java
+++ b/uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java
diff --git a/uitest/src/com/vaadin/tests/TableSelectTest.java b/uitest/src/main/java/com/vaadin/tests/TableSelectTest.java
index 61c93d0eae..61c93d0eae 100644
--- a/uitest/src/com/vaadin/tests/TableSelectTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/TableSelectTest.java
diff --git a/uitest/src/com/vaadin/tests/TestBench.java b/uitest/src/main/java/com/vaadin/tests/TestBench.java
index bd01fa2087..bd01fa2087 100644
--- a/uitest/src/com/vaadin/tests/TestBench.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestBench.java
diff --git a/uitest/src/com/vaadin/tests/TestCaptionWrapper.java b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java
index edd70ece4e..edd70ece4e 100644
--- a/uitest/src/com/vaadin/tests/TestCaptionWrapper.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java
diff --git a/uitest/src/com/vaadin/tests/TestComponentAddAndRecursion.java b/uitest/src/main/java/com/vaadin/tests/TestComponentAddAndRecursion.java
index d431562c8e..d431562c8e 100644
--- a/uitest/src/com/vaadin/tests/TestComponentAddAndRecursion.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestComponentAddAndRecursion.java
diff --git a/uitest/src/com/vaadin/tests/TestContainerChanges.java b/uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java
index 0e03606cd8..0e03606cd8 100644
--- a/uitest/src/com/vaadin/tests/TestContainerChanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java
diff --git a/uitest/src/com/vaadin/tests/TestDateField.java b/uitest/src/main/java/com/vaadin/tests/TestDateField.java
index b5611b8246..b5611b8246 100644
--- a/uitest/src/com/vaadin/tests/TestDateField.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestDateField.java
diff --git a/uitest/src/com/vaadin/tests/TestForAlignments.java b/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java
index 7927b7f0ee..7927b7f0ee 100644
--- a/uitest/src/com/vaadin/tests/TestForAlignments.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java
diff --git a/uitest/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
index d6c72ee8e9..d6c72ee8e9 100644
--- a/uitest/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
diff --git a/uitest/src/com/vaadin/tests/TestForBasicApplicationLayout.java b/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java
index 705f2e1766..705f2e1766 100644
--- a/uitest/src/com/vaadin/tests/TestForBasicApplicationLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java
diff --git a/uitest/src/com/vaadin/tests/TestForChildComponentRendering.java b/uitest/src/main/java/com/vaadin/tests/TestForChildComponentRendering.java
index e07d00a04f..e07d00a04f 100644
--- a/uitest/src/com/vaadin/tests/TestForChildComponentRendering.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForChildComponentRendering.java
diff --git a/uitest/src/com/vaadin/tests/TestForContainerFilterable.java b/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java
index f5edc40c56..f5edc40c56 100644
--- a/uitest/src/com/vaadin/tests/TestForContainerFilterable.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java
diff --git a/uitest/src/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java b/uitest/src/main/java/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
index ba7d59fb2b..ba7d59fb2b 100644
--- a/uitest/src/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
diff --git a/uitest/src/com/vaadin/tests/TestForMultipleStyleNames.java b/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java
index a4f2dcd106..a4f2dcd106 100644
--- a/uitest/src/com/vaadin/tests/TestForMultipleStyleNames.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java
diff --git a/uitest/src/com/vaadin/tests/TestForNativeWindowing.java b/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java
index a9faeb8f38..a9faeb8f38 100644
--- a/uitest/src/com/vaadin/tests/TestForNativeWindowing.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java
diff --git a/uitest/src/com/vaadin/tests/TestForPreconfiguredComponents.java b/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java
index b8d1c17241..b8d1c17241 100644
--- a/uitest/src/com/vaadin/tests/TestForPreconfiguredComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java
diff --git a/uitest/src/com/vaadin/tests/TestForRichTextEditor.java b/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java
index 1963dfbf12..1963dfbf12 100644
--- a/uitest/src/com/vaadin/tests/TestForRichTextEditor.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java
diff --git a/uitest/src/com/vaadin/tests/TestForStyledUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
index de79dba2f6..de79dba2f6 100644
--- a/uitest/src/com/vaadin/tests/TestForStyledUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
diff --git a/uitest/src/com/vaadin/tests/TestForTabSheet.java b/uitest/src/main/java/com/vaadin/tests/TestForTabSheet.java
index 8d5fe71ed3..8d5fe71ed3 100644
--- a/uitest/src/com/vaadin/tests/TestForTabSheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForTabSheet.java
diff --git a/uitest/src/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java b/uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
index cfd7f58866..cfd7f58866 100644
--- a/uitest/src/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
diff --git a/uitest/src/com/vaadin/tests/TestForTrees.java b/uitest/src/main/java/com/vaadin/tests/TestForTrees.java
index 67f7faf44e..67f7faf44e 100644
--- a/uitest/src/com/vaadin/tests/TestForTrees.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForTrees.java
diff --git a/uitest/src/com/vaadin/tests/TestForUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
index 0046457f30..0046457f30 100644
--- a/uitest/src/com/vaadin/tests/TestForUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
diff --git a/uitest/src/com/vaadin/tests/TestForWindowOpen.java b/uitest/src/main/java/com/vaadin/tests/TestForWindowOpen.java
index 5de80fd833..5de80fd833 100644
--- a/uitest/src/com/vaadin/tests/TestForWindowOpen.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForWindowOpen.java
diff --git a/uitest/src/com/vaadin/tests/TestForWindowing.java b/uitest/src/main/java/com/vaadin/tests/TestForWindowing.java
index 02d1e21d5a..02d1e21d5a 100644
--- a/uitest/src/com/vaadin/tests/TestForWindowing.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForWindowing.java
diff --git a/uitest/src/com/vaadin/tests/TestIFrames.java b/uitest/src/main/java/com/vaadin/tests/TestIFrames.java
index 244ea10dfa..244ea10dfa 100644
--- a/uitest/src/com/vaadin/tests/TestIFrames.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestIFrames.java
diff --git a/uitest/src/com/vaadin/tests/TestMethodProperty.java b/uitest/src/main/java/com/vaadin/tests/TestMethodProperty.java
index ab9c416a5c..ab9c416a5c 100644
--- a/uitest/src/com/vaadin/tests/TestMethodProperty.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestMethodProperty.java
diff --git a/uitest/src/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java b/uitest/src/main/java/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
index 84ea616e3f..84ea616e3f 100644
--- a/uitest/src/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
diff --git a/uitest/src/com/vaadin/tests/TestSetVisibleAndCaching.java b/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java
index b8ade0d8b6..b8ade0d8b6 100644
--- a/uitest/src/com/vaadin/tests/TestSetVisibleAndCaching.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java
diff --git a/uitest/src/com/vaadin/tests/TestSizeableIncomponents.java b/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java
index 90b9088f76..90b9088f76 100644
--- a/uitest/src/com/vaadin/tests/TestSizeableIncomponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java
diff --git a/uitest/src/com/vaadin/tests/TestSplitPanel.java b/uitest/src/main/java/com/vaadin/tests/TestSplitPanel.java
index 0266bcc108..0266bcc108 100644
--- a/uitest/src/com/vaadin/tests/TestSplitPanel.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestSplitPanel.java
diff --git a/uitest/src/com/vaadin/tests/TreeFilesystem.java b/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java
index 238e7bf317..238e7bf317 100644
--- a/uitest/src/com/vaadin/tests/TreeFilesystem.java
+++ b/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java
diff --git a/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java
index 55e57a7d92..55e57a7d92 100644
--- a/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java
diff --git a/uitest/src/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java b/uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
index 833087029d..833087029d 100644
--- a/uitest/src/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
diff --git a/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java b/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java
index 85da6d671f..85da6d671f 100644
--- a/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java
diff --git a/uitest/src/main/java/com/vaadin/tests/VaadinClasses.java b/uitest/src/main/java/com/vaadin/tests/VaadinClasses.java
new file mode 100644
index 0000000000..99416cfff1
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/VaadinClasses.java
@@ -0,0 +1,183 @@
+package com.vaadin.tests;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Modifier;
+import java.net.JarURLConnection;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.jar.JarEntry;
+
+import com.vaadin.server.VaadinSession;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.DragAndDropWrapper;
+import com.vaadin.ui.HorizontalSplitPanel;
+import com.vaadin.ui.LoginForm;
+import com.vaadin.ui.PopupView;
+import com.vaadin.ui.UI;
+import com.vaadin.ui.VerticalSplitPanel;
+import com.vaadin.ui.Window;
+
+@SuppressWarnings("deprecation")
+public class VaadinClasses {
+
+    public static List<Class<? extends Component>> getComponents() {
+        try {
+            return findClasses(Component.class, "com.vaadin.ui");
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+    
+    public static List<Class<? extends ComponentContainer>> getComponentContainers() {
+        try {
+            return findClasses(ComponentContainer.class, "com.vaadin.ui");
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static List<Class<? extends ComponentContainer>> getComponentContainersSupportingAddRemoveComponent() {
+        List<Class<? extends ComponentContainer>> classes = getComponentContainers();
+        classes.remove(PopupView.class);
+        classes.remove(CustomComponent.class);
+        classes.remove(DragAndDropWrapper.class);
+        classes.remove(CustomComponent.class);
+        classes.remove(LoginForm.class);
+        classes.remove(UI.class);
+
+        return classes;
+    }
+
+    public static List<Class<? extends ComponentContainer>> getComponentContainersSupportingUnlimitedNumberOfComponents() {
+        List<Class<? extends ComponentContainer>> classes = getComponentContainersSupportingAddRemoveComponent();
+        classes.remove(VerticalSplitPanel.class);
+        classes.remove(HorizontalSplitPanel.class);
+        classes.remove(Window.class);
+
+        return classes;
+    }
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public static List<Class<?>> getBasicComponentTests() {
+        try {
+            // Given as name to avoid dependencies on testbench source folder
+            return (List) findClasses(
+                    Class.forName("com.vaadin.tests.components.AbstractComponentTest"),
+                    "com.vaadin.tests.components");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+
+    }
+
+    private static <T> List<Class<? extends T>> findClasses(Class<T> baseClass,
+            String basePackage) throws IOException {
+        return findClasses(baseClass, basePackage, new String[] {});
+    }
+
+    private static <T> List<Class<? extends T>> findClasses(Class<T> baseClass,
+            String basePackage, String[] ignoredPackages) throws IOException {
+        List<Class<? extends T>> classes = new ArrayList<Class<? extends T>>();
+        String basePackageDirName = "/" + basePackage.replace('.', '/');
+        URL location = VaadinSession.class.getResource(basePackageDirName);
+        if (location.getProtocol().equals("file")) {
+            try {
+                File f = new File(location.toURI());
+                if (!f.exists()) {
+                    throw new IOException("Directory " + f.toString()
+                            + " does not exist");
+                }
+                findPackages(f, basePackage, baseClass, classes,
+                        ignoredPackages);
+            } catch (URISyntaxException e) {
+                throw new IOException(e.getMessage());
+            }
+        } else if (location.getProtocol().equals("jar")) {
+            JarURLConnection juc = (JarURLConnection) location.openConnection();
+            findPackages(juc, basePackage, baseClass, classes);
+        }
+
+        Collections.sort(classes, new Comparator<Class<? extends T>>() {
+
+            @Override
+            public int compare(Class<? extends T> o1, Class<? extends T> o2) {
+                return o1.getName().compareTo(o2.getName());
+            }
+
+        });
+        return classes;
+    }
+
+    private static <T> void findPackages(JarURLConnection juc,
+            String javaPackage, Class<T> baseClass,
+            Collection<Class<? extends T>> result) throws IOException {
+        String prefix = "com/vaadin/ui";
+        Enumeration<JarEntry> ent = juc.getJarFile().entries();
+        while (ent.hasMoreElements()) {
+            JarEntry e = ent.nextElement();
+            if (e.getName().endsWith(".class")
+                    && e.getName().startsWith(prefix)) {
+                String fullyQualifiedClassName = e.getName().replace('/', '.')
+                        .replace(".class", "");
+                addClassIfMatches(result, fullyQualifiedClassName, baseClass);
+            }
+        }
+    }
+
+    private static <T> void findPackages(File parent, String javaPackage,
+            Class<T> baseClass, Collection<Class<? extends T>> result,
+            String[] ignoredPackages) {
+        for (String ignoredPackage : ignoredPackages) {
+            if (javaPackage.equals(ignoredPackage)) {
+                return;
+            }
+        }
+
+        for (File file : parent.listFiles()) {
+            if (file.isDirectory()) {
+                findPackages(file, javaPackage + "." + file.getName(),
+                        baseClass, result, ignoredPackages);
+            } else if (file.getName().endsWith(".class")) {
+                String fullyQualifiedClassName = javaPackage + "."
+                        + file.getName().replace(".class", "");
+                addClassIfMatches(result, fullyQualifiedClassName, baseClass);
+            }
+        }
+
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <T> void addClassIfMatches(
+            Collection<Class<? extends T>> result,
+            String fullyQualifiedClassName, Class<T> baseClass) {
+        try {
+            // Try to load the class
+
+            Class<?> c = Class.forName(fullyQualifiedClassName);
+            if (baseClass.isAssignableFrom(c)
+                    && !Modifier.isAbstract(c.getModifiers())
+                    && !c.isAnonymousClass() && !c.isMemberClass()
+                    && !c.isLocalClass()) {
+                result.add((Class<? extends T>) c);
+            }
+        } catch (Exception e) {
+            // Could ignore that class cannot be loaded
+            e.printStackTrace();
+        } catch (LinkageError e) {
+            // Ignore. Client side classes will at least throw LinkageErrors
+        }
+
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/VerifyAssertionsEnabled.java b/uitest/src/main/java/com/vaadin/tests/VerifyAssertionsEnabled.java
index aa757e5f24..aa757e5f24 100644
--- a/uitest/src/com/vaadin/tests/VerifyAssertionsEnabled.java
+++ b/uitest/src/main/java/com/vaadin/tests/VerifyAssertionsEnabled.java
diff --git a/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java b/uitest/src/main/java/com/vaadin/tests/VerifyBrowserVersion.java
index 1b21f08aa7..1b21f08aa7 100644
--- a/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java
+++ b/uitest/src/main/java/com/vaadin/tests/VerifyBrowserVersion.java
diff --git a/uitest/src/com/vaadin/tests/VerifyJreVersion.java b/uitest/src/main/java/com/vaadin/tests/VerifyJreVersion.java
index 025a66f022..025a66f022 100644
--- a/uitest/src/com/vaadin/tests/VerifyJreVersion.java
+++ b/uitest/src/main/java/com/vaadin/tests/VerifyJreVersion.java
diff --git a/uitest/src/com/vaadin/tests/accessibility/WindowWaiAriaRoles.java b/uitest/src/main/java/com/vaadin/tests/accessibility/WindowWaiAriaRoles.java
index c015b65e1f..c015b65e1f 100644
--- a/uitest/src/com/vaadin/tests/accessibility/WindowWaiAriaRoles.java
+++ b/uitest/src/main/java/com/vaadin/tests/accessibility/WindowWaiAriaRoles.java
diff --git a/uitest/src/com/vaadin/tests/actions/ActionsOnInvisibleComponents.java b/uitest/src/main/java/com/vaadin/tests/actions/ActionsOnInvisibleComponents.java
index 0f4c179cee..0f4c179cee 100644
--- a/uitest/src/com/vaadin/tests/actions/ActionsOnInvisibleComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/actions/ActionsOnInvisibleComponents.java
diff --git a/uitest/src/com/vaadin/tests/actions/ActionsWithoutKeyCode.java b/uitest/src/main/java/com/vaadin/tests/actions/ActionsWithoutKeyCode.java
index e94a4b1ade..e94a4b1ade 100644
--- a/uitest/src/com/vaadin/tests/actions/ActionsWithoutKeyCode.java
+++ b/uitest/src/main/java/com/vaadin/tests/actions/ActionsWithoutKeyCode.java
diff --git a/uitest/src/com/vaadin/tests/appengine/GAESyncTest.java b/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java
index 146e85f5f3..146e85f5f3 100644
--- a/uitest/src/com/vaadin/tests/appengine/GAESyncTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java
diff --git a/uitest/src/com/vaadin/tests/application/ApplicationCloseTest.java b/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java
index f1548ea6c2..f1548ea6c2 100644
--- a/uitest/src/com/vaadin/tests/application/ApplicationCloseTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java
diff --git a/uitest/src/com/vaadin/tests/application/CommErrorEmulatorServlet.java b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorServlet.java
index 116ef1c1f2..116ef1c1f2 100644
--- a/uitest/src/com/vaadin/tests/application/CommErrorEmulatorServlet.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorServlet.java
diff --git a/uitest/src/com/vaadin/tests/application/CommErrorEmulatorUI.java b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java
index 080d36fa48..080d36fa48 100644
--- a/uitest/src/com/vaadin/tests/application/CommErrorEmulatorUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java
diff --git a/uitest/src/com/vaadin/tests/application/ConfirmBrowserTabClose.java b/uitest/src/main/java/com/vaadin/tests/application/ConfirmBrowserTabClose.java
index 3d3d84f9bd..3d3d84f9bd 100644
--- a/uitest/src/com/vaadin/tests/application/ConfirmBrowserTabClose.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ConfirmBrowserTabClose.java
diff --git a/uitest/src/com/vaadin/tests/application/CriticalNotifications.java b/uitest/src/main/java/com/vaadin/tests/application/CriticalNotifications.java
index 14b4cb62e9..14b4cb62e9 100644
--- a/uitest/src/com/vaadin/tests/application/CriticalNotifications.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/CriticalNotifications.java
diff --git a/uitest/src/com/vaadin/tests/application/DeploymentConfiguration.java b/uitest/src/main/java/com/vaadin/tests/application/DeploymentConfiguration.java
index 9c95479bec..9c95479bec 100644
--- a/uitest/src/com/vaadin/tests/application/DeploymentConfiguration.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/DeploymentConfiguration.java
diff --git a/uitest/src/com/vaadin/tests/application/DetachOldUIOnReload.java b/uitest/src/main/java/com/vaadin/tests/application/DetachOldUIOnReload.java
index a7c9239fae..a7c9239fae 100644
--- a/uitest/src/com/vaadin/tests/application/DetachOldUIOnReload.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/DetachOldUIOnReload.java
diff --git a/uitest/src/com/vaadin/tests/application/ErrorInUnloadEvent.java b/uitest/src/main/java/com/vaadin/tests/application/ErrorInUnloadEvent.java
index a09c4c845a..a09c4c845a 100644
--- a/uitest/src/com/vaadin/tests/application/ErrorInUnloadEvent.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ErrorInUnloadEvent.java
diff --git a/uitest/src/com/vaadin/tests/application/HelloWorld.java b/uitest/src/main/java/com/vaadin/tests/application/HelloWorld.java
index 28115c0cb9..28115c0cb9 100644
--- a/uitest/src/com/vaadin/tests/application/HelloWorld.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/HelloWorld.java
diff --git a/uitest/src/com/vaadin/tests/application/MissingHierarchyDetection.java b/uitest/src/main/java/com/vaadin/tests/application/MissingHierarchyDetection.java
index 508ac818f6..508ac818f6 100644
--- a/uitest/src/com/vaadin/tests/application/MissingHierarchyDetection.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/MissingHierarchyDetection.java
diff --git a/uitest/src/com/vaadin/tests/application/NavigateWithOngoingXHR.java b/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java
index d32ecb583d..d32ecb583d 100644
--- a/uitest/src/com/vaadin/tests/application/NavigateWithOngoingXHR.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/NavigateWithOngoingXHR.java
diff --git a/uitest/src/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java b/uitest/src/main/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java
index de45d2bccb..de45d2bccb 100644
--- a/uitest/src/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeat.java
diff --git a/uitest/src/com/vaadin/tests/application/ReconnectDialogUI.java b/uitest/src/main/java/com/vaadin/tests/application/ReconnectDialogUI.java
index 62de2d49c5..62de2d49c5 100644
--- a/uitest/src/com/vaadin/tests/application/ReconnectDialogUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ReconnectDialogUI.java
diff --git a/uitest/src/com/vaadin/tests/application/RefreshStatePreserve.java b/uitest/src/main/java/com/vaadin/tests/application/RefreshStatePreserve.java
index e7f81167d9..e7f81167d9 100644
--- a/uitest/src/com/vaadin/tests/application/RefreshStatePreserve.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/RefreshStatePreserve.java
diff --git a/uitest/src/com/vaadin/tests/application/RefreshStatePreserveTitle.java b/uitest/src/main/java/com/vaadin/tests/application/RefreshStatePreserveTitle.java
index ff9c84a20a..ff9c84a20a 100644
--- a/uitest/src/com/vaadin/tests/application/RefreshStatePreserveTitle.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/RefreshStatePreserveTitle.java
diff --git a/uitest/src/com/vaadin/tests/application/ResynchronizeAfterAsyncRemoval.java b/uitest/src/main/java/com/vaadin/tests/application/ResynchronizeAfterAsyncRemoval.java
index d8f7fface3..d8f7fface3 100644
--- a/uitest/src/com/vaadin/tests/application/ResynchronizeAfterAsyncRemoval.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ResynchronizeAfterAsyncRemoval.java
diff --git a/uitest/src/com/vaadin/tests/application/ResynchronizeUI.java b/uitest/src/main/java/com/vaadin/tests/application/ResynchronizeUI.java
index 62331ec95e..62331ec95e 100644
--- a/uitest/src/com/vaadin/tests/application/ResynchronizeUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ResynchronizeUI.java
diff --git a/uitest/src/com/vaadin/tests/application/TerminalErrorNotification.java b/uitest/src/main/java/com/vaadin/tests/application/TerminalErrorNotification.java
index 7dbfa8cf40..7dbfa8cf40 100644
--- a/uitest/src/com/vaadin/tests/application/TerminalErrorNotification.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/TerminalErrorNotification.java
diff --git a/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java b/uitest/src/main/java/com/vaadin/tests/application/ThreadLocalInstances.java
index ed611117d0..ed611117d0 100644
--- a/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ThreadLocalInstances.java
diff --git a/uitest/src/com/vaadin/tests/application/TimingInfoReported.java b/uitest/src/main/java/com/vaadin/tests/application/TimingInfoReported.java
index 83d31b184e..83d31b184e 100644
--- a/uitest/src/com/vaadin/tests/application/TimingInfoReported.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/TimingInfoReported.java
diff --git a/uitest/src/com/vaadin/tests/application/VaadinSessionAttribute.java b/uitest/src/main/java/com/vaadin/tests/application/VaadinSessionAttribute.java
index c8fc96f596..c8fc96f596 100644
--- a/uitest/src/com/vaadin/tests/application/VaadinSessionAttribute.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/VaadinSessionAttribute.java
diff --git a/uitest/src/com/vaadin/tests/application/WebBrowserSize.java b/uitest/src/main/java/com/vaadin/tests/application/WebBrowserSize.java
index 0ce8e95290..0ce8e95290 100644
--- a/uitest/src/com/vaadin/tests/application/WebBrowserSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/WebBrowserSize.java
diff --git a/uitest/src/com/vaadin/tests/application/WebBrowserTimeZone.java b/uitest/src/main/java/com/vaadin/tests/application/WebBrowserTimeZone.java
index 5253b0b0e7..52d61c89c9 100644
--- a/uitest/src/com/vaadin/tests/application/WebBrowserTimeZone.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/WebBrowserTimeZone.java
@@ -5,13 +5,11 @@ import java.util.Date;
 import java.util.TimeZone;
 
 import com.vaadin.server.VaadinRequest;
-import com.vaadin.testbench.annotations.RunLocally;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
 
-@RunLocally
 public class WebBrowserTimeZone extends AbstractTestUI {
 
     @Override
diff --git a/uitest/src/com/vaadin/tests/application/calculator/Calc.java b/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java
index 3059017faa..3059017faa 100644
--- a/uitest/src/com/vaadin/tests/application/calculator/Calc.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java
diff --git a/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionId.java b/uitest/src/main/java/com/vaadin/tests/applicationcontext/ChangeSessionId.java
index 93e9464054..93e9464054 100644
--- a/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionId.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationcontext/ChangeSessionId.java
diff --git a/uitest/src/com/vaadin/tests/applicationcontext/CleanupBrokenUI.java b/uitest/src/main/java/com/vaadin/tests/applicationcontext/CleanupBrokenUI.java
index 4af4f23bfa..4af4f23bfa 100644
--- a/uitest/src/com/vaadin/tests/applicationcontext/CleanupBrokenUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationcontext/CleanupBrokenUI.java
diff --git a/uitest/src/com/vaadin/tests/applicationcontext/CloseSession.java b/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseSession.java
index cca76cc9e3..cca76cc9e3 100644
--- a/uitest/src/com/vaadin/tests/applicationcontext/CloseSession.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseSession.java
diff --git a/uitest/src/com/vaadin/tests/applicationcontext/CloseUI.java b/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseUI.java
index 8f2cddd529..8f2cddd529 100644
--- a/uitest/src/com/vaadin/tests/applicationcontext/CloseUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationcontext/CloseUI.java
diff --git a/uitest/src/com/vaadin/tests/applicationcontext/UIRunSafelyThread.java b/uitest/src/main/java/com/vaadin/tests/applicationcontext/UIRunSafelyThread.java
index a7edd2c0d0..a7edd2c0d0 100644
--- a/uitest/src/com/vaadin/tests/applicationcontext/UIRunSafelyThread.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationcontext/UIRunSafelyThread.java
diff --git a/uitest/src/com/vaadin/tests/applicationservlet/CustomDeploymentConf.java b/uitest/src/main/java/com/vaadin/tests/applicationservlet/CustomDeploymentConf.java
index 8ae7715a77..8ae7715a77 100644
--- a/uitest/src/com/vaadin/tests/applicationservlet/CustomDeploymentConf.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationservlet/CustomDeploymentConf.java
diff --git a/uitest/src/com/vaadin/tests/applicationservlet/DisableSendUrlAsParameters.java b/uitest/src/main/java/com/vaadin/tests/applicationservlet/DisableSendUrlAsParameters.java
index d398ead622..d398ead622 100644
--- a/uitest/src/com/vaadin/tests/applicationservlet/DisableSendUrlAsParameters.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationservlet/DisableSendUrlAsParameters.java
diff --git a/uitest/src/com/vaadin/tests/applicationservlet/InitParamUIProvider.java b/uitest/src/main/java/com/vaadin/tests/applicationservlet/InitParamUIProvider.java
index 3750fdd370..3750fdd370 100644
--- a/uitest/src/com/vaadin/tests/applicationservlet/InitParamUIProvider.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationservlet/InitParamUIProvider.java
diff --git a/uitest/src/com/vaadin/tests/applicationservlet/NoMainWindow.java b/uitest/src/main/java/com/vaadin/tests/applicationservlet/NoMainWindow.java
index fc72b86a34..fc72b86a34 100644
--- a/uitest/src/com/vaadin/tests/applicationservlet/NoMainWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationservlet/NoMainWindow.java
diff --git a/uitest/src/com/vaadin/tests/applicationservlet/SessionExpiration.java b/uitest/src/main/java/com/vaadin/tests/applicationservlet/SessionExpiration.java
index 206e763497..206e763497 100644
--- a/uitest/src/com/vaadin/tests/applicationservlet/SessionExpiration.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationservlet/SessionExpiration.java
diff --git a/uitest/src/com/vaadin/tests/applicationservlet/SystemMessages.java b/uitest/src/main/java/com/vaadin/tests/applicationservlet/SystemMessages.java
index 9912e660ef..9912e660ef 100644
--- a/uitest/src/com/vaadin/tests/applicationservlet/SystemMessages.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationservlet/SystemMessages.java
diff --git a/uitest/src/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.java b/uitest/src/main/java/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.java
index a7920b5410..a7920b5410 100644
--- a/uitest/src/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.java
diff --git a/uitest/src/com/vaadin/tests/components/AbstractComponentContainerTest.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java
index 146e996eaf..146e996eaf 100644
--- a/uitest/src/com/vaadin/tests/components/AbstractComponentContainerTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java
diff --git a/uitest/src/com/vaadin/tests/components/AbstractComponentTest.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTest.java
index d033443a2c..d033443a2c 100644
--- a/uitest/src/com/vaadin/tests/components/AbstractComponentTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTest.java
diff --git a/uitest/src/com/vaadin/tests/components/AbstractComponentTestCase.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java
index 8666956bdb..8666956bdb 100644
--- a/uitest/src/com/vaadin/tests/components/AbstractComponentTestCase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java
diff --git a/uitest/src/com/vaadin/tests/components/AbstractLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractLayoutTest.java
index 56c04180b8..56c04180b8 100644
--- a/uitest/src/com/vaadin/tests/components/AbstractLayoutTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractLayoutTest.java
diff --git a/uitest/src/com/vaadin/tests/components/AbstractOrderedLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutTest.java
index 1d18cba952..1d18cba952 100644
--- a/uitest/src/com/vaadin/tests/components/AbstractOrderedLayoutTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutTest.java
diff --git a/uitest/src/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptions.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptions.java
index c5dcba7e7b..c5dcba7e7b 100644
--- a/uitest/src/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptions.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptions.java
diff --git a/uitest/src/com/vaadin/tests/components/AbstractTestCase.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractTestCase.java
index 1f117a8ea8..1f117a8ea8 100644
--- a/uitest/src/com/vaadin/tests/components/AbstractTestCase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractTestCase.java
diff --git a/uitest/src/com/vaadin/tests/components/AbstractTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUI.java
index 33ff504d8d..33ff504d8d 100644
--- a/uitest/src/com/vaadin/tests/components/AbstractTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUI.java
diff --git a/uitest/src/com/vaadin/tests/components/AbstractTestUIProvider.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUIProvider.java
index 9ad6bbf56f..9ad6bbf56f 100644
--- a/uitest/src/com/vaadin/tests/components/AbstractTestUIProvider.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUIProvider.java
diff --git a/uitest/src/com/vaadin/tests/components/AbstractTestUIWithLog.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUIWithLog.java
index 6f97cbba05..6f97cbba05 100644
--- a/uitest/src/com/vaadin/tests/components/AbstractTestUIWithLog.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUIWithLog.java
diff --git a/uitest/src/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java b/uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java
index c619ceb200..c619ceb200 100644
--- a/uitest/src/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ComponentTestCase.java b/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java
index 9bb01cd56f..9bb01cd56f 100644
--- a/uitest/src/com/vaadin/tests/components/ComponentTestCase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java
diff --git a/uitest/src/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java b/uitest/src/main/java/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java
index 853f2863ef..853f2863ef 100644
--- a/uitest/src/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java
diff --git a/uitest/src/com/vaadin/tests/components/DeclarativeTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/DeclarativeTestUI.java
index 568c484760..568c484760 100644
--- a/uitest/src/com/vaadin/tests/components/DeclarativeTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/DeclarativeTestUI.java
diff --git a/uitest/src/com/vaadin/tests/components/DisableEnableCascade.java b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascade.java
index cd284224a0..cd284224a0 100644
--- a/uitest/src/com/vaadin/tests/components/DisableEnableCascade.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascade.java
diff --git a/uitest/src/com/vaadin/tests/components/DisableEnableCascadeStyles.java b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java
index 7c5f0c9282..7c5f0c9282 100644
--- a/uitest/src/com/vaadin/tests/components/DisableEnableCascadeStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java
diff --git a/uitest/src/com/vaadin/tests/components/ErrorMessages.java b/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java
index 0e8dcc210b..0e8dcc210b 100644
--- a/uitest/src/com/vaadin/tests/components/ErrorMessages.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java
diff --git a/uitest/src/com/vaadin/tests/components/FileDownloaderUI.java b/uitest/src/main/java/com/vaadin/tests/components/FileDownloaderUI.java
index b1379080e9..b1379080e9 100644
--- a/uitest/src/com/vaadin/tests/components/FileDownloaderUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/FileDownloaderUI.java
diff --git a/uitest/src/com/vaadin/tests/components/FocusAndBlurListeners.java b/uitest/src/main/java/com/vaadin/tests/components/FocusAndBlurListeners.java
index 7987c800f9..7987c800f9 100644
--- a/uitest/src/com/vaadin/tests/components/FocusAndBlurListeners.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/FocusAndBlurListeners.java
diff --git a/uitest/src/com/vaadin/tests/components/FocusFromShortcutAction.java b/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java
index cffc8ca27b..cffc8ca27b 100644
--- a/uitest/src/com/vaadin/tests/components/FocusFromShortcutAction.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java
diff --git a/uitest/src/com/vaadin/tests/components/HierarchicalContainerSorting.java b/uitest/src/main/java/com/vaadin/tests/components/HierarchicalContainerSorting.java
index ec33b8f0e3..ec33b8f0e3 100644
--- a/uitest/src/com/vaadin/tests/components/HierarchicalContainerSorting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/HierarchicalContainerSorting.java
diff --git a/uitest/src/com/vaadin/tests/components/HierarchyChangeForRemovedComponentContainers.java b/uitest/src/main/java/com/vaadin/tests/components/HierarchyChangeForRemovedComponentContainers.java
index 4a9c46409e..4a9c46409e 100644
--- a/uitest/src/com/vaadin/tests/components/HierarchyChangeForRemovedComponentContainers.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/HierarchyChangeForRemovedComponentContainers.java
diff --git a/uitest/src/com/vaadin/tests/components/LayoutAttachListenerInfo.java b/uitest/src/main/java/com/vaadin/tests/components/LayoutAttachListenerInfo.java
index e118558528..e118558528 100644
--- a/uitest/src/com/vaadin/tests/components/LayoutAttachListenerInfo.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/LayoutAttachListenerInfo.java
diff --git a/uitest/src/com/vaadin/tests/components/MultipleDebugIds.java b/uitest/src/main/java/com/vaadin/tests/components/MultipleDebugIds.java
index 4633b4f1cd..4633b4f1cd 100644
--- a/uitest/src/com/vaadin/tests/components/MultipleDebugIds.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/MultipleDebugIds.java
diff --git a/uitest/src/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayout.java b/uitest/src/main/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayout.java
index 9f63970f85..9f63970f85 100644
--- a/uitest/src/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayout.java
diff --git a/uitest/src/com/vaadin/tests/components/OutOfSync.java b/uitest/src/main/java/com/vaadin/tests/components/OutOfSync.java
index 8cefffc9d1..8cefffc9d1 100644
--- a/uitest/src/com/vaadin/tests/components/OutOfSync.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/OutOfSync.java
diff --git a/uitest/src/com/vaadin/tests/components/SaneErrors.java b/uitest/src/main/java/com/vaadin/tests/components/SaneErrors.java
index b82c1dd18b..b82c1dd18b 100644
--- a/uitest/src/com/vaadin/tests/components/SaneErrors.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/SaneErrors.java
diff --git a/uitest/src/com/vaadin/tests/components/TestBase.java b/uitest/src/main/java/com/vaadin/tests/components/TestBase.java
index 15f39f6e5d..15f39f6e5d 100644
--- a/uitest/src/com/vaadin/tests/components/TestBase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/TestBase.java
diff --git a/uitest/src/com/vaadin/tests/components/TooltipDelay.java b/uitest/src/main/java/com/vaadin/tests/components/TooltipDelay.java
index 06fec3b233..06fec3b233 100644
--- a/uitest/src/com/vaadin/tests/components/TooltipDelay.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/TooltipDelay.java
diff --git a/uitest/src/com/vaadin/tests/components/TooltipPosition.java b/uitest/src/main/java/com/vaadin/tests/components/TooltipPosition.java
index 30222722d9..30222722d9 100644
--- a/uitest/src/com/vaadin/tests/components/TooltipPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/TooltipPosition.java
diff --git a/uitest/src/com/vaadin/tests/components/TooltipsOnScrollingWindow.java b/uitest/src/main/java/com/vaadin/tests/components/TooltipsOnScrollingWindow.java
index a38f9c274e..a38f9c274e 100644
--- a/uitest/src/com/vaadin/tests/components/TooltipsOnScrollingWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/TooltipsOnScrollingWindow.java
diff --git a/uitest/src/com/vaadin/tests/components/TouchDevicesTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/TouchDevicesTooltip.java
index 764d5a49a3..764d5a49a3 100644
--- a/uitest/src/com/vaadin/tests/components/TouchDevicesTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/TouchDevicesTooltip.java
diff --git a/uitest/src/com/vaadin/tests/components/TouchScrollables.java b/uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java
index 1af1cc82e9..1af1cc82e9 100644
--- a/uitest/src/com/vaadin/tests/components/TouchScrollables.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java
diff --git a/uitest/src/com/vaadin/tests/components/UnknownComponentConnector.java b/uitest/src/main/java/com/vaadin/tests/components/UnknownComponentConnector.java
index 982ff8d71e..982ff8d71e 100644
--- a/uitest/src/com/vaadin/tests/components/UnknownComponentConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/UnknownComponentConnector.java
diff --git a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.java b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.java
index f6bff579a3..f6bff579a3 100644
--- a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.java
diff --git a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutCorrectPositioningOfHiddenField.java b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutCorrectPositioningOfHiddenField.java
index 42ea6158fd..42ea6158fd 100644
--- a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutCorrectPositioningOfHiddenField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutCorrectPositioningOfHiddenField.java
diff --git a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java
index 8b76b0e4e1..8b76b0e4e1 100644
--- a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java
diff --git a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutPrimaryStylename.java b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutPrimaryStylename.java
index b75d5931b5..b75d5931b5 100644
--- a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutPrimaryStylename.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutPrimaryStylename.java
diff --git a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java
index 4e1c8f5ca2..4e1c8f5ca2 100644
--- a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java
diff --git a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.java b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.java
index 810a583ba5..810a583ba5 100644
--- a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.java
diff --git a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutWrapperStyles.java b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutWrapperStyles.java
index 11d9f9c850..11d9f9c850 100644
--- a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutWrapperStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutWrapperStyles.java
diff --git a/uitest/src/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java
index c14cda58f1..c14cda58f1 100644
--- a/uitest/src/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
index 777eb4b518..777eb4b518 100644
--- a/uitest/src/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/ChangeHierarchyBeforeResponse.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ChangeHierarchyBeforeResponse.java
index e6daf8356c..e6daf8356c 100644
--- a/uitest/src/com/vaadin/tests/components/abstractcomponent/ChangeHierarchyBeforeResponse.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ChangeHierarchyBeforeResponse.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/ContextClickUI.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ContextClickUI.java
index f412be726a..f412be726a 100644
--- a/uitest/src/com/vaadin/tests/components/abstractcomponent/ContextClickUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ContextClickUI.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/EnableState.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/EnableState.java
index b299490d03..b299490d03 100644
--- a/uitest/src/com/vaadin/tests/components/abstractcomponent/EnableState.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/EnableState.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java
index 1a15e7c5ae..1a15e7c5ae 100644
--- a/uitest/src/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java
index 5924ab7d32..5924ab7d32 100644
--- a/uitest/src/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/ResponseWritingErrorHandling.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ResponseWritingErrorHandling.java
index 23be0f62b4..23be0f62b4 100644
--- a/uitest/src/com/vaadin/tests/components/abstractcomponent/ResponseWritingErrorHandling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/ResponseWritingErrorHandling.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/TooltipTests.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/TooltipTests.java
index 01c7ab83ae..01c7ab83ae 100644
--- a/uitest/src/com/vaadin/tests/components/abstractcomponent/TooltipTests.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/TooltipTests.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/UseStateFromHierachy.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/UseStateFromHierachy.java
index 0697286f38..0697286f38 100644
--- a/uitest/src/com/vaadin/tests/components/abstractcomponent/UseStateFromHierachy.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/UseStateFromHierachy.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSource.java b/uitest/src/main/java/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSource.java
index e6b51399e9..e6b51399e9 100644
--- a/uitest/src/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSource.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java
index 2eef498aff..2eef498aff 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
index 0aaa7c5f13..0aaa7c5f13 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java
index f1b96d24fd..f1b96d24fd 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
index 496a44a6c1..496a44a6c1 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java
index 1f407c710f..1f407c710f 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java
index d4b2f89522..d4b2f89522 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java
index aa8c7ff778..aa8c7ff778 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/DoubleInTextField.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java
index 4fd81081ea..4fd81081ea 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/DoubleInTextField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java
index 716c1d4348..716c1d4348 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java
index 01fcb02b77..01fcb02b77 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java
index 929247fc80..929247fc80 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java
index 56e593ce0f..56e593ce0f 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java
index d6e8d72297..d6e8d72297 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/ShortcutWhenBodyFocused.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/ShortcutWhenBodyFocused.java
index 41a5febc16..41a5febc16 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/ShortcutWhenBodyFocused.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/ShortcutWhenBodyFocused.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/TextFieldConversions.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/TextFieldConversions.java
index 888922b69d..888922b69d 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/TextFieldConversions.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/TextFieldConversions.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java
index 33359cc2c6..33359cc2c6 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java
diff --git a/uitest/src/com/vaadin/tests/components/accordion/AccordionAddTab.java b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionAddTab.java
index 46fdbac797..46fdbac797 100644
--- a/uitest/src/com/vaadin/tests/components/accordion/AccordionAddTab.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionAddTab.java
diff --git a/uitest/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java
index 00aadb58da..00aadb58da 100644
--- a/uitest/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java
diff --git a/uitest/src/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.java b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.java
index bd7f047fc7..bd7f047fc7 100644
--- a/uitest/src/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.java
diff --git a/uitest/src/com/vaadin/tests/components/accordion/AccordionRemoveComponent.java b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionRemoveComponent.java
index 80e0929f8d..80e0929f8d 100644
--- a/uitest/src/com/vaadin/tests/components/accordion/AccordionRemoveComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionRemoveComponent.java
diff --git a/uitest/src/com/vaadin/tests/components/accordion/AccordionRemoveTab.java b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionRemoveTab.java
index af54e15b5a..af54e15b5a 100644
--- a/uitest/src/com/vaadin/tests/components/accordion/AccordionRemoveTab.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionRemoveTab.java
diff --git a/uitest/src/com/vaadin/tests/components/accordion/AccordionTabIds.java b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionTabIds.java
index 31bd8d99fb..31bd8d99fb 100644
--- a/uitest/src/com/vaadin/tests/components/accordion/AccordionTabIds.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionTabIds.java
diff --git a/uitest/src/com/vaadin/tests/components/accordion/AccordionTabStylenames.java b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionTabStylenames.java
index 1412ae6289..1412ae6289 100644
--- a/uitest/src/com/vaadin/tests/components/accordion/AccordionTabStylenames.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionTabStylenames.java
diff --git a/uitest/src/com/vaadin/tests/components/accordion/AccordionTest.java b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionTest.java
index 5c47610ae5..5c47610ae5 100644
--- a/uitest/src/com/vaadin/tests/components/accordion/AccordionTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/accordion/RemoveTabs.java b/uitest/src/main/java/com/vaadin/tests/components/accordion/RemoveTabs.java
index e82336c1e8..e82336c1e8 100644
--- a/uitest/src/com/vaadin/tests/components/accordion/RemoveTabs.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/accordion/RemoveTabs.java
diff --git a/uitest/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java b/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java
index 254779f872..254779f872 100644
--- a/uitest/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java
diff --git a/uitest/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java b/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
index 605ab676b6..605ab676b6 100644
--- a/uitest/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
diff --git a/uitest/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java b/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java
index 20becea974..20becea974 100644
--- a/uitest/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java
diff --git a/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbars.java b/uitest/src/main/java/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbars.java
index 5151ad5dd3..5151ad5dd3 100644
--- a/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbars.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbars.java
diff --git a/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameIsVisible.java b/uitest/src/main/java/com/vaadin/tests/components/browserframe/BrowserFrameIsVisible.java
index 4e9c133bea..4e9c133bea 100644
--- a/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameIsVisible.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/browserframe/BrowserFrameIsVisible.java
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonClick.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonClick.java
index 9b10473d0f..9b10473d0f 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonClick.java
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java
index 0d4981a441..0d4981a441 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonErrorMessage.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonErrorMessage.java
index b27f948669..b27f948669 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonErrorMessage.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonErrorMessage.java
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonHtml.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonHtml.java
index 5cdc34e8e8..5cdc34e8e8 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonHtml.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonHtml.java
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonIOSDragTest.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonIOSDragTest.java
index 6031bff152..6031bff152 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonIOSDragTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonIOSDragTest.java
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonKeyboardClick.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonKeyboardClick.java
index 35e9f737c6..35e9f737c6 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonKeyboardClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonKeyboardClick.java
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonMouseDetails.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonMouseDetails.java
index 1b6a81551a..1b6a81551a 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonMouseDetails.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonMouseDetails.java
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonTabIndex.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java
index cfec4d1100..cfec4d1100 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonTabIndex.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonToggleIcons.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonToggleIcons.java
index 9e37fef7d9..9e37fef7d9 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonToggleIcons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonToggleIcons.java
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonUndefinedWidth.java
index e8a2e10d9a..e8a2e10d9a 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonUndefinedWidth.java
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonUpdateAltText.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonUpdateAltText.java
index dd89d1b9a7..dd89d1b9a7 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonUpdateAltText.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonUpdateAltText.java
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonWithShortcutNotRendered.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonWithShortcutNotRendered.java
index f866928054..f866928054 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonWithShortcutNotRendered.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonWithShortcutNotRendered.java
diff --git a/uitest/src/com/vaadin/tests/components/button/Buttons.java b/uitest/src/main/java/com/vaadin/tests/components/button/Buttons.java
index 573c95c2b8..573c95c2b8 100644
--- a/uitest/src/com/vaadin/tests/components/button/Buttons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/Buttons.java
diff --git a/uitest/src/com/vaadin/tests/components/button/Buttons2.java b/uitest/src/main/java/com/vaadin/tests/components/button/Buttons2.java
index 4f75dfbfef..4f75dfbfef 100644
--- a/uitest/src/com/vaadin/tests/components/button/Buttons2.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/Buttons2.java
diff --git a/uitest/src/com/vaadin/tests/components/button/Buttons3.java b/uitest/src/main/java/com/vaadin/tests/components/button/Buttons3.java
index b20effad97..b20effad97 100644
--- a/uitest/src/com/vaadin/tests/components/button/Buttons3.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/Buttons3.java
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonsAndIcons.java
index 64f690dbf5..64f690dbf5 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonsAndIcons.java
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
index 47f6795e0e..47f6795e0e 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonsWaiAria.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonsWaiAria.java
index 24dc942171..24dc942171 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonsWaiAria.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonsWaiAria.java
diff --git a/uitest/src/com/vaadin/tests/components/button/DisabledButtons.java b/uitest/src/main/java/com/vaadin/tests/components/button/DisabledButtons.java
index 73dbd95829..73dbd95829 100644
--- a/uitest/src/com/vaadin/tests/components/button/DisabledButtons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/DisabledButtons.java
diff --git a/uitest/src/com/vaadin/tests/components/button/ShortCutListenerModification.java b/uitest/src/main/java/com/vaadin/tests/components/button/ShortCutListenerModification.java
index 9cdd803fe0..9cdd803fe0 100644
--- a/uitest/src/com/vaadin/tests/components/button/ShortCutListenerModification.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ShortCutListenerModification.java
diff --git a/uitest/src/com/vaadin/tests/components/button/TooltipForDisabledButton.java b/uitest/src/main/java/com/vaadin/tests/components/button/TooltipForDisabledButton.java
index c1f1846415..c1f1846415 100644
--- a/uitest/src/com/vaadin/tests/components/button/TooltipForDisabledButton.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/TooltipForDisabledButton.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/BeanItemContainerTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/BeanItemContainerTestUI.java
index bda3b34875..bda3b34875 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/BeanItemContainerTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/BeanItemContainerTestUI.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarActionEventSource.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionEventSource.java
index ec40ef4649..ec40ef4649 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarActionEventSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionEventSource.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java
index 5b05d188bd..5b05d188bd 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarActionsUI.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsUI.java
index ee898e0790..ee898e0790 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarActionsUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsUI.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarBackwardForward.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarBackwardForward.java
index 5a21353d7d..5a21353d7d 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarBackwardForward.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarBackwardForward.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java
index 56c4eacba1..56c4eacba1 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java
index 15cde71838..15cde71838 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java
index b36b4d200e..b36b4d200e 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarNotifications.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarNotifications.java
index 9b9a64624a..9b9a64624a 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarNotifications.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarNotifications.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarReadOnly.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarReadOnly.java
index 8e82555e87..8e82555e87 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarReadOnly.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarReadOnly.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java
index 824ad0941f..824ad0941f 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEvents.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEvents.java
index 2025ce2ea7..2025ce2ea7 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEvents.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java
index 98c5c08095..98c5c08095 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarTest.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java
index b56f92962a..b56f92962a 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarTestEvent.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTestEvent.java
index b4e759b20b..b4e759b20b 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarTestEvent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTestEvent.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarVisibleHours.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarVisibleHours.java
index 65e5502686..65e5502686 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarVisibleHours.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarVisibleHours.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarWeekSelection.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarWeekSelection.java
index c74f2a53e3..c74f2a53e3 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarWeekSelection.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarWeekSelection.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/DndCalendarTargetDetails.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/DndCalendarTargetDetails.java
index 62641aaba4..62641aaba4 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/DndCalendarTargetDetails.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/DndCalendarTargetDetails.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/HiddenFwdBackButtons.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/HiddenFwdBackButtons.java
index 04b00dd039..04b00dd039 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/HiddenFwdBackButtons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/HiddenFwdBackButtons.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/NotificationTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/NotificationTestUI.java
index 2313ad891a..2313ad891a 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/NotificationTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/NotificationTestUI.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/NullEventMoveHandler.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/NullEventMoveHandler.java
index 40dd43abb2..40dd43abb2 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/NullEventMoveHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/NullEventMoveHandler.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java
index 4a792bc670..4a792bc670 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java
index 60e8720d44..60e8720d44 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java
diff --git a/uitest/src/com/vaadin/tests/components/caption/EmptyCaptions.java b/uitest/src/main/java/com/vaadin/tests/components/caption/EmptyCaptions.java
index 05b8333e7d..05b8333e7d 100644
--- a/uitest/src/com/vaadin/tests/components/caption/EmptyCaptions.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/caption/EmptyCaptions.java
diff --git a/uitest/src/com/vaadin/tests/components/caption/IconsInCaption.java b/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java
index daf472914b..daf472914b 100644
--- a/uitest/src/com/vaadin/tests/components/caption/IconsInCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java
diff --git a/uitest/src/com/vaadin/tests/components/caption/LargeCaptionIcon.java b/uitest/src/main/java/com/vaadin/tests/components/caption/LargeCaptionIcon.java
index d09b5c02ac..d09b5c02ac 100644
--- a/uitest/src/com/vaadin/tests/components/caption/LargeCaptionIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/caption/LargeCaptionIcon.java
diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxImmediate.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxImmediate.java
index fec753d5af..fec753d5af 100644
--- a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxImmediate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxImmediate.java
diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java
index 22e260b442..22e260b442 100644
--- a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java
diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxRevertValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxRevertValueChange.java
index 0513c9db4f..0513c9db4f 100644
--- a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxRevertValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxRevertValueChange.java
diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxRpcCount.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxRpcCount.java
index f909f97996..f909f97996 100644
--- a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxRpcCount.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxRpcCount.java
diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxes.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxes.java
index 24f53889b3..24f53889b3 100644
--- a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxes.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxes.java
diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxes2.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxes2.java
index 6734c752de..6734c752de 100644
--- a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxes2.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxes2.java
diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java
index 463d53a4a8..463d53a4a8 100644
--- a/uitest/src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java
diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckboxContextClick.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxContextClick.java
index 9b37db10b1..9b37db10b1 100644
--- a/uitest/src/com/vaadin/tests/components/checkbox/CheckboxContextClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxContextClick.java
diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckboxIcon.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxIcon.java
index 50998a96eb..50998a96eb 100644
--- a/uitest/src/com/vaadin/tests/components/checkbox/CheckboxIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckboxIcon.java
diff --git a/uitest/src/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.java b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.java
index ab77fbf2ba..ab77fbf2ba 100644
--- a/uitest/src/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.java
diff --git a/uitest/src/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java
index 544cdafaf0..544cdafaf0 100644
--- a/uitest/src/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java
diff --git a/uitest/src/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java
index d3dd0aeccc..d3dd0aeccc 100644
--- a/uitest/src/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxBorder.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxBorder.java
index 731e23188e..731e23188e 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxBorder.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxBorder.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxClickIcon.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxClickIcon.java
index b0450e22c3..b0450e22c3 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxClickIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxClickIcon.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java
index f7d12356f7..f7d12356f7 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCursorPositionReset.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCursorPositionReset.java
index ccbde5f2df..ccbde5f2df 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCursorPositionReset.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCursorPositionReset.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java
index dea1deb9b5..dea1deb9b5 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxDuplicateCaption.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDuplicateCaption.java
index bd71850a89..bd71850a89 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxDuplicateCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDuplicateCaption.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigation.java
index 2f96724db1..2f96724db1 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigation.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java
index c5e411678d..c5e411678d 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java
index cdae1c8e38..cdae1c8e38 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInPopup.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInPopup.java
index 209a31708c..209a31708c 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInPopup.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInPopup.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
index 131ab7effa..131ab7effa 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInputPrompt.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInputPrompt.java
index 082aca6989..082aca6989 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInputPrompt.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInputPrompt.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java
index 0afa1e887e..0afa1e887e 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java
index 8242eb9e57..8242eb9e57 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
index 62ae652dd0..62ae652dd0 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java
index 07cd1f046c..07cd1f046c 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnter.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnter.java
index 5af4749349..5af4749349 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnter.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnter.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxMousewheel.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMousewheel.java
index 802e7480f5..802e7480f5 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxMousewheel.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMousewheel.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNavigation.java
index 0e355af302..0e355af302 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNavigation.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.java
index 6b0e42666f..6b0e42666f 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java
index 044214cecf..044214cecf 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxPageLength.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPageLength.java
index 6807b21424..6807b21424 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxPageLength.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPageLength.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java
index d1adeaaf88..d1adeaaf88 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
index 2187c24e91..2187c24e91 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxResetValue.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxResetValue.java
index 7196547861..7196547861 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxResetValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxResetValue.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.java
index 9f07d81cc9..9f07d81cc9 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabled.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabled.java
index f94306d2fa..f94306d2fa 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabled.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabled.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrows.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrows.java
index d9ae7da050..d9ae7da050 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrows.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSelecting.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelecting.java
index 99f2254891..99f2254891 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSelecting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelecting.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java
index d941c153c3..d941c153c3 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowed.java
index a052a29bba..a052a29bba 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowed.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowed.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSlow.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlow.java
index 3668637846..3668637846 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSlow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlow.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java
index d98997d28f..d98997d28f 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java
index d1d2f58239..d1d2f58239 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java
index f981b6fa07..f981b6fa07 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupClose.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupClose.java
index 253d6a0d1e..253d6a0d1e 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupClose.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupClose.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java
index c37b29794c..c37b29794c 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
index d33a858dc8..d33a858dc8 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java
index 05b52dee80..05b52dee80 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
index a35bc46390..a35bc46390 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java
index 76ee83384e..76ee83384e 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxes2.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxes2.java
index c2ee20cf4a..c2ee20cf4a 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxes2.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxes2.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java
index 6393115c47..6393115c47 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboPushTiming.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java
index fe2cffdc4c..fe2cffdc4c 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboPushTiming.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java
index acfb7b165f..acfb7b165f 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java
index 3aaae7e6dc..3aaae7e6dc 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopen.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopen.java
index f65b020bd1..f65b020bd1 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopen.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopen.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScroll.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScroll.java
index 735491d80a..735491d80a 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScroll.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScroll.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboboxPopupScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPopupScrolling.java
index 9f1c4b9e03..9f1c4b9e03 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboboxPopupScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPopupScrolling.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleNames.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleNames.java
index 375b417407..375b417407 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleNames.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleNames.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidth.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidth.java
index 593f567c12..593f567c12 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidth.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/Comboboxes.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/Comboboxes.java
index 5b2608b389..5b2608b389 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/Comboboxes.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/Comboboxes.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java
index 7f0816c842..7f0816c842 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/EscapeClosesComboboxNotWindow.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/EscapeClosesComboboxNotWindow.java
index 02c212a3e1..02c212a3e1 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/EscapeClosesComboboxNotWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/EscapeClosesComboboxNotWindow.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java
index ff7faf1965..ff7faf1965 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java
index c2c3703ee4..c2c3703ee4 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/NewItemsESCPress.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/NewItemsESCPress.java
index 0acb4a3c1d..0acb4a3c1d 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/NewItemsESCPress.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/NewItemsESCPress.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/PopUpWidth.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/PopUpWidth.java
index c73bb28c43..c73bb28c43 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/PopUpWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/PopUpWidth.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java
index 1099d03786..1099d03786 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/SlowComboBox.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/SlowComboBox.java
index c07d2d2d7c..c07d2d2d7c 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/SlowComboBox.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/SlowComboBox.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/WidthToggleReadOnly.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/WidthToggleReadOnly.java
index 654f42e233..654f42e233 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/WidthToggleReadOnly.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/WidthToggleReadOnly.java
diff --git a/uitest/src/com/vaadin/tests/components/customcomponent/ClipContent.java b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/ClipContent.java
index b5c6926308..b5c6926308 100644
--- a/uitest/src/com/vaadin/tests/components/customcomponent/ClipContent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/ClipContent.java
diff --git a/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibility.java b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibility.java
index 48484165ff..48484165ff 100644
--- a/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibility.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibility.java
diff --git a/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java
index 9cebc58100..9cebc58100 100644
--- a/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java
diff --git a/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.java b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.java
index 47dca9d57e..47dca9d57e 100644
--- a/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentHideContent.java
diff --git a/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java
index 2351b02e2a..2351b02e2a 100644
--- a/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java
diff --git a/uitest/src/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java
index 8170f152c2..8170f152c2 100644
--- a/uitest/src/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java
diff --git a/uitest/src/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java
index 07c740a96d..07c740a96d 100644
--- a/uitest/src/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java
diff --git a/uitest/src/com/vaadin/tests/components/customfield/AddressField.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/AddressField.java
index bc9f13c454..bc9f13c454 100644
--- a/uitest/src/com/vaadin/tests/components/customfield/AddressField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customfield/AddressField.java
diff --git a/uitest/src/com/vaadin/tests/components/customfield/AddressFormExample.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/AddressFormExample.java
index e5ac67b32e..e5ac67b32e 100644
--- a/uitest/src/com/vaadin/tests/components/customfield/AddressFormExample.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customfield/AddressFormExample.java
diff --git a/uitest/src/com/vaadin/tests/components/customfield/BooleanField.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/BooleanField.java
index 20c004c068..20c004c068 100644
--- a/uitest/src/com/vaadin/tests/components/customfield/BooleanField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customfield/BooleanField.java
diff --git a/uitest/src/com/vaadin/tests/components/customfield/BooleanFieldExample.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/BooleanFieldExample.java
index 66346287ba..66346287ba 100644
--- a/uitest/src/com/vaadin/tests/components/customfield/BooleanFieldExample.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customfield/BooleanFieldExample.java
diff --git a/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSize.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/CustomFieldSize.java
index b6f46cadd0..b6f46cadd0 100644
--- a/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customfield/CustomFieldSize.java
diff --git a/uitest/src/com/vaadin/tests/components/customfield/EmbeddedForm.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/EmbeddedForm.java
index 2703e01a27..2703e01a27 100644
--- a/uitest/src/com/vaadin/tests/components/customfield/EmbeddedForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customfield/EmbeddedForm.java
diff --git a/uitest/src/com/vaadin/tests/components/customfield/EmbeddedFormExample.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/EmbeddedFormExample.java
index aeb1984937..aeb1984937 100644
--- a/uitest/src/com/vaadin/tests/components/customfield/EmbeddedFormExample.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customfield/EmbeddedFormExample.java
diff --git a/uitest/src/com/vaadin/tests/components/customfield/NestedFormExample.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/NestedFormExample.java
index 91fb43f4e2..91fb43f4e2 100644
--- a/uitest/src/com/vaadin/tests/components/customfield/NestedFormExample.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customfield/NestedFormExample.java
diff --git a/uitest/src/com/vaadin/tests/components/customfield/NestedPersonForm.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/NestedPersonForm.java
index 9b40074433..9b40074433 100644
--- a/uitest/src/com/vaadin/tests/components/customfield/NestedPersonForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customfield/NestedPersonForm.java
diff --git a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.java
index f0dc711f48..f0dc711f48 100644
--- a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.java
diff --git a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java
index 2e1ac21892..2e1ac21892 100644
--- a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java
diff --git a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java
index db5e81febf..db5e81febf 100644
--- a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java
diff --git a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java
index 91b5dcc0ea..91b5dcc0ea 100644
--- a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java
diff --git a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplate.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplate.java
index de1caf86df..de1caf86df 100644
--- a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplate.java
diff --git a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplate.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplate.java
index 54949a053d..54949a053d 100644
--- a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplate.java
diff --git a/uitest/src/com/vaadin/tests/components/customlayout/OverflowAutoFix.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/OverflowAutoFix.java
index d6d4bdb3da..d6d4bdb3da 100644
--- a/uitest/src/com/vaadin/tests/components/customlayout/OverflowAutoFix.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/OverflowAutoFix.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/AriaDisabled.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/AriaDisabled.java
index 0832f5afeb..0832f5afeb 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/AriaDisabled.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/AriaDisabled.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/CommitInvalid.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/CommitInvalid.java
index 1553594867..1553594867 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/CommitInvalid.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/CommitInvalid.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormat.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormat.java
index c2afb4cba3..c2afb4cba3 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormat.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormat.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java
index fc3c8c97e8..fc3c8c97e8 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormats.java
index f51c75d57a..f51c75d57a 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormats.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldChangeResolution.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldChangeResolution.java
index 9dbd8fa6dc..9dbd8fa6dc 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldChangeResolution.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldChangeResolution.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldClose.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldClose.java
index 9ce190a293..9ce190a293 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldClose.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldClose.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffset.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffset.java
index a6fda534b2..a6fda534b2 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffset.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffset.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
index 542a844434..542a844434 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java
index 8a15d83121..8a15d83121 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldFastForward.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldFastForward.java
index b38f58e5cc..b38f58e5cc 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldFastForward.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldFastForward.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java
index fab97f46cb..fab97f46cb 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldIsValid.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldIsValid.java
index 66d1c34ab7..66d1c34ab7 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldIsValid.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldIsValid.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldKeyboardInput.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInput.java
index 8157ce5028..8157ce5028 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldKeyboardInput.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInput.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldLocale.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldLocale.java
index a4fe2b0285..a4fe2b0285 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldLocale.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldLocale.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldMinResolution.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldMinResolution.java
index 1a3b3858b8..1a3b3858b8 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldMinResolution.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldMinResolution.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupClosing.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosing.java
index 60508a30d4..60508a30d4 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupClosing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosing.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetach.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetach.java
index 247d1a079c..247d1a079c 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetach.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetach.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
index 1baea1b793..1baea1b793 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupPosition.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupPosition.java
index 4469ad3b1a..4469ad3b1a 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupPosition.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.java
index e477ee8487..e477ee8487 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java
index 070631bac2..070631bac2 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldRanges.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRanges.java
index 2daa3e3f96..2daa3e3f96 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldRanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRanges.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldReadOnly.java
index 304c978381..304c978381 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldReadOnly.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTest.java
index 10718cae8b..10718cae8b 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldTimezone.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTimezone.java
index 6109b7cc14..6109b7cc14 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldTimezone.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTimezone.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java
index bbe2423a3f..bbe2423a3f 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParent.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParent.java
index 2c5e9e251b..2c5e9e251b 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParent.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DatePopupStyleName.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DatePopupStyleName.java
index 66de59ffde..66de59ffde 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DatePopupStyleName.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DatePopupStyleName.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateRangeWithSqlDate.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateRangeWithSqlDate.java
index d3bc4267ec..d3bc4267ec 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateRangeWithSqlDate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateRangeWithSqlDate.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPosition.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPosition.java
index 8e4de77837..8e4de77837 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPosition.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
index b5842694f0..b5842694f0 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldPopup.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopup.java
index 49590a3cee..49590a3cee 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldPopup.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopup.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java
index 403b82a2a7..403b82a2a7 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DisabledInlineDateField.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledInlineDateField.java
index affc5d322c..affc5d322c 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DisabledInlineDateField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledInlineDateField.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayout.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledParentLayout.java
index 49d88630a8..49d88630a8 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledParentLayout.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.java
index 31f97afabd..31f97afabd 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFieldTest.java
index 1c8d8cfae6..1c8d8cfae6 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFieldTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/InlineDateFields.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFields.java
index 1f8ef358af..1f8ef358af 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/InlineDateFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFields.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/LenientMode.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LenientMode.java
index 585395d747..585395d747 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/LenientMode.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LenientMode.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/LocaleChange.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LocaleChange.java
index f69c93419b..f69c93419b 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/LocaleChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LocaleChange.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/LowResolution.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LowResolution.java
index 9c2d3d7d51..9c2d3d7d51 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/LowResolution.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LowResolution.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java
index b77b782d2a..b77b782d2a 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupClosingWithEsc.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupClosingWithEsc.java
index 0b8ffa52fa..0b8ffa52fa 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupClosingWithEsc.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupClosingWithEsc.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldConnector.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldConnector.java
index 5cdc8f1396..5cdc8f1396 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldConnector.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java
index 2608e6e081..2608e6e081 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldInputPrompt.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPrompt.java
index a267d72b7f..a267d72b7f 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldInputPrompt.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPrompt.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldLocaleTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldLocaleTest.java
index 86ce195609..86ce195609 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldLocaleTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldLocaleTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldPopup.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldPopup.java
index ede5510c72..ede5510c72 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldPopup.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldPopup.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldStates.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldStates.java
index aae4a213c6..aae4a213c6 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldStates.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldStates.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldTest.java
index 6e3250a825..6e3250a825 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldTextEnabled.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldTextEnabled.java
index 130ed8f3c5..130ed8f3c5 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldTextEnabled.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldTextEnabled.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java
index 62a788f4c2..62a788f4c2 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFields.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFields.java
index 9daf89d950..9daf89d950 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFields.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
index bd47622394..bd47622394 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java
index da8f45690c..da8f45690c 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/TestDatefieldYear.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/TestDatefieldYear.java
index 4fa7a6811a..4fa7a6811a 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/TestDatefieldYear.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/TestDatefieldYear.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/ValoDateFieldPopupPosition.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/ValoDateFieldPopupPosition.java
index 59ff6aa9e8..59ff6aa9e8 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/ValoDateFieldPopupPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/ValoDateFieldPopupPosition.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/ValueThroughProperty.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/ValueThroughProperty.java
index a45d3b8ad0..a45d3b8ad0 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/ValueThroughProperty.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/ValueThroughProperty.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java
index b7b0f50947..b7b0f50947 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropBatchUpload.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropBatchUpload.java
index b820ccf788..b820ccf788 100644
--- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropBatchUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropBatchUpload.java
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.java
index 02dc326ed8..02dc326ed8 100644
--- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.java
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java
index c7e16440bc..c7e16440bc 100644
--- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidth.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidth.java
index 90ec704a8c..90ec704a8c 100644
--- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidth.java
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.java
index 2ce3a42957..2ce3a42957 100644
--- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.java
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperInPanel.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperInPanel.java
index 6a680abdf0..6a680abdf0 100644
--- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperInPanel.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperInPanel.java
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java
index 8539f70b17..8539f70b17 100644
--- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java
index 7c7e17a5a6..7c7e17a5a6 100644
--- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java
index 93f559f4e7..93f559f4e7 100644
--- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java
diff --git a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedAltText.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedAltText.java
index aedfafe627..aedfafe627 100644
--- a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedAltText.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedAltText.java
diff --git a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedApplet.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedApplet.java
index fec2fb1447..fec2fb1447 100644
--- a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedApplet.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedApplet.java
diff --git a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java
index 28ffebcf56..28ffebcf56 100644
--- a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java
diff --git a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedFlash.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedFlash.java
index 38aea4a4f0..38aea4a4f0 100644
--- a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedFlash.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedFlash.java
diff --git a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java
index 52454e115e..52454e115e 100644
--- a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java
diff --git a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedPdf.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedPdf.java
index 025245ab64..025245ab64 100644
--- a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedPdf.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedPdf.java
diff --git a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedThemeResource.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedThemeResource.java
index ecc746b858..ecc746b858 100644
--- a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedThemeResource.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedThemeResource.java
diff --git a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedTooltip.java
index aa24337013..aa24337013 100644
--- a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedTooltip.java
diff --git a/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/FlashIsVisible.java
index 5aec7f07c6..5aec7f07c6 100644
--- a/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/FlashIsVisible.java
diff --git a/uitest/src/com/vaadin/tests/components/embedded/TestApplet.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/TestApplet.java
index 3cf7cf888b..3cf7cf888b 100644
--- a/uitest/src/com/vaadin/tests/components/embedded/TestApplet.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/TestApplet.java
diff --git a/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.java b/uitest/src/main/java/com/vaadin/tests/components/flash/FlashIsVisible.java
index 53de949176..53de949176 100644
--- a/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/flash/FlashIsVisible.java
diff --git a/uitest/src/com/vaadin/tests/components/flash/FlashPresentation.java b/uitest/src/main/java/com/vaadin/tests/components/flash/FlashPresentation.java
index 5c28feb7f8..5c28feb7f8 100644
--- a/uitest/src/com/vaadin/tests/components/flash/FlashPresentation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/flash/FlashPresentation.java
diff --git a/uitest/src/com/vaadin/tests/components/form/FormCaptionClickFocusing.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormCaptionClickFocusing.java
index 4afe289825..4afe289825 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormCaptionClickFocusing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormCaptionClickFocusing.java
diff --git a/uitest/src/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java
index df403ceb78..df403ceb78 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java
diff --git a/uitest/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java
index b6b0624ba0..b6b0624ba0 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java
diff --git a/uitest/src/com/vaadin/tests/components/form/FormDescription.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormDescription.java
index 76ea039756..76ea039756 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormDescription.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormDescription.java
diff --git a/uitest/src/com/vaadin/tests/components/form/FormErrorVisible.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormErrorVisible.java
index fea24d92ad..fea24d92ad 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormErrorVisible.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormErrorVisible.java
diff --git a/uitest/src/com/vaadin/tests/components/form/FormFieldCaptions.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormFieldCaptions.java
index 25487fba7c..25487fba7c 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormFieldCaptions.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormFieldCaptions.java
diff --git a/uitest/src/com/vaadin/tests/components/form/FormFieldCaptionsStyles.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormFieldCaptionsStyles.java
index 863d4b5b80..863d4b5b80 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormFieldCaptionsStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormFieldCaptionsStyles.java
diff --git a/uitest/src/com/vaadin/tests/components/form/FormNotGettingSmaller.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormNotGettingSmaller.java
index a47ab944a2..a47ab944a2 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormNotGettingSmaller.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormNotGettingSmaller.java
diff --git a/uitest/src/com/vaadin/tests/components/form/FormPrimaryStyleName.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormPrimaryStyleName.java
index 241c39d449..241c39d449 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormPrimaryStyleName.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormPrimaryStyleName.java
diff --git a/uitest/src/com/vaadin/tests/components/form/FormRenderingFlicker.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormRenderingFlicker.java
index 41e1a91781..41e1a91781 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormRenderingFlicker.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormRenderingFlicker.java
diff --git a/uitest/src/com/vaadin/tests/components/form/FormTest.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormTest.java
index 604beb5fcc..604beb5fcc 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormTest.java
diff --git a/uitest/src/com/vaadin/tests/components/form/FormTooltips.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormTooltips.java
index 6e823204e9..6e823204e9 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormTooltips.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormTooltips.java
diff --git a/uitest/src/com/vaadin/tests/components/form/FormWithEnterShortCut.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormWithEnterShortCut.java
index ed1a3d9bd9..ed1a3d9bd9 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormWithEnterShortCut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormWithEnterShortCut.java
diff --git a/uitest/src/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.java
index ff1951d9ca..ff1951d9ca 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.java
diff --git a/uitest/src/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java
index 24d207739e..24d207739e 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java
diff --git a/uitest/src/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java
index 17fe4477c3..17fe4477c3 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java
diff --git a/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java b/uitest/src/main/java/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java
index 44fdcccda8..44fdcccda8 100644
--- a/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java
diff --git a/uitest/src/com/vaadin/tests/components/formlayout/CaptionEnableDisable.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/CaptionEnableDisable.java
index a7fd9956e3..a7fd9956e3 100644
--- a/uitest/src/com/vaadin/tests/components/formlayout/CaptionEnableDisable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/CaptionEnableDisable.java
diff --git a/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java
index 0055c3782e..0055c3782e 100644
--- a/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java
diff --git a/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java
index d3932c1df0..d3932c1df0 100644
--- a/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java
diff --git a/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java
index 45cb55637c..45cb55637c 100644
--- a/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java
diff --git a/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutResizing.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java
index 7ed91979e2..7ed91979e2 100644
--- a/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutResizing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java
diff --git a/uitest/src/com/vaadin/tests/components/formlayout/FormLayouts.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayouts.java
index 6b17c557da..6b17c557da 100644
--- a/uitest/src/com/vaadin/tests/components/formlayout/FormLayouts.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayouts.java
diff --git a/uitest/src/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java
index fc90427c79..fc90427c79 100644
--- a/uitest/src/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java
diff --git a/uitest/src/com/vaadin/tests/components/formlayout/NestedFormLayouts.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/NestedFormLayouts.java
index 147f2dcec7..147f2dcec7 100644
--- a/uitest/src/com/vaadin/tests/components/formlayout/NestedFormLayouts.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/NestedFormLayouts.java
diff --git a/uitest/src/com/vaadin/tests/components/formlayout/StylePrefix.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/StylePrefix.java
index 8ca88fbcd3..8ca88fbcd3 100644
--- a/uitest/src/com/vaadin/tests/components/formlayout/StylePrefix.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/StylePrefix.java
diff --git a/uitest/src/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java
index 9ba6f0ea94..9ba6f0ea94 100644
--- a/uitest/src/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/BeanRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/BeanRenderer.java
index 3e25f45283..3e25f45283 100644
--- a/uitest/src/com/vaadin/tests/components/grid/BeanRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/BeanRenderer.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/CustomRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/CustomRenderer.java
index 171d3f2a5e..171d3f2a5e 100644
--- a/uitest/src/com/vaadin/tests/components/grid/CustomRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/CustomRenderer.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInit.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInit.java
index 36d92d79a0..36d92d79a0 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInit.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInit.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridAddRow.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridAddRow.java
index fa2d7b5399..fa2d7b5399 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridAddRow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridAddRow.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridCellFocusOnResetSize.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSize.java
index c0e3c9d683..c0e3c9d683 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridCellFocusOnResetSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSize.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridCheckBoxDisplay.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridCheckBoxDisplay.java
index e6aff73532..e6aff73532 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridCheckBoxDisplay.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridCheckBoxDisplay.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridClientDataChangeHandler.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridClientDataChangeHandler.java
index 7bd1c838d7..7bd1c838d7 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridClientDataChangeHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridClientDataChangeHandler.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridColspans.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColspans.java
index 23d3c3c394..23d3c3c394 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridColspans.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColspans.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoExpand.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoExpand.java
index 5333b3698e..5333b3698e 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoExpand.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoWidth.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidth.java
index a5a8b62d87..a5a8b62d87 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidth.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoWidthClient.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidthClient.java
index 0829e09de9..0829e09de9 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoWidthClient.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidthClient.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridColumnExpand.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnExpand.java
index f8338f991a..f8338f991a 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridColumnExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnExpand.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridColumnWidthRecalculation.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculation.java
index 43584eb5e1..43584eb5e1 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridColumnWidthRecalculation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculation.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridColumnWidthsWithoutData.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutData.java
index b04745f17a..b04745f17a 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridColumnWidthsWithoutData.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutData.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridCustomSelectionModel.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridCustomSelectionModel.java
index 008c24cdd3..008c24cdd3 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridCustomSelectionModel.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridCustomSelectionModel.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridDataSourceReset.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDataSourceReset.java
index b49cf32b62..b49cf32b62 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridDataSourceReset.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDataSourceReset.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridDefaultSelectionMode.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDefaultSelectionMode.java
index e2f2704a5d..e2f2704a5d 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridDefaultSelectionMode.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDefaultSelectionMode.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridDetailsDetach.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java
index f18c0f9bdb..f18c0f9bdb 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridDetailsDetach.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java
index be82b49f0c..be82b49f0c 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridDetailsLocation.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLocation.java
index 2880df44b0..2880df44b0 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridDetailsLocation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLocation.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridDetailsWidth.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsWidth.java
index 4955f499ba..4955f499ba 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridDetailsWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsWidth.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridDragAndDrop.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragAndDrop.java
index d77a8ddedc..d77a8ddedc 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridDragAndDrop.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragAndDrop.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolled.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolled.java
index 1af1ad02d6..1af1ad02d6 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolled.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolled.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridEditingWithNoScrollBars.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBars.java
index d3e0a2a7c7..d3e0a2a7c7 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridEditingWithNoScrollBars.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBars.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridEditorConverterNotFound.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorConverterNotFound.java
index e5532b10ad..e5532b10ad 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridEditorConverterNotFound.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorConverterNotFound.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridEditorCustomField.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorCustomField.java
index 4703c98994..4703c98994 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridEditorCustomField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorCustomField.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUI.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUI.java
index d2414a8c40..d2414a8c40 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUI.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridEditorMultiselect.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorMultiselect.java
index b80a9d1153..b80a9d1153 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridEditorMultiselect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorMultiselect.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridEditorUI.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java
index 0a302967e8..0a302967e8 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridEditorUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridExtensionCommunication.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridExtensionCommunication.java
index 181c9cae8d..181c9cae8d 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridExtensionCommunication.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridExtensionCommunication.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java
index 31fe0275a5..31fe0275a5 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridGeneratedProperties.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridGeneratedProperties.java
index 2782a5fc6c..2782a5fc6c 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridGeneratedProperties.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridGeneratedProperties.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridHeaderFooterComponents.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFooterComponents.java
index 6c2efc9a25..6c2efc9a25 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridHeaderFooterComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFooterComponents.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridHeaderFormatChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFormatChange.java
index fbd6a42a38..fbd6a42a38 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridHeaderFormatChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFormatChange.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridHeaderStyleNames.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderStyleNames.java
index 019850dabb..019850dabb 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridHeaderStyleNames.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderStyleNames.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridInGridLayout.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInGridLayout.java
index 629eba9045..629eba9045 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridInGridLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInGridLayout.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridInTabSheet.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInTabSheet.java
index cddbd390f2..cddbd390f2 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridInTabSheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInTabSheet.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridInitiallyHiddenColumns.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumns.java
index 49b344bb85..49b344bb85 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridInitiallyHiddenColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumns.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridItemSetChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridItemSetChange.java
index 4632810561..4632810561 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridItemSetChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridItemSetChange.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java
index 51c2598cc0..51c2598cc0 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java
index 4a11c19242..4a11c19242 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionScrollBar.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBar.java
index be1f32164c..be1f32164c 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionScrollBar.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBar.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridRendererChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRendererChange.java
index 180ed0ded9..180ed0ded9 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridRendererChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRendererChange.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridReplaceContainer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridReplaceContainer.java
index e81733cb86..e81733cb86 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridReplaceContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridReplaceContainer.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridResizeAndScroll.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeAndScroll.java
index fe4a9884f5..fe4a9884f5 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridResizeAndScroll.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeAndScroll.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridResizeTerror.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeTerror.java
index 3fa861b32e..3fa861b32e 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridResizeTerror.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeTerror.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridScrollToLineWhileResizing.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizing.java
index 194a9a3acc..194a9a3acc 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridScrollToLineWhileResizing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizing.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrolling.java
index ce64b3e9f3..ce64b3e9f3 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrolling.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridSelectAllCell.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSelectAllCell.java
index 1b31c38994..1b31c38994 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridSelectAllCell.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSelectAllCell.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridSingleColumn.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSingleColumn.java
index 2ab0282102..2ab0282102 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridSingleColumn.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSingleColumn.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridSortIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSortIndicator.java
index a05365d575..a05365d575 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridSortIndicator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSortIndicator.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridSubPixelProblemWrapping.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrapping.java
index 1e921bb18c..1e921bb18c 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridSubPixelProblemWrapping.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrapping.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridSwitchRenderers.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSwitchRenderers.java
index e233edc5d0..e233edc5d0 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridSwitchRenderers.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSwitchRenderers.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridThemeChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeChange.java
index 76f7e22ee0..76f7e22ee0 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridThemeChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeChange.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridThemeUI.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeUI.java
index b0128e936a..b0128e936a 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridThemeUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeUI.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridWidgetRendererChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWidgetRendererChange.java
index 8d9847b428..8d9847b428 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridWidgetRendererChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWidgetRendererChange.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridWidthIncrease.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWidthIncrease.java
index 6726400327..6726400327 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridWidthIncrease.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWidthIncrease.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridWithBrokenRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithBrokenRenderer.java
index 4d44eeb248..4d44eeb248 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridWithBrokenRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithBrokenRenderer.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridWithLabelEditor.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java
index 91c5a06c66..91c5a06c66 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridWithLabelEditor.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridWithoutRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithoutRenderer.java
index fd5e6fdc01..fd5e6fdc01 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridWithoutRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithoutRenderer.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/InitialFrozenColumns.java b/uitest/src/main/java/com/vaadin/tests/components/grid/InitialFrozenColumns.java
index b6da30d314..b6da30d314 100644
--- a/uitest/src/com/vaadin/tests/components/grid/InitialFrozenColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/InitialFrozenColumns.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/IntArrayRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/IntArrayRenderer.java
index ba3fc9cd0b..ba3fc9cd0b 100644
--- a/uitest/src/com/vaadin/tests/components/grid/IntArrayRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/IntArrayRenderer.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/JavaScriptRenderers.java b/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptRenderers.java
index 8f88883161..8f88883161 100644
--- a/uitest/src/com/vaadin/tests/components/grid/JavaScriptRenderers.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptRenderers.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/JavaScriptStringRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptStringRenderer.java
index ab3be6f4f1..ab3be6f4f1 100644
--- a/uitest/src/com/vaadin/tests/components/grid/JavaScriptStringRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptStringRenderer.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/MyBeanJSRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/MyBeanJSRenderer.java
index a2d1c08ea0..a2d1c08ea0 100644
--- a/uitest/src/com/vaadin/tests/components/grid/MyBeanJSRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/MyBeanJSRenderer.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/NullHeaders.java b/uitest/src/main/java/com/vaadin/tests/components/grid/NullHeaders.java
index 10fe20c478..10fe20c478 100644
--- a/uitest/src/com/vaadin/tests/components/grid/NullHeaders.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/NullHeaders.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/NullRenderers.java b/uitest/src/main/java/com/vaadin/tests/components/grid/NullRenderers.java
index db86847690..db86847690 100644
--- a/uitest/src/com/vaadin/tests/components/grid/NullRenderers.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/NullRenderers.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/PersonTestGrid.java b/uitest/src/main/java/com/vaadin/tests/components/grid/PersonTestGrid.java
index f654cd153d..f654cd153d 100644
--- a/uitest/src/com/vaadin/tests/components/grid/PersonTestGrid.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/PersonTestGrid.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/ProgrammaticEditorControl.java b/uitest/src/main/java/com/vaadin/tests/components/grid/ProgrammaticEditorControl.java
index a9075a77d1..a9075a77d1 100644
--- a/uitest/src/com/vaadin/tests/components/grid/ProgrammaticEditorControl.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/ProgrammaticEditorControl.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/RowAwareRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/RowAwareRenderer.java
index 02919f5c1b..02919f5c1b 100644
--- a/uitest/src/com/vaadin/tests/components/grid/RowAwareRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/RowAwareRenderer.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/SelectDuringInit.java b/uitest/src/main/java/com/vaadin/tests/components/grid/SelectDuringInit.java
index d8394acd19..d8394acd19 100644
--- a/uitest/src/com/vaadin/tests/components/grid/SelectDuringInit.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/SelectDuringInit.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/SortableHeaderStyles.java b/uitest/src/main/java/com/vaadin/tests/components/grid/SortableHeaderStyles.java
index 56e6c608b3..56e6c608b3 100644
--- a/uitest/src/com/vaadin/tests/components/grid/SortableHeaderStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/SortableHeaderStyles.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/WidgetRenderers.java b/uitest/src/main/java/com/vaadin/tests/components/grid/WidgetRenderers.java
index d1110d4caa..d1110d4caa 100644
--- a/uitest/src/com/vaadin/tests/components/grid/WidgetRenderers.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/WidgetRenderers.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeatures.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeatures.java
index 8e1a80a830..8e1a80a830 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeatures.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeatures.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/EscalatorUpdaterUi.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorUpdaterUi.java
index ef997b3cae..ef997b3cae 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/EscalatorUpdaterUi.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorUpdaterUi.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeatures.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeatures.java
index 429f15bb47..429f15bb47 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeatures.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeatures.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
index 777f5f6775..777f5f6775 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesValo.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesValo.java
index aef353fe93..aef353fe93 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesValo.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesValo.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSources.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSources.java
index 3f84d40b01..3f84d40b01 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSources.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSources.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridClientHeightByRowOnInit.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridClientHeightByRowOnInit.java
index afbe3fcbbb..afbe3fcbbb 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridClientHeightByRowOnInit.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridClientHeightByRowOnInit.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRenderer.java
index 5c4ccfae89..5c4ccfae89 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRenderer.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInit.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInit.java
index 0b6e6c36dd..0b6e6c36dd 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInit.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInit.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridSidebarFeatures.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridSidebarFeatures.java
index 9494988cf4..9494988cf4 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridSidebarFeatures.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridSidebarFeatures.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicators.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicators.java
index 6d602baf06..6d602baf06 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicators.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicators.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainer.java
index 8be2dab8fd..8be2dab8fd 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainer.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/declarative/GridDeclarativeBasicFeatures.java b/uitest/src/main/java/com/vaadin/tests/components/grid/declarative/GridDeclarativeBasicFeatures.java
index cd4bf4e69b..cd4bf4e69b 100644
--- a/uitest/src/com/vaadin/tests/components/grid/declarative/GridDeclarativeBasicFeatures.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/declarative/GridDeclarativeBasicFeatures.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/declarative/GridDeclarativeMultiSelect.java b/uitest/src/main/java/com/vaadin/tests/components/grid/declarative/GridDeclarativeMultiSelect.java
index 83dbdf541e..83dbdf541e 100644
--- a/uitest/src/com/vaadin/tests/components/grid/declarative/GridDeclarativeMultiSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/declarative/GridDeclarativeMultiSelect.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/declarative/GridItemEditor.java b/uitest/src/main/java/com/vaadin/tests/components/grid/declarative/GridItemEditor.java
index 9673626f45..9673626f45 100644
--- a/uitest/src/com/vaadin/tests/components/grid/declarative/GridItemEditor.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/declarative/GridItemEditor.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/ComponentAlignments.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/ComponentAlignments.java
index 8b3cd02d9e..8b3cd02d9e 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/ComponentAlignments.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/ComponentAlignments.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutAlignments.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignments.java
index 06f4f17eb8..06f4f17eb8 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutAlignments.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignments.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignment.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignment.java
index 063a36ca04..063a36ca04 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignment.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignment.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUI.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUI.java
index d2ca7700ad..d2ca7700ad 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUI.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutExpandRatio.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutExpandRatio.java
index 2a533e4eda..2a533e4eda 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutExpandRatio.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutExpandRatio.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacing.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacing.java
index ce59f9c89f..ce59f9c89f 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacing.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutFocusOrderAfterShowChild.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutFocusOrderAfterShowChild.java
index 034ff024d0..034ff024d0 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutFocusOrderAfterShowChild.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutFocusOrderAfterShowChild.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignment.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignment.java
index 32d01f9910..32d01f9910 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignment.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignment.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutHideMiddleCells.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutHideMiddleCells.java
index 4712b8fb26..4712b8fb26 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutHideMiddleCells.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutHideMiddleCells.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java
index e8261ec183..e8261ec183 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutScrollPosition.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutScrollPosition.java
index 9bc29b5c82..9bc29b5c82 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutScrollPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutScrollPosition.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutTest.java
index 4e31d9b531..4e31d9b531 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutTest.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutWithNonIntegerWidth.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutWithNonIntegerWidth.java
index 6cc96332d5..6cc96332d5 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutWithNonIntegerWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutWithNonIntegerWidth.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/InsertRowInMiddle.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/InsertRowInMiddle.java
index 0fc764e463..0fc764e463 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/InsertRowInMiddle.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/InsertRowInMiddle.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java
index 0ec8cd5030..0ec8cd5030 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java
index 1da2322dc9..1da2322dc9 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java
index 07abb61785..07abb61785 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java
diff --git a/uitest/src/com/vaadin/tests/components/image/ImageAltText.java b/uitest/src/main/java/com/vaadin/tests/components/image/ImageAltText.java
index efee376bfe..efee376bfe 100644
--- a/uitest/src/com/vaadin/tests/components/image/ImageAltText.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/image/ImageAltText.java
diff --git a/uitest/src/com/vaadin/tests/components/image/ImageClicks.java b/uitest/src/main/java/com/vaadin/tests/components/image/ImageClicks.java
index 397e31c39c..397e31c39c 100644
--- a/uitest/src/com/vaadin/tests/components/image/ImageClicks.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/image/ImageClicks.java
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java
index 1e193fc3b4..1e193fc3b4 100644
--- a/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUI.java b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUI.java
index 0181f17aba..0181f17aba 100644
--- a/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUI.java
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloading.java b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloading.java
index f9ef4c98cb..f9ef4c98cb 100644
--- a/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloading.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloading.java
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.java b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.java
index b9071ec44c..b9071ec44c 100644
--- a/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListener.java
diff --git a/uitest/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java b/uitest/src/main/java/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java
index 61caf9a2f2..61caf9a2f2 100644
--- a/uitest/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java
diff --git a/uitest/src/com/vaadin/tests/components/label/LabelModes.java b/uitest/src/main/java/com/vaadin/tests/components/label/LabelModes.java
index e5bc539f36..e5bc539f36 100644
--- a/uitest/src/com/vaadin/tests/components/label/LabelModes.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/label/LabelModes.java
diff --git a/uitest/src/com/vaadin/tests/components/label/LabelPropertySourceValue.java b/uitest/src/main/java/com/vaadin/tests/components/label/LabelPropertySourceValue.java
index 876d56208b..876d56208b 100644
--- a/uitest/src/com/vaadin/tests/components/label/LabelPropertySourceValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/label/LabelPropertySourceValue.java
diff --git a/uitest/src/com/vaadin/tests/components/label/LabelStyles.java b/uitest/src/main/java/com/vaadin/tests/components/label/LabelStyles.java
index 6de50b0cba..6de50b0cba 100644
--- a/uitest/src/com/vaadin/tests/components/label/LabelStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/label/LabelStyles.java
diff --git a/uitest/src/com/vaadin/tests/components/label/LabelTest.java b/uitest/src/main/java/com/vaadin/tests/components/label/LabelTest.java
index 8c9a76ea47..8c9a76ea47 100644
--- a/uitest/src/com/vaadin/tests/components/label/LabelTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/label/LabelTest.java
diff --git a/uitest/src/com/vaadin/tests/components/label/LabelTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/label/LabelTooltip.java
index cb96c1282c..cb96c1282c 100644
--- a/uitest/src/com/vaadin/tests/components/label/LabelTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/label/LabelTooltip.java
diff --git a/uitest/src/com/vaadin/tests/components/label/LabelWrapping.java b/uitest/src/main/java/com/vaadin/tests/components/label/LabelWrapping.java
index 82969fdb08..82969fdb08 100644
--- a/uitest/src/com/vaadin/tests/components/label/LabelWrapping.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/label/LabelWrapping.java
diff --git a/uitest/src/com/vaadin/tests/components/label/Labels.java b/uitest/src/main/java/com/vaadin/tests/components/label/Labels.java
index cd6976543a..cd6976543a 100644
--- a/uitest/src/com/vaadin/tests/components/label/Labels.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/label/Labels.java
diff --git a/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.java b/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java
index f503e8966f..f503e8966f 100644
--- a/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java
diff --git a/uitest/src/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java b/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java
index c873a7efe7..c873a7efe7 100644
--- a/uitest/src/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java
diff --git a/uitest/src/com/vaadin/tests/components/link/LinkIcon.java b/uitest/src/main/java/com/vaadin/tests/components/link/LinkIcon.java
index 970c2f71c7..970c2f71c7 100644
--- a/uitest/src/com/vaadin/tests/components/link/LinkIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/link/LinkIcon.java
diff --git a/uitest/src/com/vaadin/tests/components/link/LinkInsideDisabledContainer.java b/uitest/src/main/java/com/vaadin/tests/components/link/LinkInsideDisabledContainer.java
index 2a040b413f..2a040b413f 100644
--- a/uitest/src/com/vaadin/tests/components/link/LinkInsideDisabledContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/link/LinkInsideDisabledContainer.java
diff --git a/uitest/src/com/vaadin/tests/components/link/LinkTargetSize.java b/uitest/src/main/java/com/vaadin/tests/components/link/LinkTargetSize.java
index cb537c88ae..cb537c88ae 100644
--- a/uitest/src/com/vaadin/tests/components/link/LinkTargetSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/link/LinkTargetSize.java
diff --git a/uitest/src/com/vaadin/tests/components/link/LinkTest.java b/uitest/src/main/java/com/vaadin/tests/components/link/LinkTest.java
index 6deea0fd96..6deea0fd96 100644
--- a/uitest/src/com/vaadin/tests/components/link/LinkTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/link/LinkTest.java
diff --git a/uitest/src/com/vaadin/tests/components/link/LinkToPercentage.java b/uitest/src/main/java/com/vaadin/tests/components/link/LinkToPercentage.java
index 770ff9895a..770ff9895a 100644
--- a/uitest/src/com/vaadin/tests/components/link/LinkToPercentage.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/link/LinkToPercentage.java
diff --git a/uitest/src/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.java
index 8e74a7a53d..8e74a7a53d 100644
--- a/uitest/src/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.java
diff --git a/uitest/src/com/vaadin/tests/components/listselect/ListSelectJump.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectJump.java
index 47f6f339ff..47f6f339ff 100644
--- a/uitest/src/com/vaadin/tests/components/listselect/ListSelectJump.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectJump.java
diff --git a/uitest/src/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java
index b0137c55cf..b0137c55cf 100644
--- a/uitest/src/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java
diff --git a/uitest/src/com/vaadin/tests/components/listselect/ListSelects.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelects.java
index 8998fd3a3d..8998fd3a3d 100644
--- a/uitest/src/com/vaadin/tests/components/listselect/ListSelects.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelects.java
diff --git a/uitest/src/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.java b/uitest/src/main/java/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.java
index 3fde281c20..3fde281c20 100644
--- a/uitest/src/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.java
diff --git a/uitest/src/com/vaadin/tests/components/loginform/LoginFormTest.java b/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormTest.java
index 629edc2130..629edc2130 100644
--- a/uitest/src/com/vaadin/tests/components/loginform/LoginFormTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormTest.java
diff --git a/uitest/src/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java b/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java
index 58656cb7bf..58656cb7bf 100755
--- a/uitest/src/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java
diff --git a/uitest/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java b/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
index 3a9ce202c7..3a9ce202c7 100644
--- a/uitest/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
diff --git a/uitest/src/com/vaadin/tests/components/media/AudioTest.java b/uitest/src/main/java/com/vaadin/tests/components/media/AudioTest.java
index 1e1e26346c..1e1e26346c 100644
--- a/uitest/src/com/vaadin/tests/components/media/AudioTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/media/AudioTest.java
diff --git a/uitest/src/com/vaadin/tests/components/media/Media.java b/uitest/src/main/java/com/vaadin/tests/components/media/Media.java
index 5ccf9eb72b..5ccf9eb72b 100644
--- a/uitest/src/com/vaadin/tests/components/media/Media.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/media/Media.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/HiddenAndDisabledMenus.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/HiddenAndDisabledMenus.java
index c303aaf5a9..c303aaf5a9 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/HiddenAndDisabledMenus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/HiddenAndDisabledMenus.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarFocus.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarFocus.java
index 2613634576..2613634576 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarFocus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarFocus.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java
index d6e79224a3..d6e79224a3 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java
index 624c6ee732..624c6ee732 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarNavigation.java
index b4e24c60d9..b4e24c60d9 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarNavigation.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarPrimaryStylenames.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarPrimaryStylenames.java
index ad8e2b05ed..ad8e2b05ed 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarPrimaryStylenames.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarPrimaryStylenames.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java
index c093a61812..c093a61812 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
index 0d9c3d8bba..0d9c3d8bba 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValo.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValo.java
index 88d89abbf4..88d89abbf4 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValo.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValo.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarTest.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTest.java
index 982b16c6e2..982b16c6e2 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTest.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarToolTips.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarToolTips.java
index 0ef31dc5dc..0ef31dc5dc 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarToolTips.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarToolTips.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdge.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdge.java
index 4e42d97925..4e42d97925 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdge.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdge.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java
index 16a0896aa2..16a0896aa2 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarsWithNesting.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuItemStyleRemoved.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuItemStyleRemoved.java
index cf06836f94..cf06836f94 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuItemStyleRemoved.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuItemStyleRemoved.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuTooltip.java
index 2c9d43290f..2c9d43290f 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuTooltip.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/Menubars.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/Menubars.java
index 40e566194a..40e566194a 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/Menubars.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/Menubars.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/SpaceMenuBarNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigation.java
index 764844751c..764844751c 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/SpaceMenuBarNavigation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigation.java
diff --git a/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonClick.java b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonClick.java
index b6c80aea0c..b6c80aea0c 100644
--- a/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonClick.java
diff --git a/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java
index 94023db2d0..94023db2d0 100644
--- a/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java
diff --git a/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonIconAndText.java b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonIconAndText.java
index d1a889dcf4..d1a889dcf4 100644
--- a/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonIconAndText.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonIconAndText.java
diff --git a/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonTest.java b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonTest.java
index 7b1e75a3da..7b1e75a3da 100644
--- a/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/nativebutton/NativeButtonTest.java
diff --git a/uitest/src/com/vaadin/tests/components/nativeselect/NativeSelects.java b/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelects.java
index 80b088f03a..80b088f03a 100644
--- a/uitest/src/com/vaadin/tests/components/nativeselect/NativeSelects.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelects.java
diff --git a/uitest/src/com/vaadin/tests/components/notification/ChromeBottomNotification.java b/uitest/src/main/java/com/vaadin/tests/components/notification/ChromeBottomNotification.java
index df1e0048be..df1e0048be 100644
--- a/uitest/src/com/vaadin/tests/components/notification/ChromeBottomNotification.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/notification/ChromeBottomNotification.java
diff --git a/uitest/src/com/vaadin/tests/components/notification/MiddleNotificationPosition.java b/uitest/src/main/java/com/vaadin/tests/components/notification/MiddleNotificationPosition.java
index b770435161..b770435161 100644
--- a/uitest/src/com/vaadin/tests/components/notification/MiddleNotificationPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/notification/MiddleNotificationPosition.java
diff --git a/uitest/src/com/vaadin/tests/components/notification/NotificationDelay.java b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationDelay.java
index c0db1703bb..c0db1703bb 100644
--- a/uitest/src/com/vaadin/tests/components/notification/NotificationDelay.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationDelay.java
diff --git a/uitest/src/com/vaadin/tests/components/notification/Notifications.java b/uitest/src/main/java/com/vaadin/tests/components/notification/Notifications.java
index 10fef434ca..10fef434ca 100644
--- a/uitest/src/com/vaadin/tests/components/notification/Notifications.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/notification/Notifications.java
diff --git a/uitest/src/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java
index 25bc05c771..25bc05c771 100644
--- a/uitest/src/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java
diff --git a/uitest/src/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
index 89e97c0b6a..89e97c0b6a 100644
--- a/uitest/src/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
diff --git a/uitest/src/com/vaadin/tests/components/notification/NotificationsWaiAria.java b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsWaiAria.java
index e85d60d7c2..e85d60d7c2 100644
--- a/uitest/src/com/vaadin/tests/components/notification/NotificationsWaiAria.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsWaiAria.java
diff --git a/uitest/src/com/vaadin/tests/components/notification/SemiTransparentNotification.java b/uitest/src/main/java/com/vaadin/tests/components/notification/SemiTransparentNotification.java
index 3e3d844956..3e3d844956 100755
--- a/uitest/src/com/vaadin/tests/components/notification/SemiTransparentNotification.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/notification/SemiTransparentNotification.java
diff --git a/uitest/src/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java
index 877f9aa675..877f9aa675 100644
--- a/uitest/src/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java
diff --git a/uitest/src/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java
index 179d1aa5ff..179d1aa5ff 100644
--- a/uitest/src/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java
diff --git a/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupDisabled.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupDisabled.java
index f16bd4b7dd..f16bd4b7dd 100644
--- a/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupDisabled.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupDisabled.java
diff --git a/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
index 213258ed29..213258ed29 100644
--- a/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
diff --git a/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java
index bad9723539..bad9723539 100644
--- a/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java
diff --git a/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroups.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroups.java
index c4c588d1ea..c4c588d1ea 100644
--- a/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroups.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroups.java
diff --git a/uitest/src/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroup.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroup.java
index 76258e574e..76258e574e 100644
--- a/uitest/src/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroup.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroup.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
index 4f7a939ee5..4f7a939ee5 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/CaptionLeak.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/CaptionLeak.java
index c715aa383a..c715aa383a 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/CaptionLeak.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/CaptionLeak.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java
index 89490bd167..89490bd167 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java
index 4360ff60d8..4360ff60d8 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java
index 030bfa693e..030bfa693e 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java
index d9ab760302..d9ab760302 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.java
index 4dc9d8129e..4dc9d8129e 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalRelativeChildren.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeChildren.java
index dbec70176c..dbec70176c 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalRelativeChildren.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeChildren.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java
index 8c5953104f..8c5953104f 100755
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/InsertComponentInHorizontalLayout.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/InsertComponentInHorizontalLayout.java
index ae26706d35..ae26706d35 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/InsertComponentInHorizontalLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/InsertComponentInHorizontalLayout.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
index 821a5dbb93..821a5dbb93 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
index 6235ed9617..6235ed9617 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
index 99c80fe4c1..99c80fe4c1 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHover.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHover.java
index 59e2b0936a..59e2b0936a 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHover.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHover.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
index d7dbe11769..d7dbe11769 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutComponentOrdering.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutComponentOrdering.java
index 5857df20b1..5857df20b1 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutComponentOrdering.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutComponentOrdering.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPasses.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPasses.java
index 9c54dbab8d..9c54dbab8d 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPasses.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPasses.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutSlotStyleNames.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutSlotStyleNames.java
index 8adfcf4439..8adfcf4439 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutSlotStyleNames.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutSlotStyleNames.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/RelativeChildrenWithoutExpand.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/RelativeChildrenWithoutExpand.java
index 59447919ef..59447919ef 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/RelativeChildrenWithoutExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/RelativeChildrenWithoutExpand.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java
index a18400ce08..a18400ce08 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/SpacingLeak.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/SpacingLeak.java
index 647c187568..647c187568 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/SpacingLeak.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/SpacingLeak.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java
index 233049b0ba..233049b0ba 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
index 6fd7bf362b..6fd7bf362b 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java
index d55765b5e4..d55765b5e4 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java
index 2298364c3f..2298364c3f 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java
index 9557137c8a..9557137c8a 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java
index 45477b10aa..45477b10aa 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalRelativeChildren.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeChildren.java
index 260bfb02a4..260bfb02a4 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalRelativeChildren.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeChildren.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java
index 0ac9a008d2..0ac9a008d2 100755
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java
diff --git a/uitest/src/com/vaadin/tests/components/page/PageReload.java b/uitest/src/main/java/com/vaadin/tests/components/page/PageReload.java
index 033da4e0e8..033da4e0e8 100644
--- a/uitest/src/com/vaadin/tests/components/page/PageReload.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/page/PageReload.java
diff --git a/uitest/src/com/vaadin/tests/components/page/PageTitle.java b/uitest/src/main/java/com/vaadin/tests/components/page/PageTitle.java
index 3979ede8c8..3979ede8c8 100644
--- a/uitest/src/com/vaadin/tests/components/page/PageTitle.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/page/PageTitle.java
diff --git a/uitest/src/com/vaadin/tests/components/panel/BasicPanelTest.java b/uitest/src/main/java/com/vaadin/tests/components/panel/BasicPanelTest.java
index d9a9c14425..d9a9c14425 100644
--- a/uitest/src/com/vaadin/tests/components/panel/BasicPanelTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/BasicPanelTest.java
diff --git a/uitest/src/com/vaadin/tests/components/panel/PanelChangeContents.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelChangeContents.java
index 3f953bf73a..3f953bf73a 100644
--- a/uitest/src/com/vaadin/tests/components/panel/PanelChangeContents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelChangeContents.java
diff --git a/uitest/src/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java
index 1dad8d44b0..1dad8d44b0 100644
--- a/uitest/src/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java
diff --git a/uitest/src/com/vaadin/tests/components/panel/PanelConcurrentModificationException.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelConcurrentModificationException.java
index e05678b7c8..e05678b7c8 100644
--- a/uitest/src/com/vaadin/tests/components/panel/PanelConcurrentModificationException.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelConcurrentModificationException.java
diff --git a/uitest/src/com/vaadin/tests/components/panel/PanelShouldNotScroll.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldNotScroll.java
index 15ca0d521e..15ca0d521e 100644
--- a/uitest/src/com/vaadin/tests/components/panel/PanelShouldNotScroll.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldNotScroll.java
diff --git a/uitest/src/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
index d0a86cd67f..d0a86cd67f 100644
--- a/uitest/src/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
diff --git a/uitest/src/com/vaadin/tests/components/panel/PanelTest.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelTest.java
index 2992f1a85c..2992f1a85c 100644
--- a/uitest/src/com/vaadin/tests/components/panel/PanelTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelTest.java
diff --git a/uitest/src/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java b/uitest/src/main/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java
index ef535baa0a..ef535baa0a 100644
--- a/uitest/src/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java
diff --git a/uitest/src/com/vaadin/tests/components/panel/WebkitScrollbarTest.java b/uitest/src/main/java/com/vaadin/tests/components/panel/WebkitScrollbarTest.java
index 2c4bac03b0..2c4bac03b0 100644
--- a/uitest/src/com/vaadin/tests/components/panel/WebkitScrollbarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/WebkitScrollbarTest.java
diff --git a/uitest/src/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
index a256438494..a256438494 100644
--- a/uitest/src/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/ClickingWhilePopupOpen.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/ClickingWhilePopupOpen.java
index 239c774180..239c774180 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/ClickingWhilePopupOpen.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/ClickingWhilePopupOpen.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/DisabledPopupView.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/DisabledPopupView.java
index ecce1781a5..ecce1781a5 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/DisabledPopupView.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/DisabledPopupView.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragment.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewAndFragment.java
index 8178cfdbe2..8178cfdbe2 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragment.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewAndFragment.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewCaption.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewCaption.java
index 2bf587ba97..2bf587ba97 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewCaption.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
index a5441f38b1..a5441f38b1 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java
index d19f98124e..d19f98124e 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewInEmbeddedApplication.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewLabelResized.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewLabelResized.java
index 2776c63e9f..2776c63e9f 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewLabelResized.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewLabelResized.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewNullValues.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java
index 75f95977bd..75f95977bd 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewNullValues.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewOffScreen.java
index 9e214e2598..9e214e2598 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewOffScreen.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpen.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpen.java
index cf3854ee69..cf3854ee69 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpen.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpen.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java
index ca91597aa2..ca91597aa2 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java
index 271a7eea2a..271a7eea2a 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewWithExtension.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithExtension.java
index 04bbf6df0a..04bbf6df0a 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewWithExtension.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithExtension.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewWithRTE.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithRTE.java
index 069ccef2bb..069ccef2bb 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewWithRTE.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithRTE.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/ReopenPopupView.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/ReopenPopupView.java
index 979bafc688..979bafc688 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/ReopenPopupView.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/ReopenPopupView.java
diff --git a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java
index 79797c60a2..79797c60a2 100644
--- a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java
diff --git a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeer.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeer.java
index 6cf7fb0ded..6cf7fb0ded 100644
--- a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeer.java
diff --git a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressBarStaticRuno.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRuno.java
index 4e1ff7c886..4e1ff7c886 100644
--- a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressBarStaticRuno.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRuno.java
diff --git a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressBarTest.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarTest.java
index ce51184e7d..ce51184e7d 100644
--- a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressBarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarTest.java
diff --git a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
index 4542d0c6c8..4542d0c6c8 100644
--- a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
diff --git a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressIndicatorTest.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorTest.java
index 5b3a931e5b..5b3a931e5b 100644
--- a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressIndicatorTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorTest.java
diff --git a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaEmptyString.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaEmptyString.java
index 01dc10220f..01dc10220f 100644
--- a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaEmptyString.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaEmptyString.java
diff --git a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaPreventsTextFieldAccess.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaPreventsTextFieldAccess.java
index c3433c3054..c3433c3054 100644
--- a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaPreventsTextFieldAccess.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaPreventsTextFieldAccess.java
diff --git a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java
index 870c6cb8cb..870c6cb8cb 100644
--- a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java
diff --git a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java
index 66b5a9e08a..66b5a9e08a 100644
--- a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java
diff --git a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java
index 934f2ed2dd..934f2ed2dd 100644
--- a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java
diff --git a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java
index 4155dd8a07..4155dd8a07 100644
--- a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java
diff --git a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java
index df1d6df463..df1d6df463 100644
--- a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java
diff --git a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
index 8293d9919f..8293d9919f 100644
--- a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
diff --git a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreas.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreas.java
index 8585d19bc2..8585d19bc2 100644
--- a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreas.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreas.java
diff --git a/uitest/src/com/vaadin/tests/components/select/AbstractSelectTestCase.java b/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java
index b0c6c08a62..b0c6c08a62 100644
--- a/uitest/src/com/vaadin/tests/components/select/AbstractSelectTestCase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java
diff --git a/uitest/src/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java b/uitest/src/main/java/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java
index 470c97442f..470c97442f 100644
--- a/uitest/src/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java
diff --git a/uitest/src/com/vaadin/tests/components/select/EnumSelect.java b/uitest/src/main/java/com/vaadin/tests/components/select/EnumSelect.java
index 5976952f8c..5976952f8c 100644
--- a/uitest/src/com/vaadin/tests/components/select/EnumSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/EnumSelect.java
diff --git a/uitest/src/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java b/uitest/src/main/java/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java
index 6f203bf8c9..6f203bf8c9 100644
--- a/uitest/src/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java
diff --git a/uitest/src/com/vaadin/tests/components/select/NativeSelects.java b/uitest/src/main/java/com/vaadin/tests/components/select/NativeSelects.java
index 75a3f1b751..75a3f1b751 100644
--- a/uitest/src/com/vaadin/tests/components/select/NativeSelects.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/NativeSelects.java
diff --git a/uitest/src/com/vaadin/tests/components/select/NullSelectionItemId.java b/uitest/src/main/java/com/vaadin/tests/components/select/NullSelectionItemId.java
index 984bab5b34..984bab5b34 100644
--- a/uitest/src/com/vaadin/tests/components/select/NullSelectionItemId.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/NullSelectionItemId.java
diff --git a/uitest/src/com/vaadin/tests/components/select/OptionGroupBaseSelects.java b/uitest/src/main/java/com/vaadin/tests/components/select/OptionGroupBaseSelects.java
index 2f58e35dc7..2f58e35dc7 100644
--- a/uitest/src/com/vaadin/tests/components/select/OptionGroupBaseSelects.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/OptionGroupBaseSelects.java
diff --git a/uitest/src/com/vaadin/tests/components/select/SelectDisplaysOldValue.java b/uitest/src/main/java/com/vaadin/tests/components/select/SelectDisplaysOldValue.java
index 77c187ff60..77c187ff60 100644
--- a/uitest/src/com/vaadin/tests/components/select/SelectDisplaysOldValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/SelectDisplaysOldValue.java
diff --git a/uitest/src/com/vaadin/tests/components/select/SelectIconPlacement.java b/uitest/src/main/java/com/vaadin/tests/components/select/SelectIconPlacement.java
index 0cba74b941..0cba74b941 100644
--- a/uitest/src/com/vaadin/tests/components/select/SelectIconPlacement.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/SelectIconPlacement.java
diff --git a/uitest/src/com/vaadin/tests/components/select/SelectItemCaptionRefresh.java b/uitest/src/main/java/com/vaadin/tests/components/select/SelectItemCaptionRefresh.java
index 458bfda6fa..458bfda6fa 100644
--- a/uitest/src/com/vaadin/tests/components/select/SelectItemCaptionRefresh.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/SelectItemCaptionRefresh.java
diff --git a/uitest/src/com/vaadin/tests/components/select/SelectTest.java b/uitest/src/main/java/com/vaadin/tests/components/select/SelectTest.java
index f19e7ecad2..f19e7ecad2 100644
--- a/uitest/src/com/vaadin/tests/components/select/SelectTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/SelectTest.java
diff --git a/uitest/src/com/vaadin/tests/components/select/SelectWithIntegers.java b/uitest/src/main/java/com/vaadin/tests/components/select/SelectWithIntegers.java
index 3012105ae9..3012105ae9 100644
--- a/uitest/src/com/vaadin/tests/components/select/SelectWithIntegers.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/SelectWithIntegers.java
diff --git a/uitest/src/com/vaadin/tests/components/select/StylingPopupOpener.java b/uitest/src/main/java/com/vaadin/tests/components/select/StylingPopupOpener.java
index b97231ae8e..b97231ae8e 100644
--- a/uitest/src/com/vaadin/tests/components/select/StylingPopupOpener.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/StylingPopupOpener.java
diff --git a/uitest/src/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java b/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java
index 789174260f..789174260f 100644
--- a/uitest/src/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java
diff --git a/uitest/src/com/vaadin/tests/components/select/TwinColSelectTest.java b/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelectTest.java
index b27dfa0ec8..b27dfa0ec8 100644
--- a/uitest/src/com/vaadin/tests/components/select/TwinColSelectTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelectTest.java
diff --git a/uitest/src/com/vaadin/tests/components/select/TwinColSelects.java b/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelects.java
index 64b3d37c0d..64b3d37c0d 100644
--- a/uitest/src/com/vaadin/tests/components/select/TwinColSelects.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelects.java
diff --git a/uitest/src/com/vaadin/tests/components/slider/HiddenSliderHandle.java b/uitest/src/main/java/com/vaadin/tests/components/slider/HiddenSliderHandle.java
index 105c20f7c6..105c20f7c6 100644
--- a/uitest/src/com/vaadin/tests/components/slider/HiddenSliderHandle.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/slider/HiddenSliderHandle.java
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderDisable.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderDisable.java
index a15e0d95ae..a15e0d95ae 100644
--- a/uitest/src/com/vaadin/tests/components/slider/SliderDisable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderDisable.java
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderFeedback.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderFeedback.java
index f28dfc8f79..f28dfc8f79 100644
--- a/uitest/src/com/vaadin/tests/components/slider/SliderFeedback.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderFeedback.java
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderKeyboardFocus.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderKeyboardFocus.java
index fe9450a0f0..fe9450a0f0 100644
--- a/uitest/src/com/vaadin/tests/components/slider/SliderKeyboardFocus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderKeyboardFocus.java
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderPrimaryStyleName.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderPrimaryStyleName.java
index 00e1713222..00e1713222 100644
--- a/uitest/src/com/vaadin/tests/components/slider/SliderPrimaryStyleName.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderPrimaryStyleName.java
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderResize.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderResize.java
index 55ed56299c..55ed56299c 100644
--- a/uitest/src/com/vaadin/tests/components/slider/SliderResize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderResize.java
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderTest.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderTest.java
index 0b9c2d6c5a..0b9c2d6c5a 100644
--- a/uitest/src/com/vaadin/tests/components/slider/SliderTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderTest.java
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderUpdateFromValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderUpdateFromValueChange.java
index 89f834a42f..89f834a42f 100644
--- a/uitest/src/com/vaadin/tests/components/slider/SliderUpdateFromValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderUpdateFromValueChange.java
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderValueFromDataSource.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderValueFromDataSource.java
index 141dc5baf4..141dc5baf4 100644
--- a/uitest/src/com/vaadin/tests/components/slider/SliderValueFromDataSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderValueFromDataSource.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java
index 7c0648876b..7c0648876b 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/GridLayoutWithCheckbox.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/GridLayoutWithCheckbox.java
index 0dc371e57c..0dc371e57c 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/GridLayoutWithCheckbox.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/GridLayoutWithCheckbox.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeight.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeight.java
index 4da5430cb1..4da5430cb1 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeight.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeight.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java
index a330581f22..a330581f22 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/RetainSplitterPositionWhenOutOfBounds.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/RetainSplitterPositionWhenOutOfBounds.java
index ee5a1a62e7..ee5a1a62e7 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/RetainSplitterPositionWhenOutOfBounds.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/RetainSplitterPositionWhenOutOfBounds.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelDuplicateStyleName.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelDuplicateStyleName.java
index e6079dba60..e6079dba60 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelDuplicateStyleName.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelDuplicateStyleName.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
index 7328983f21..7328983f21 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java
index 67ac15ce81..67ac15ce81 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponent.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponent.java
index b788b568c2..b788b568c2 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponent.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java
index 18ea015d01..18ea015d01 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java
index eb1fee145d..eb1fee145d 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelStyleLeak.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelStyleLeak.java
index b634e43f46..b634e43f46 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelStyleLeak.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelStyleLeak.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java
index 26abd0a782..26abd0a782 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java
index bba2feeabe..bba2feeabe 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java
index 3359ec0559..3359ec0559 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java
index 6b17319509..6b17319509 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPositionChange.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPositionChange.java
index 81c449731c..81c449731c 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPositionChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPositionChange.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java
index 219a72c196..219a72c196 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java
diff --git a/uitest/src/com/vaadin/tests/components/table/AddItemToEmptyTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/AddItemToEmptyTable.java
index bde50af013..bde50af013 100644
--- a/uitest/src/com/vaadin/tests/components/table/AddItemToEmptyTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/AddItemToEmptyTable.java
diff --git a/uitest/src/com/vaadin/tests/components/table/AddNonRenderedRow.java b/uitest/src/main/java/com/vaadin/tests/components/table/AddNonRenderedRow.java
index 741c5f6cec..741c5f6cec 100644
--- a/uitest/src/com/vaadin/tests/components/table/AddNonRenderedRow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/AddNonRenderedRow.java
diff --git a/uitest/src/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java b/uitest/src/main/java/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java
index 2d8a30cb12..2d8a30cb12 100644
--- a/uitest/src/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java
diff --git a/uitest/src/com/vaadin/tests/components/table/AsyncPushUpdates.java b/uitest/src/main/java/com/vaadin/tests/components/table/AsyncPushUpdates.java
index 6f9f1df89f..6f9f1df89f 100644
--- a/uitest/src/com/vaadin/tests/components/table/AsyncPushUpdates.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/AsyncPushUpdates.java
diff --git a/uitest/src/com/vaadin/tests/components/table/CellStyleGeneratorTest.java b/uitest/src/main/java/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
index fb4bc5a045..fb4bc5a045 100644
--- a/uitest/src/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ClippedComponentsInTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/ClippedComponentsInTable.java
index 6b8532a9ad..6b8532a9ad 100644
--- a/uitest/src/com/vaadin/tests/components/table/ClippedComponentsInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ClippedComponentsInTable.java
diff --git a/uitest/src/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java b/uitest/src/main/java/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java
index 267b61854f..267b61854f 100644
--- a/uitest/src/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
index 8d1a9fc7df..8d1a9fc7df 100644
--- a/uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnExpandRatio.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnExpandRatio.java
index be176d83fa..be176d83fa 100644
--- a/uitest/src/com/vaadin/tests/components/table/ColumnExpandRatio.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnExpandRatio.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java
index 78b6c0982c..78b6c0982c 100644
--- a/uitest/src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java
index 2898750113..2898750113 100644
--- a/uitest/src/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnHeaderAlignments.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
index 324d1a63cf..324d1a63cf 100644
--- a/uitest/src/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnReorderEvent.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnReorderEvent.java
index f32633eece..f32633eece 100644
--- a/uitest/src/com/vaadin/tests/components/table/ColumnReorderEvent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnReorderEvent.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.java
index aeebd299ff..aeebd299ff 100644
--- a/uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnResizeEvent.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnResizeEvent.java
index f092ba8bca..f092ba8bca 100644
--- a/uitest/src/com/vaadin/tests/components/table/ColumnResizeEvent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnResizeEvent.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnWidths.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidths.java
index 9fe7a98179..9fe7a98179 100644
--- a/uitest/src/com/vaadin/tests/components/table/ColumnWidths.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidths.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java
index 7e33de502c..7e33de502c 100644
--- a/uitest/src/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java b/uitest/src/main/java/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java
index c76edca40d..c76edca40d 100644
--- a/uitest/src/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ContainerSizeChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChange.java
index c24be6de96..c24be6de96 100644
--- a/uitest/src/com/vaadin/tests/components/table/ContainerSizeChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChange.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java b/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java
index 12f28332f4..12f28332f4 100644
--- a/uitest/src/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ContextMenuSize.java b/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java
index ec7301099f..ec7301099f 100644
--- a/uitest/src/com/vaadin/tests/components/table/ContextMenuSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java
diff --git a/uitest/src/com/vaadin/tests/components/table/CtrlShiftMultiselect.java b/uitest/src/main/java/com/vaadin/tests/components/table/CtrlShiftMultiselect.java
index b9e23930e4..b9e23930e4 100644
--- a/uitest/src/com/vaadin/tests/components/table/CtrlShiftMultiselect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/CtrlShiftMultiselect.java
diff --git a/uitest/src/com/vaadin/tests/components/table/DelayedColumnLayouting.java b/uitest/src/main/java/com/vaadin/tests/components/table/DelayedColumnLayouting.java
index c327ddb6f3..c327ddb6f3 100644
--- a/uitest/src/com/vaadin/tests/components/table/DelayedColumnLayouting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/DelayedColumnLayouting.java
diff --git a/uitest/src/com/vaadin/tests/components/table/DisabledSortingTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/DisabledSortingTable.java
index 6dc68de509..6dc68de509 100644
--- a/uitest/src/com/vaadin/tests/components/table/DisabledSortingTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/DisabledSortingTable.java
diff --git a/uitest/src/com/vaadin/tests/components/table/DisabledSortingTableSqlContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/DisabledSortingTableSqlContainer.java
index bc4cd717bf..bc4cd717bf 100644
--- a/uitest/src/com/vaadin/tests/components/table/DisabledSortingTableSqlContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/DisabledSortingTableSqlContainer.java
diff --git a/uitest/src/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java
index ec888c2699..ec888c2699 100644
--- a/uitest/src/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java
diff --git a/uitest/src/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java b/uitest/src/main/java/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java
index c52f57358c..c52f57358c 100644
--- a/uitest/src/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java
diff --git a/uitest/src/com/vaadin/tests/components/table/DndEmptyTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/DndEmptyTable.java
index baac7ce057..baac7ce057 100644
--- a/uitest/src/com/vaadin/tests/components/table/DndEmptyTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/DndEmptyTable.java
diff --git a/uitest/src/com/vaadin/tests/components/table/DndTableTargetDetails.java b/uitest/src/main/java/com/vaadin/tests/components/table/DndTableTargetDetails.java
index 7bebfafd4e..7bebfafd4e 100644
--- a/uitest/src/com/vaadin/tests/components/table/DndTableTargetDetails.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/DndTableTargetDetails.java
diff --git a/uitest/src/com/vaadin/tests/components/table/DoublesInTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/DoublesInTable.java
index 4cf2506eeb..4cf2506eeb 100644
--- a/uitest/src/com/vaadin/tests/components/table/DoublesInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/DoublesInTable.java
diff --git a/uitest/src/com/vaadin/tests/components/table/EditableModeChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java
index e792c90af1..e792c90af1 100644
--- a/uitest/src/com/vaadin/tests/components/table/EditableModeChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java
diff --git a/uitest/src/com/vaadin/tests/components/table/EditableTableFocus.java b/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableFocus.java
index 7686549709..7686549709 100644
--- a/uitest/src/com/vaadin/tests/components/table/EditableTableFocus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableFocus.java
diff --git a/uitest/src/com/vaadin/tests/components/table/EditableTableLeak.java b/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java
index b80da2a78c..b80da2a78c 100644
--- a/uitest/src/com/vaadin/tests/components/table/EditableTableLeak.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java
diff --git a/uitest/src/com/vaadin/tests/components/table/EmptyRowsWhenScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/table/EmptyRowsWhenScrolling.java
index 3bc0d3dd1f..3bc0d3dd1f 100644
--- a/uitest/src/com/vaadin/tests/components/table/EmptyRowsWhenScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/EmptyRowsWhenScrolling.java
diff --git a/uitest/src/com/vaadin/tests/components/table/EmptyTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/EmptyTable.java
index ad9c70444d..ad9c70444d 100644
--- a/uitest/src/com/vaadin/tests/components/table/EmptyTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/EmptyTable.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ExpandingContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainer.java
index a7d387477d..a7d387477d 100644
--- a/uitest/src/com/vaadin/tests/components/table/ExpandingContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainer.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceCondition.java b/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceCondition.java
index 8ad2d7f9c7..8ad2d7f9c7 100644
--- a/uitest/src/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceCondition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceCondition.java
diff --git a/uitest/src/com/vaadin/tests/components/table/FixedHeightTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/FixedHeightTable.java
index 22d6846dea..22d6846dea 100644
--- a/uitest/src/com/vaadin/tests/components/table/FixedHeightTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/FixedHeightTable.java
diff --git a/uitest/src/com/vaadin/tests/components/table/FocusOnSelectedItem.java b/uitest/src/main/java/com/vaadin/tests/components/table/FocusOnSelectedItem.java
index 177f4d68fc..177f4d68fc 100644
--- a/uitest/src/com/vaadin/tests/components/table/FocusOnSelectedItem.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/FocusOnSelectedItem.java
diff --git a/uitest/src/com/vaadin/tests/components/table/Footer.java b/uitest/src/main/java/com/vaadin/tests/components/table/Footer.java
index 5d2d68898c..5d2d68898c 100644
--- a/uitest/src/com/vaadin/tests/components/table/Footer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/Footer.java
diff --git a/uitest/src/com/vaadin/tests/components/table/FooterClick.java b/uitest/src/main/java/com/vaadin/tests/components/table/FooterClick.java
index 8d6a32c9bb..8d6a32c9bb 100644
--- a/uitest/src/com/vaadin/tests/components/table/FooterClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/FooterClick.java
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderClick.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderClick.java
index 2bb48a2b40..2bb48a2b40 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderClick.java
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java
index 09b3dde32c..09b3dde32c 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java
index 6376ad7df0..6376ad7df0 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java
index e9c948ddf7..e9c948ddf7 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderSyncOnScroll.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderSyncOnScroll.java
index 5fe4d4c733..5fe4d4c733 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderSyncOnScroll.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderSyncOnScroll.java
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
index b89582bb7e..b89582bb7e 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
diff --git a/uitest/src/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java b/uitest/src/main/java/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
index 4a729d221f..4a729d221f 100644
--- a/uitest/src/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
diff --git a/uitest/src/com/vaadin/tests/components/table/HiddenComponentCells.java b/uitest/src/main/java/com/vaadin/tests/components/table/HiddenComponentCells.java
index fa88325429..fa88325429 100644
--- a/uitest/src/com/vaadin/tests/components/table/HiddenComponentCells.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HiddenComponentCells.java
diff --git a/uitest/src/com/vaadin/tests/components/table/HugeRowCount.java b/uitest/src/main/java/com/vaadin/tests/components/table/HugeRowCount.java
index 434d650d6d..434d650d6d 100644
--- a/uitest/src/com/vaadin/tests/components/table/HugeRowCount.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HugeRowCount.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ItemClickEvents.java b/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java
index cb69856e95..cb69856e95 100644
--- a/uitest/src/com/vaadin/tests/components/table/ItemClickEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java
diff --git a/uitest/src/com/vaadin/tests/components/table/KeyControl.java b/uitest/src/main/java/com/vaadin/tests/components/table/KeyControl.java
index 2998940db1..2998940db1 100644
--- a/uitest/src/com/vaadin/tests/components/table/KeyControl.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/KeyControl.java
diff --git a/uitest/src/com/vaadin/tests/components/table/KeyboardNavigationDatasourceChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/KeyboardNavigationDatasourceChange.java
index b389727fd3..b389727fd3 100644
--- a/uitest/src/com/vaadin/tests/components/table/KeyboardNavigationDatasourceChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/KeyboardNavigationDatasourceChange.java
diff --git a/uitest/src/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java b/uitest/src/main/java/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
index f9a0add6fc..f9a0add6fc 100644
--- a/uitest/src/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
diff --git a/uitest/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
index b9062236de..b9062236de 100644
--- a/uitest/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
diff --git a/uitest/src/com/vaadin/tests/components/table/LargeSelectionCausesNPE.java b/uitest/src/main/java/com/vaadin/tests/components/table/LargeSelectionCausesNPE.java
index b6ee62ea59..b6ee62ea59 100644
--- a/uitest/src/com/vaadin/tests/components/table/LargeSelectionCausesNPE.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/LargeSelectionCausesNPE.java
diff --git a/uitest/src/com/vaadin/tests/components/table/LastColumnNegative.java b/uitest/src/main/java/com/vaadin/tests/components/table/LastColumnNegative.java
index 87ff6d9d7b..87ff6d9d7b 100644
--- a/uitest/src/com/vaadin/tests/components/table/LastColumnNegative.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/LastColumnNegative.java
diff --git a/uitest/src/com/vaadin/tests/components/table/LeftColumnAlignment.java b/uitest/src/main/java/com/vaadin/tests/components/table/LeftColumnAlignment.java
index 7789d0ae19..7789d0ae19 100644
--- a/uitest/src/com/vaadin/tests/components/table/LeftColumnAlignment.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/LeftColumnAlignment.java
diff --git a/uitest/src/com/vaadin/tests/components/table/LongMultiselect.java b/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java
index d5302cdf45..d5302cdf45 100644
--- a/uitest/src/com/vaadin/tests/components/table/LongMultiselect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java
diff --git a/uitest/src/com/vaadin/tests/components/table/MemoryLeakTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/MemoryLeakTable.java
index 1b76be3b72..1b76be3b72 100644
--- a/uitest/src/com/vaadin/tests/components/table/MemoryLeakTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/MemoryLeakTable.java
diff --git a/uitest/src/com/vaadin/tests/components/table/MissingScrollbar.java b/uitest/src/main/java/com/vaadin/tests/components/table/MissingScrollbar.java
index e51cec2a6d..e51cec2a6d 100644
--- a/uitest/src/com/vaadin/tests/components/table/MissingScrollbar.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/MissingScrollbar.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ModifyContainerProperty.java b/uitest/src/main/java/com/vaadin/tests/components/table/ModifyContainerProperty.java
index 00965220db..00965220db 100644
--- a/uitest/src/com/vaadin/tests/components/table/ModifyContainerProperty.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ModifyContainerProperty.java
diff --git a/uitest/src/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java
index 0e440a95d0..0e440a95d0 100644
--- a/uitest/src/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java
diff --git a/uitest/src/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java b/uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java
index 06deb98f7f..06deb98f7f 100644
--- a/uitest/src/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java
diff --git a/uitest/src/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java b/uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java
index 9c063fd42e..9c063fd42e 100644
--- a/uitest/src/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java
diff --git a/uitest/src/com/vaadin/tests/components/table/NotselectablePaintSelections.java b/uitest/src/main/java/com/vaadin/tests/components/table/NotselectablePaintSelections.java
index cb609b856b..cb609b856b 100644
--- a/uitest/src/com/vaadin/tests/components/table/NotselectablePaintSelections.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/NotselectablePaintSelections.java
diff --git a/uitest/src/com/vaadin/tests/components/table/OddEvenRowStyling.java b/uitest/src/main/java/com/vaadin/tests/components/table/OddEvenRowStyling.java
index 808b05e233..808b05e233 100644
--- a/uitest/src/com/vaadin/tests/components/table/OddEvenRowStyling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/OddEvenRowStyling.java
diff --git a/uitest/src/com/vaadin/tests/components/table/PopupViewInTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/PopupViewInTable.java
index f070d28aa8..f070d28aa8 100644
--- a/uitest/src/com/vaadin/tests/components/table/PopupViewInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/PopupViewInTable.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java b/uitest/src/main/java/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java
index 0b5b1d139c..0b5b1d139c 100644
--- a/uitest/src/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java
diff --git a/uitest/src/com/vaadin/tests/components/table/PropertyValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java
index 1e3c058458..1e3c058458 100644
--- a/uitest/src/com/vaadin/tests/components/table/PropertyValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java
diff --git a/uitest/src/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java b/uitest/src/main/java/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java
index 809cb67226..809cb67226 100644
--- a/uitest/src/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ReloadWidgets.java b/uitest/src/main/java/com/vaadin/tests/components/table/ReloadWidgets.java
index ef72f92a4e..ef72f92a4e 100644
--- a/uitest/src/com/vaadin/tests/components/table/ReloadWidgets.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ReloadWidgets.java
diff --git a/uitest/src/com/vaadin/tests/components/table/RemoveItemOnClick.java b/uitest/src/main/java/com/vaadin/tests/components/table/RemoveItemOnClick.java
index cb9dc57d09..cb9dc57d09 100644
--- a/uitest/src/com/vaadin/tests/components/table/RemoveItemOnClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/RemoveItemOnClick.java
diff --git a/uitest/src/com/vaadin/tests/components/table/RowAdditionTest.java b/uitest/src/main/java/com/vaadin/tests/components/table/RowAdditionTest.java
index c6d071f34c..c6d071f34c 100644
--- a/uitest/src/com/vaadin/tests/components/table/RowAdditionTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/RowAdditionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/RowGenerators.java b/uitest/src/main/java/com/vaadin/tests/components/table/RowGenerators.java
index c3bf46c12d..c3bf46c12d 100644
--- a/uitest/src/com/vaadin/tests/components/table/RowGenerators.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/RowGenerators.java
diff --git a/uitest/src/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java b/uitest/src/main/java/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java
index bcae4dc6d9..bcae4dc6d9 100644
--- a/uitest/src/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java b/uitest/src/main/java/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java
index b1dd628bf2..b1dd628bf2 100644
--- a/uitest/src/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java b/uitest/src/main/java/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
index 007f3bbc2b..007f3bbc2b 100644
--- a/uitest/src/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ScrollDetachSynchronization.java b/uitest/src/main/java/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
index 9423968ecf..9423968ecf 100644
--- a/uitest/src/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SelectAllConstantViewport.java b/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllConstantViewport.java
index 5a406eac48..5a406eac48 100644
--- a/uitest/src/com/vaadin/tests/components/table/SelectAllConstantViewport.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllConstantViewport.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SelectAllRows.java b/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRows.java
index 4778bca3b5..4778bca3b5 100644
--- a/uitest/src/com/vaadin/tests/components/table/SelectAllRows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRows.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SelectAllRowsShiftFirst.java b/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRowsShiftFirst.java
index 8d3e922fa9..8d3e922fa9 100644
--- a/uitest/src/com/vaadin/tests/components/table/SelectAllRowsShiftFirst.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRowsShiftFirst.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SelectableEditable.java b/uitest/src/main/java/com/vaadin/tests/components/table/SelectableEditable.java
index 2b33c71d2a..2b33c71d2a 100644
--- a/uitest/src/com/vaadin/tests/components/table/SelectableEditable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SelectableEditable.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SelectingItemScrollsRight.java b/uitest/src/main/java/com/vaadin/tests/components/table/SelectingItemScrollsRight.java
index d9401c21b4..d9401c21b4 100644
--- a/uitest/src/com/vaadin/tests/components/table/SelectingItemScrollsRight.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SelectingItemScrollsRight.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java b/uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java
index 22e60406a6..22e60406a6 100644
--- a/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java b/uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java
index 5e1c4cca66..5e1c4cca66 100644
--- a/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java b/uitest/src/main/java/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java
index 5749912f43..5749912f43 100644
--- a/uitest/src/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java b/uitest/src/main/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java
index e643ef5fa0..e643ef5fa0 100644
--- a/uitest/src/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ShowLastItem.java b/uitest/src/main/java/com/vaadin/tests/components/table/ShowLastItem.java
index 6d6f744918..6d6f744918 100644
--- a/uitest/src/com/vaadin/tests/components/table/ShowLastItem.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ShowLastItem.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SortLabelsInTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/SortLabelsInTable.java
index 499cce58c8..499cce58c8 100644
--- a/uitest/src/com/vaadin/tests/components/table/SortLabelsInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SortLabelsInTable.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SortLongTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/SortLongTable.java
index edad05e191..edad05e191 100644
--- a/uitest/src/com/vaadin/tests/components/table/SortLongTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SortLongTable.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SortableHeaderStyles.java b/uitest/src/main/java/com/vaadin/tests/components/table/SortableHeaderStyles.java
index a41f4248d9..a41f4248d9 100644
--- a/uitest/src/com/vaadin/tests/components/table/SortableHeaderStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SortableHeaderStyles.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableAfterRemovingExpandRatios.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatios.java
index a2c8dd02e6..a2c8dd02e6 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableAfterRemovingExpandRatios.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatios.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
index eb5beec6bd..eb5beec6bd 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableBlurFocus.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableBlurFocus.java
index d95b406c1a..d95b406c1a 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableBlurFocus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableBlurFocus.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java
index 75f2679234..75f2679234 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableCacheMinimizingOnFetchRows.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableCacheMinimizingOnFetchRows.java
index 745f2344a3..745f2344a3 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableCacheMinimizingOnFetchRows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableCacheMinimizingOnFetchRows.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableChildMeasurementHint.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java
index dd5d162e17..dd5d162e17 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableChildMeasurementHint.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
index 64f1a64558..64f1a64558 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
index 6fa86543cb..6fa86543cb 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableColumnAddAndResize.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnAddAndResize.java
index 40751047b1..40751047b1 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableColumnAddAndResize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnAddAndResize.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java
index b785f439ea..b785f439ea 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableColumnWidthsAndExpandRatios.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndExpandRatios.java
index b1ecb3fc10..b1ecb3fc10 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableColumnWidthsAndExpandRatios.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndExpandRatios.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableColumnWidthsAndSorting.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndSorting.java
index 8f0a8803f3..8f0a8803f3 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableColumnWidthsAndSorting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndSorting.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableContextMenu.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenu.java
index 9416ffe70c..9416ffe70c 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableContextMenu.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenu.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableContextMenuOnField.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuOnField.java
index 3b639be21f..3b639be21f 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableContextMenuOnField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuOnField.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableContextMenuTouch.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuTouch.java
index 1d909d101e..1d909d101e 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableContextMenuTouch.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuTouch.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableDropIndicatorValo.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableDropIndicatorValo.java
index e3848bb152..e3848bb152 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableDropIndicatorValo.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableDropIndicatorValo.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableExtraScrollbars.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableExtraScrollbars.java
index ccf521c500..ccf521c500 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableExtraScrollbars.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableExtraScrollbars.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableFirstRowFlicker.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableFirstRowFlicker.java
index 3f3255f525..3f3255f525 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableFirstRowFlicker.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableFirstRowFlicker.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableFocusOnRefreshRowCache.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableFocusOnRefreshRowCache.java
index a4bd11cf9c..a4bd11cf9c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableFocusOnRefreshRowCache.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableFocusOnRefreshRowCache.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableHeaderShifting.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableHeaderShifting.java
index 9dc641ddc4..9dc641ddc4 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableHeaderShifting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableHeaderShifting.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableHeaderZoom.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableHeaderZoom.java
index 95952cb8e7..95952cb8e7 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableHeaderZoom.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableHeaderZoom.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
index 055820210a..055820210a 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableInSubWindowMemoryLeak.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableInSubWindowMemoryLeak.java
index c0c8876fca..c0c8876fca 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableInSubWindowMemoryLeak.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableInSubWindowMemoryLeak.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableInTabsheet.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java
index ee9609bb96..ee9609bb96 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableInTabsheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java
index 809e639448..809e639448 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableItemIcon.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableItemIcon.java
index 1faa9667c2..1faa9667c2 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableItemIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableItemIcon.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableLastRowMissing.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableLastRowMissing.java
index 18d13e676b..18d13e676b 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableLastRowMissing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableLastRowMissing.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java
index 1515589b4c..1515589b4c 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java
index 74a5089a84..74a5089a84 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java
index 8f6e6c685f..8f6e6c685f 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableMultiSelectSimple.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableMultiSelectSimple.java
index d6a79759ac..d6a79759ac 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableMultiSelectSimple.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableMultiSelectSimple.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableNavigationPageDown.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableNavigationPageDown.java
index b1281dcc7b..b1281dcc7b 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableNavigationPageDown.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableNavigationPageDown.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TablePageLengthCalculation.java b/uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthCalculation.java
index e56f686218..e56f686218 100644
--- a/uitest/src/com/vaadin/tests/components/table/TablePageLengthCalculation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthCalculation.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TablePageLengthUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthUpdate.java
index 75b672a277..75b672a277 100644
--- a/uitest/src/com/vaadin/tests/components/table/TablePageLengthUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthUpdate.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableParentEnabledStateChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableParentEnabledStateChange.java
index 9aeb25002d..9aeb25002d 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableParentEnabledStateChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableParentEnabledStateChange.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableReduceContainerSize.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableReduceContainerSize.java
index 30db12371d..30db12371d 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableReduceContainerSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableReduceContainerSize.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java
index 710a4f8fe3..710a4f8fe3 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java
index 2b02e89c80..2b02e89c80 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java
index bee0839663..bee0839663 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableRequiredIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRequiredIndicator.java
index 2985932145..2985932145 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableRequiredIndicator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRequiredIndicator.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableRowHeight.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight.java
index eb5efbc4f3..eb5efbc4f3 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableRowHeight.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableRowHeight2.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java
index 5c733b9e24..5c733b9e24 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableRowHeight2.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableRowHeight3.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight3.java
index c31b87f9da..c31b87f9da 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableRowHeight3.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight3.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableRowScrolledBottom.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java
index e1fe4d0514..e1fe4d0514 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableRowScrolledBottom.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableScrollAfterAddRow.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollAfterAddRow.java
index d1d6edaa67..d1d6edaa67 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableScrollAfterAddRow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollAfterAddRow.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableScrollOnFocus.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollOnFocus.java
index 7e75e8a32d..7e75e8a32d 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableScrollOnFocus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollOnFocus.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableScrollUpOnSelect.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollUpOnSelect.java
index 0e2e1b76e1..0e2e1b76e1 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableScrollUpOnSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollUpOnSelect.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableScrollingWithSQLContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainer.java
index 61f8952041..61f8952041 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableScrollingWithSQLContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainer.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableScrollsOnSelection.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollsOnSelection.java
index 104cd0ab3b..104cd0ab3b 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableScrollsOnSelection.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollsOnSelection.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableSelectPagingOff.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSelectPagingOff.java
index d97e0a5cef..d97e0a5cef 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableSelectPagingOff.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSelectPagingOff.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableSetUndefinedSize.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSetUndefinedSize.java
index e355c0d0ea..e355c0d0ea 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableSetUndefinedSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSetUndefinedSize.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
index 030a4ee259..030a4ee259 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableSingleSelect.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSingleSelect.java
index 92a1491c56..92a1491c56 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableSingleSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSingleSelect.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableSizeInTabsheet.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSizeInTabsheet.java
index da37d1f2d2..da37d1f2d2 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableSizeInTabsheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSizeInTabsheet.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableSorting.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSorting.java
index 85819784c0..85819784c0 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableSorting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSorting.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableSortingIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingIndicator.java
index 93fe8d7d9e..93fe8d7d9e 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableSortingIndicator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingIndicator.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableSortingStopsWorkingOnChrome.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingStopsWorkingOnChrome.java
index 23d0581e5a..23d0581e5a 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableSortingStopsWorkingOnChrome.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingStopsWorkingOnChrome.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableSqlContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSqlContainer.java
index 3b5949dd40..3b5949dd40 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableSqlContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSqlContainer.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableToggleColumnVisibility.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibility.java
index e78f247184..e78f247184 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableToggleColumnVisibility.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibility.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java
index 442f00f346..442f00f346 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableToggleVisibility.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleVisibility.java
index f89d2d2934..f89d2d2934 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableToggleVisibility.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleVisibility.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableTooManyColumns.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableTooManyColumns.java
index 2d27636420..2d27636420 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableTooManyColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableTooManyColumns.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableUndefinedSize.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableUndefinedSize.java
index 544fe9bb67..544fe9bb67 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableUndefinedSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableUndefinedSize.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableUnregisterComponent.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java
index 11f450baf2..11f450baf2 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableUnregisterComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java
index b24c560bfe..b24c560bfe 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableWidthItemRemove.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWidthItemRemove.java
index bd84fab309..bd84fab309 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableWidthItemRemove.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWidthItemRemove.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.java
index c571329d14..c571329d14 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableWithChildComponents.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithChildComponents.java
index 7eb9c3239c..7eb9c3239c 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableWithChildComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithChildComponents.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java
index 4ca83b22bd..4ca83b22bd 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java
index a3f0ce2f13..a3f0ce2f13 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableWithManyColumns.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithManyColumns.java
index c73409838a..c73409838a 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableWithManyColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithManyColumns.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java
index 226fde3b29..226fde3b29 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableWithPolling.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithPolling.java
index fdd5c2901a..fdd5c2901a 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableWithPolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithPolling.java
diff --git a/uitest/src/com/vaadin/tests/components/table/Tables.java b/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java
index e82cb8321f..e82cb8321f 100644
--- a/uitest/src/com/vaadin/tests/components/table/Tables.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TabletContextMenu.java b/uitest/src/main/java/com/vaadin/tests/components/table/TabletContextMenu.java
index 193cb499a7..193cb499a7 100644
--- a/uitest/src/com/vaadin/tests/components/table/TabletContextMenu.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TabletContextMenu.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java b/uitest/src/main/java/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
index 8244835df7..8244835df7 100644
--- a/uitest/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.java b/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldRelativeWidth.java
index 4799d05415..4799d05415 100644
--- a/uitest/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldRelativeWidth.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java b/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java
index 89c9050361..89c9050361 100644
--- a/uitest/src/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TooManySetColumnCollapsedCalls.java b/uitest/src/main/java/com/vaadin/tests/components/table/TooManySetColumnCollapsedCalls.java
index 30921392e8..30921392e8 100644
--- a/uitest/src/com/vaadin/tests/components/table/TooManySetColumnCollapsedCalls.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TooManySetColumnCollapsedCalls.java
diff --git a/uitest/src/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java b/uitest/src/main/java/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java
index 8e623499cf..8e623499cf 100644
--- a/uitest/src/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java
diff --git a/uitest/src/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZooming.java b/uitest/src/main/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZooming.java
index 8d95261825..8d95261825 100644
--- a/uitest/src/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZooming.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZooming.java
diff --git a/uitest/src/com/vaadin/tests/components/table/UpdateTableWhenUnfocused.java b/uitest/src/main/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocused.java
index 231375c2ea..231375c2ea 100644
--- a/uitest/src/com/vaadin/tests/components/table/UpdateTableWhenUnfocused.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocused.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ValueAfterClearingContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/ValueAfterClearingContainer.java
index b0622e748c..b0622e748c 100644
--- a/uitest/src/com/vaadin/tests/components/table/ValueAfterClearingContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ValueAfterClearingContainer.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ViewPortCalculation.java b/uitest/src/main/java/com/vaadin/tests/components/table/ViewPortCalculation.java
index de32ea1fc0..de32ea1fc0 100644
--- a/uitest/src/com/vaadin/tests/components/table/ViewPortCalculation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ViewPortCalculation.java
diff --git a/uitest/src/com/vaadin/tests/components/table/WideSelectableTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/WideSelectableTable.java
index 60e7db5c0d..60e7db5c0d 100644
--- a/uitest/src/com/vaadin/tests/components/table/WideSelectableTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/WideSelectableTable.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java
index 4b5d216906..4b5d216906 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/EmptyTabSheet.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/EmptyTabSheet.java
index 3cbe624ee0..3cbe624ee0 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/EmptyTabSheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/EmptyTabSheet.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/ExtraScrollbarsInTabSheet.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/ExtraScrollbarsInTabSheet.java
index 63d50e0464..63d50e0464 100755
--- a/uitest/src/com/vaadin/tests/components/tabsheet/ExtraScrollbarsInTabSheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/ExtraScrollbarsInTabSheet.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheet.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheet.java
index 3e132c583b..3e132c583b 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheet.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClipped.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClipped.java
index 969e76691e..969e76691e 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClipped.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClipped.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/HiddenTabSheetBrowserResize.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/HiddenTabSheetBrowserResize.java
index eac786d9b3..eac786d9b3 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/HiddenTabSheetBrowserResize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/HiddenTabSheetBrowserResize.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/HtmlInTabCaption.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/HtmlInTabCaption.java
index 66a27a10b5..66a27a10b5 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/HtmlInTabCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/HtmlInTabCaption.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/MoveComponentBetweenTabsheets.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/MoveComponentBetweenTabsheets.java
index 624fac6e75..624fac6e75 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/MoveComponentBetweenTabsheets.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/MoveComponentBetweenTabsheets.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/NestedTabSheetsHideTabs.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/NestedTabSheetsHideTabs.java
index 0e958e632c..0e958e632c 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/NestedTabSheetsHideTabs.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/NestedTabSheetsHideTabs.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemove.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemove.java
index 939bd645ea..939bd645ea 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemove.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemove.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/PreventTabChange.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/PreventTabChange.java
index fddb036728..fddb036728 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/PreventTabChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/PreventTabChange.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/RemoveTabs.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/RemoveTabs.java
index 2b37c4358e..2b37c4358e 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/RemoveTabs.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/RemoveTabs.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java
index 12da99b7f4..12da99b7f4 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabBarWidth.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabBarWidth.java
index accd77ae0e..accd77ae0e 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabBarWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabBarWidth.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java
index 0d4f1fe562..0d4f1fe562 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
index 620f04fe60..620f04fe60 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java
index e394594176..e394594176 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServer.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServer.java
index 0d7ec48a99..0d7ec48a99 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServer.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java
index 09e34307c0..09e34307c0 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetClose.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetClose.java
index 2cadde567f..2cadde567f 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetClose.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetClose.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java
index dfe37f2e27..dfe37f2e27 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java
index 8d312f0cd8..8d312f0cd8 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltip.java
index c4af98eb3f..c4af98eb3f 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltip.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetFocusing.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetFocusing.java
index 941073d617..941073d617 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetFocusing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetFocusing.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetHotKeysWithModifiers.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetHotKeysWithModifiers.java
index 779ab6b614..779ab6b614 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetHotKeysWithModifiers.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetHotKeysWithModifiers.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIcons.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
index c5e01969a1..c5e01969a1 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParent.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParent.java
index 2ccbfeef76..2ccbfeef76 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParent.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanel.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanel.java
index b2313020a3..b2313020a3 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanel.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanel.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java
index de637bbed7..de637bbed7 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java
index b6cf27f6bb..b6cf27f6bb 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabClose.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabClose.java
index 1400100f3b..1400100f3b 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabClose.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabClose.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java
index c14203e765..c14203e765 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java
index 5c76effefd..5c76effefd 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTest.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTest.java
index 56836037b7..56836037b7 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.java
index aed273dd64..aed273dd64 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java
index 2dd4993aca..2dd4993aca 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithTabIds.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithTabIds.java
index 42d65f66c9..42d65f66c9 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithTabIds.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithTabIds.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.java
index d766277b48..d766277b48 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSpaceNotScroll.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSpaceNotScroll.java
index 3a5be51e47..3a5be51e47 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSpaceNotScroll.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSpaceNotScroll.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.java
index ebfee0adb0..ebfee0adb0 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetNPE.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNPE.java
index 0aa10662fa..0aa10662fa 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetNPE.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNPE.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpace.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpace.java
index 0105498f27..0105498f27 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpace.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpace.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java
index da449a2461..da449a2461 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java
index bbbd4ca7e4..bbbd4ca7e4 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetTooltip.java
index fefd7a0b28..fefd7a0b28 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetTooltip.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
index 110f26d478..110f26d478 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/VetoTabChange.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VetoTabChange.java
index 6671b8641d..6671b8641d 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/VetoTabChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VetoTabChange.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java
index 1e56aa49a7..1e56aa49a7 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java
diff --git a/uitest/src/com/vaadin/tests/components/textarea/ScrollCursor.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/ScrollCursor.java
index 154a30a64b..154a30a64b 100644
--- a/uitest/src/com/vaadin/tests/components/textarea/ScrollCursor.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/ScrollCursor.java
diff --git a/uitest/src/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
index 756970898e..756970898e 100644
--- a/uitest/src/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
diff --git a/uitest/src/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java
index b2607050a4..b2607050a4 100644
--- a/uitest/src/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java
diff --git a/uitest/src/com/vaadin/tests/components/textarea/TextAreaTest.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaTest.java
index e071bdd8fb..e071bdd8fb 100644
--- a/uitest/src/com/vaadin/tests/components/textarea/TextAreaTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaTest.java
diff --git a/uitest/src/com/vaadin/tests/components/textarea/TextDisappearsOnBlur.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextDisappearsOnBlur.java
index 2d2cf29e9e..2d2cf29e9e 100644
--- a/uitest/src/com/vaadin/tests/components/textarea/TextDisappearsOnBlur.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextDisappearsOnBlur.java
diff --git a/uitest/src/com/vaadin/tests/components/textarea/Wordwrap.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/Wordwrap.java
index 8672d4019e..8672d4019e 100644
--- a/uitest/src/com/vaadin/tests/components/textarea/Wordwrap.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/Wordwrap.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/AutomaticImmediate.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/AutomaticImmediate.java
index ac51b5fc87..ac51b5fc87 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/AutomaticImmediate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/AutomaticImmediate.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/BigDecimalTextField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java
index c7e449c314..c7e449c314 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/BigDecimalTextField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
index 938ecf60ce..938ecf60ce 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/EnumTextField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/EnumTextField.java
index 99e08ae32d..99e08ae32d 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/EnumTextField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/EnumTextField.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/IE6Cursor.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/IE6Cursor.java
index eb3d3fdd51..eb3d3fdd51 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/IE6Cursor.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/IE6Cursor.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/InputPromptGetText.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java
index e117657a3a..e117657a3a 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/InputPromptGetText.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java
index 06469550c9..06469550c9 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java
index 24feab5cab..24feab5cab 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java
index 955a9c2772..955a9c2772 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/RequiredTextField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/RequiredTextField.java
index 79f5a7e83b..79f5a7e83b 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/RequiredTextField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/RequiredTextField.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java
index d63d7ddc66..d63d7ddc66 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/SetTabIndex.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/SetTabIndex.java
index da4ea9de0b..da4ea9de0b 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/SetTabIndex.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/SetTabIndex.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/SizedTextFields.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/SizedTextFields.java
index 7d993682fd..7d993682fd 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/SizedTextFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/SizedTextFields.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextChangeEvents.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents.java
index 531392b84a..531392b84a 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextChangeEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextChangeEvents2.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java
index d64dbb42d6..d64dbb42d6 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextChangeEvents2.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java
index 331c8d2efc..331c8d2efc 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
index ebb8b88411..ebb8b88411 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
index 5991ac6ff7..5991ac6ff7 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java
index 25ca46333a..25ca46333a 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
index 00783e0106..00783e0106 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
index e103afbe62..e103afbe62 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldEmptyingPrompt.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEmptyingPrompt.java
index 9fe18f131b..9fe18f131b 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldEmptyingPrompt.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEmptyingPrompt.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
index 21dba6a196..21dba6a196 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
index 4299336f74..4299336f74 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java
index d52efa0572..d52efa0572 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldMaxLengthRemovedFromDOM.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldMaxLengthRemovedFromDOM.java
index 049b08d4e8..049b08d4e8 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldMaxLengthRemovedFromDOM.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldMaxLengthRemovedFromDOM.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldPrimaryStyleName.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldPrimaryStyleName.java
index 5746f74b5a..5746f74b5a 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldPrimaryStyleName.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldPrimaryStyleName.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java
index 10793a8bad..10793a8bad 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogs.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogs.java
index c125d8da86..c125d8da86 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogs.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogs.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java
index 881aa11fbb..881aa11fbb 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithProperty.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithProperty.java
index 747301f4e4..747301f4e4 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithProperty.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithProperty.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java
index 6960fed2fe..6960fed2fe 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFields.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFields.java
index 994769b1d1..994769b1d1 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFields.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java b/uitest/src/main/java/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java
index 3ce2e38eba..3ce2e38eba 100644
--- a/uitest/src/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/DndTreeTargetDetails.java b/uitest/src/main/java/com/vaadin/tests/components/tree/DndTreeTargetDetails.java
index 443f290809..443f290809 100644
--- a/uitest/src/com/vaadin/tests/components/tree/DndTreeTargetDetails.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/DndTreeTargetDetails.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/ExpandCollapseTree.java b/uitest/src/main/java/com/vaadin/tests/components/tree/ExpandCollapseTree.java
index 81e177c39b..81e177c39b 100644
--- a/uitest/src/com/vaadin/tests/components/tree/ExpandCollapseTree.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/ExpandCollapseTree.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/ItemStyleGenerator.java b/uitest/src/main/java/com/vaadin/tests/components/tree/ItemStyleGenerator.java
index c561781d2b..c561781d2b 100644
--- a/uitest/src/com/vaadin/tests/components/tree/ItemStyleGenerator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/ItemStyleGenerator.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/PreselectedTreeVisible.java b/uitest/src/main/java/com/vaadin/tests/components/tree/PreselectedTreeVisible.java
index b812c9e955..b812c9e955 100644
--- a/uitest/src/com/vaadin/tests/components/tree/PreselectedTreeVisible.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/PreselectedTreeVisible.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/SelectItemAfterRemove.java b/uitest/src/main/java/com/vaadin/tests/components/tree/SelectItemAfterRemove.java
index 8002f5100e..8002f5100e 100644
--- a/uitest/src/com/vaadin/tests/components/tree/SelectItemAfterRemove.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/SelectItemAfterRemove.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/SimpleTree.java b/uitest/src/main/java/com/vaadin/tests/components/tree/SimpleTree.java
index f3e47d0996..f3e47d0996 100644
--- a/uitest/src/com/vaadin/tests/components/tree/SimpleTree.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/SimpleTree.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeConnectors.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java
index ab9bcd9a99..ab9bcd9a99 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeConnectors.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeContainerChange.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeContainerChange.java
index 2dde7bbb30..2dde7bbb30 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeContainerChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeContainerChange.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java
index 7aa3933752..7aa3933752 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeFiltering.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFiltering.java
index 6df69c850b..6df69c850b 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeFiltering.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFiltering.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeFocusGaining.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFocusGaining.java
index dd407fd62a..dd407fd62a 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeFocusGaining.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFocusGaining.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeHorizontalResize.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHorizontalResize.java
index ef378b420a..ef378b420a 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeHorizontalResize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHorizontalResize.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java
index b20b7c3aab..b20b7c3aab 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeIconUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeIconUpdate.java
index 6580133645..6580133645 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeIconUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeIconUpdate.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeItemClickListening.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemClickListening.java
index a3f2b113cd..a3f2b113cd 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeItemClickListening.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemClickListening.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeItemDoubleClick.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemDoubleClick.java
index 9031a76e66..9031a76e66 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeItemDoubleClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemDoubleClick.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediate.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediate.java
index 8e0f39be99..8e0f39be99 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediate.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java
index bb7c0350f2..bb7c0350f2 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNone.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNone.java
index dfea493281..dfea493281 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNone.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNone.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java
index 9204f0495b..9204f0495b 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java
index f885e1d1da..f885e1d1da 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreePerformanceTest.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreePerformanceTest.java
index 45084fd57d..45084fd57d 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreePerformanceTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreePerformanceTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrolling.java
index 2311f3ec30..2311f3ec30 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrolling.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeScrollingOnRightClick.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClick.java
index 8a2b263006..8a2b263006 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeScrollingOnRightClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClick.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java
index ba128025cd..ba128025cd 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeToolTips.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeToolTips.java
index 59e3fec1f9..59e3fec1f9 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeToolTips.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeToolTips.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeWithIcons.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeWithIcons.java
index a1576ffed1..a1576ffed1 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeWithIcons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeWithIcons.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java
index 8da6759b20..8da6759b20 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/Trees.java b/uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java
index f12d6adbb3..f12d6adbb3 100644
--- a/uitest/src/com/vaadin/tests/components/tree/Trees.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/AddNodesOnExpand.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/AddNodesOnExpand.java
index d048f0a4f4..d048f0a4f4 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/AddNodesOnExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/AddNodesOnExpand.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java
index 3d40bc47cf..3d40bc47cf 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java
index 8ff80204cc..8ff80204cc 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/DisappearingComponents.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/DisappearingComponents.java
index ee64007234..ee64007234 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/DisappearingComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/DisappearingComponents.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/DynamicallyModified.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/DynamicallyModified.java
index e089237b54..e089237b54 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/DynamicallyModified.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/DynamicallyModified.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java
index 2042edeea2..2042edeea2 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java
index f444b781dd..f444b781dd 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/MinimalWidthColumns.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/MinimalWidthColumns.java
index c4679f739b..c4679f739b 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/MinimalWidthColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/MinimalWidthColumns.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java
index ea76a9639a..ea76a9639a 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticSelect.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticSelect.java
index 7088497b4e..7088497b4e 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticSelect.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java
index 4372341161..4372341161 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/RowHeightWithoutRows.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/RowHeightWithoutRows.java
index 615fb719a8..615fb719a8 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/RowHeightWithoutRows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/RowHeightWithoutRows.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java
index de33d26051..de33d26051 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapper.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapper.java
index 95f8c54e9e..95f8c54e9e 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapper.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapper.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.java
index 79c967914f..79c967914f 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableExtraScrollbarWithChildren.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbarWithChildren.java
index 0dc98b2c2e..0dc98b2c2e 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableExtraScrollbarWithChildren.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbarWithChildren.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableInternalError.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableInternalError.java
index 1b510f1ac5..1b510f1ac5 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableInternalError.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableInternalError.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUI.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUI.java
index ba057f4c41..ba057f4c41 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUI.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java
index 02ce397a05..02ce397a05 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java
index b8a0ac61c2..b8a0ac61c2 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java
index 78d67ee090..78d67ee090 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java
index 686d86a0dc..686d86a0dc 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableRowGenerator.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowGenerator.java
index e8da4abbec..e8da4abbec 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableRowGenerator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowGenerator.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableRowHeaderMode.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderMode.java
index 6bc6fa74c0..6bc6fa74c0 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableRowHeaderMode.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderMode.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableRowIcons.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowIcons.java
index 0668a6aeeb..0668a6aeeb 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableRowIcons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowIcons.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableScrollOnExpand.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpand.java
index 07cf7f8c2e..07cf7f8c2e 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableScrollOnExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpand.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java
index 7159addb5b..7159addb5b 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableTest.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableTest.java
index 02f848cd40..02f848cd40 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableTest.java
diff --git a/uitest/src/com/vaadin/tests/components/twincolselect/TwinColSelects.java b/uitest/src/main/java/com/vaadin/tests/components/twincolselect/TwinColSelects.java
index fc1b11bb94..fc1b11bb94 100644
--- a/uitest/src/com/vaadin/tests/components/twincolselect/TwinColSelects.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/twincolselect/TwinColSelects.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java b/uitest/src/main/java/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java
index d4599fc1a3..d4599fc1a3 100644
--- a/uitest/src/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/ComponentIncludedInCustomWidgetset.java b/uitest/src/main/java/com/vaadin/tests/components/ui/ComponentIncludedInCustomWidgetset.java
index f674567a2d..f674567a2d 100644
--- a/uitest/src/com/vaadin/tests/components/ui/ComponentIncludedInCustomWidgetset.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/ComponentIncludedInCustomWidgetset.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetset.java b/uitest/src/main/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetset.java
index 554a461c37..554a461c37 100644
--- a/uitest/src/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetset.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetset.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/CurrentUiRetained.java b/uitest/src/main/java/com/vaadin/tests/components/ui/CurrentUiRetained.java
index cba2adb5db..cba2adb5db 100644
--- a/uitest/src/com/vaadin/tests/components/ui/CurrentUiRetained.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/CurrentUiRetained.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/CustomUITest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/CustomUITest.java
index a960e9cc46..a960e9cc46 100644
--- a/uitest/src/com/vaadin/tests/components/ui/CustomUITest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/CustomUITest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/DynamicViewport.java b/uitest/src/main/java/com/vaadin/tests/components/ui/DynamicViewport.java
index ca9ebcd451..ca9ebcd451 100644
--- a/uitest/src/com/vaadin/tests/components/ui/DynamicViewport.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/DynamicViewport.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/EmptyWindow.java b/uitest/src/main/java/com/vaadin/tests/components/ui/EmptyWindow.java
index 07ce8c3ff8..07ce8c3ff8 100644
--- a/uitest/src/com/vaadin/tests/components/ui/EmptyWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/EmptyWindow.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/IdOverrideTest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/IdOverrideTest.java
index eeadc89691..eeadc89691 100644
--- a/uitest/src/com/vaadin/tests/components/ui/IdOverrideTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/IdOverrideTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/InitialFragmentEvent.java b/uitest/src/main/java/com/vaadin/tests/components/ui/InitialFragmentEvent.java
index d8d197c881..d8d197c881 100644
--- a/uitest/src/com/vaadin/tests/components/ui/InitialFragmentEvent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/InitialFragmentEvent.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/InvalidViewport.java b/uitest/src/main/java/com/vaadin/tests/components/ui/InvalidViewport.java
index 9557a2d2b0..9557a2d2b0 100644
--- a/uitest/src/com/vaadin/tests/components/ui/InvalidViewport.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/InvalidViewport.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java b/uitest/src/main/java/com/vaadin/tests/components/ui/LazyInitUIs.java
index 984ac69d6e..984ac69d6e 100644
--- a/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/LazyInitUIs.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java
index 3c857a8753..3c857a8753 100644
--- a/uitest/src/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/MultiFileUploadTest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/MultiFileUploadTest.java
index 007a49e0e2..007a49e0e2 100644
--- a/uitest/src/com/vaadin/tests/components/ui/MultiFileUploadTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/MultiFileUploadTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/MultipleUIUploadTest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/MultipleUIUploadTest.java
index f92e22d06b..f92e22d06b 100644
--- a/uitest/src/com/vaadin/tests/components/ui/MultipleUIUploadTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/MultipleUIUploadTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/PollListening.java b/uitest/src/main/java/com/vaadin/tests/components/ui/PollListening.java
index 1ec4f4d9f7..1ec4f4d9f7 100644
--- a/uitest/src/com/vaadin/tests/components/ui/PollListening.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/PollListening.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/RpcInvocationHandlerToString.java b/uitest/src/main/java/com/vaadin/tests/components/ui/RpcInvocationHandlerToString.java
index 1dbcc0ab2b..1dbcc0ab2b 100644
--- a/uitest/src/com/vaadin/tests/components/ui/RpcInvocationHandlerToString.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/RpcInvocationHandlerToString.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/StaticViewport.java b/uitest/src/main/java/com/vaadin/tests/components/ui/StaticViewport.java
index 813206dbe8..813206dbe8 100644
--- a/uitest/src/com/vaadin/tests/components/ui/StaticViewport.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/StaticViewport.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/TestUITheme.java b/uitest/src/main/java/com/vaadin/tests/components/ui/TestUITheme.java
index bfed424483..bfed424483 100644
--- a/uitest/src/com/vaadin/tests/components/ui/TestUITheme.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/TestUITheme.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/TextAreaEventPropagation.java b/uitest/src/main/java/com/vaadin/tests/components/ui/TextAreaEventPropagation.java
index 0d38de5923..0d38de5923 100644
--- a/uitest/src/com/vaadin/tests/components/ui/TextAreaEventPropagation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/TextAreaEventPropagation.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivity.java b/uitest/src/main/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivity.java
index cb62ccdb19..cb62ccdb19 100644
--- a/uitest/src/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivity.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivity.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIAccess.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccess.java
index 70a69ef7d3..70a69ef7d3 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIAccess.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccess.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIAccessExceptionHandling.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccessExceptionHandling.java
index bd18d93328..bd18d93328 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIAccessExceptionHandling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIAccessExceptionHandling.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIAutoGeneratedStyleName.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIAutoGeneratedStyleName.java
index 35dc4cd325..35dc4cd325 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIAutoGeneratedStyleName.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIAutoGeneratedStyleName.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIInitBrowserDetails.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitBrowserDetails.java
index 130d432940..130d432940 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIInitBrowserDetails.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitBrowserDetails.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIInitException.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitException.java
index d5f26ade29..d5f26ade29 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIInitException.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitException.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitTest.java
index 7d5bbe156b..7d5bbe156b 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIPolling.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIPolling.java
index 7d9f09892c..7d9f09892c 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIPolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIPolling.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIRefresh.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIRefresh.java
index 9fcc1eedde..9fcc1eedde 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIRefresh.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIRefresh.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UISerialization.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java
index cbd317b027..cbd317b027 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UISerialization.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UITabIndex.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UITabIndex.java
index c3bb036966..c3bb036966 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UITabIndex.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UITabIndex.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIsInMultipleTabs.java
index 25bf40edde..25bf40edde 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIsInMultipleTabs.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UiDependenciesInHtml.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UiDependenciesInHtml.java
index 96210b2027..96210b2027 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UiDependenciesInHtml.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UiDependenciesInHtml.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java
index e80686f6f3..e80686f6f3 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUI.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UriFragment.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UriFragment.java
index c726c49b12..c726c49b12 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UriFragment.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UriFragment.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/WindowAndUIShortcuts.java b/uitest/src/main/java/com/vaadin/tests/components/ui/WindowAndUIShortcuts.java
index c5c9c16e2d..c5c9c16e2d 100644
--- a/uitest/src/com/vaadin/tests/components/ui/WindowAndUIShortcuts.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/WindowAndUIShortcuts.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/WindowWithLabel.java b/uitest/src/main/java/com/vaadin/tests/components/ui/WindowWithLabel.java
index 790ff00e60..790ff00e60 100644
--- a/uitest/src/com/vaadin/tests/components/ui/WindowWithLabel.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/WindowWithLabel.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/BackButtonTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java
index 7e7a084eed..7e7a084eed 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/BackButtonTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/TestSampler.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/TestSampler.java
index fce2ef680d..fce2ef680d 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/TestSampler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/TestSampler.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/ThemeTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/ThemeTestUI.java
index b9e1529fef..b9e1529fef 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/ThemeTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/ThemeTestUI.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/UIScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/UIScrolling.java
index a6f9d6e752..a6f9d6e752 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/UIScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/UIScrolling.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/components/AccordionsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/AccordionsCssTest.java
index e3128d501f..e3128d501f 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/components/AccordionsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/AccordionsCssTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/components/ButtonsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/ButtonsCssTest.java
index d18b0b0c8c..d18b0b0c8c 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/components/ButtonsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/ButtonsCssTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/components/DatesCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/DatesCssTest.java
index cb97e8ee84..cb97e8ee84 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/components/DatesCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/DatesCssTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/components/EmbeddedCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/EmbeddedCssTest.java
index 57783f6eb3..57783f6eb3 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/components/EmbeddedCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/EmbeddedCssTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/components/FormsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/FormsCssTest.java
index 1d6527e624..1d6527e624 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/components/FormsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/FormsCssTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/components/LabelsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/LabelsCssTest.java
index 2413dfaaf3..2413dfaaf3 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/components/LabelsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/LabelsCssTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/components/LayoutsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/LayoutsCssTest.java
index 0ef37bf5c4..0ef37bf5c4 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/components/LayoutsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/LayoutsCssTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/components/NotificationsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/NotificationsCssTest.java
index 78ff89d5cb..78ff89d5cb 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/components/NotificationsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/NotificationsCssTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/components/SelectsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/SelectsCssTest.java
index cf63222ee8..cf63222ee8 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/components/SelectsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/SelectsCssTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/components/SlidersCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/SlidersCssTest.java
index db6b6fc4bc..db6b6fc4bc 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/components/SlidersCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/SlidersCssTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/components/TabSheetsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TabSheetsCssTest.java
index b05eb2f32a..b05eb2f32a 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/components/TabSheetsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TabSheetsCssTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/components/TablesCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TablesCssTest.java
index 2d77354174..2d77354174 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/components/TablesCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TablesCssTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java
index 6ae220bb3a..6ae220bb3a 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/components/TreeCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeCssTest.java
index 0508bfc0f9..0508bfc0f9 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/components/TreeCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeCssTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/components/TreeTableCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeTableCssTest.java
index ca246698f5..ca246698f5 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/components/TreeTableCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeTableCssTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/components/UploadCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/UploadCssTest.java
index 9aac96c88f..9aac96c88f 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/components/UploadCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/UploadCssTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/components/WindowsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/WindowsCssTest.java
index 9a2ebae7f3..9a2ebae7f3 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/components/WindowsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/WindowsCssTest.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/DisabledUploadButton.java b/uitest/src/main/java/com/vaadin/tests/components/upload/DisabledUploadButton.java
index dcf2ac2784..dcf2ac2784 100644
--- a/uitest/src/com/vaadin/tests/components/upload/DisabledUploadButton.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/DisabledUploadButton.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/DragAndDropUploadAndInteractions.java b/uitest/src/main/java/com/vaadin/tests/components/upload/DragAndDropUploadAndInteractions.java
index 952fe08b79..952fe08b79 100644
--- a/uitest/src/com/vaadin/tests/components/upload/DragAndDropUploadAndInteractions.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/DragAndDropUploadAndInteractions.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/ForceSubmit.java b/uitest/src/main/java/com/vaadin/tests/components/upload/ForceSubmit.java
index 47aad46348..47aad46348 100644
--- a/uitest/src/com/vaadin/tests/components/upload/ForceSubmit.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/ForceSubmit.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/TestFileUpload.java b/uitest/src/main/java/com/vaadin/tests/components/upload/TestFileUpload.java
index b57c236b20..b57c236b20 100644
--- a/uitest/src/com/vaadin/tests/components/upload/TestFileUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/TestFileUpload.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/TestFileUploadSize.java b/uitest/src/main/java/com/vaadin/tests/components/upload/TestFileUploadSize.java
index 178f8f9393..178f8f9393 100644
--- a/uitest/src/com/vaadin/tests/components/upload/TestFileUploadSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/TestFileUploadSize.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java b/uitest/src/main/java/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
index 7607536357..7607536357 100644
--- a/uitest/src/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/TestUpload.java b/uitest/src/main/java/com/vaadin/tests/components/upload/TestUpload.java
index 9ca0cb9c38..9ca0cb9c38 100644
--- a/uitest/src/com/vaadin/tests/components/upload/TestUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/TestUpload.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java b/uitest/src/main/java/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java
index 516ca2d7c9..516ca2d7c9 100644
--- a/uitest/src/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/TestUploadFilename.java b/uitest/src/main/java/com/vaadin/tests/components/upload/TestUploadFilename.java
index de0cca5009..de0cca5009 100644
--- a/uitest/src/com/vaadin/tests/components/upload/TestUploadFilename.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/TestUploadFilename.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java
index 48dd96bc43..48dd96bc43 100644
--- a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidth.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/UploadNoSelection.java b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadNoSelection.java
index ecde5760c9..ecde5760c9 100644
--- a/uitest/src/com/vaadin/tests/components/upload/UploadNoSelection.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadNoSelection.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/UploadTitleWithTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadTitleWithTooltip.java
index e2d47ab901..e2d47ab901 100644
--- a/uitest/src/com/vaadin/tests/components/upload/UploadTitleWithTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadTitleWithTooltip.java
diff --git a/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java b/uitest/src/main/java/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
index 455fb2e531..455fb2e531 100644
--- a/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
diff --git a/uitest/src/com/vaadin/tests/components/window/BackspaceKeyWithModalOpened.java b/uitest/src/main/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpened.java
index 7f23362efd..7f23362efd 100644
--- a/uitest/src/com/vaadin/tests/components/window/BackspaceKeyWithModalOpened.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpened.java
diff --git a/uitest/src/com/vaadin/tests/components/window/BottomComponentScrollsUp.java b/uitest/src/main/java/com/vaadin/tests/components/window/BottomComponentScrollsUp.java
index 2c5e415408..2c5e415408 100644
--- a/uitest/src/com/vaadin/tests/components/window/BottomComponentScrollsUp.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/BottomComponentScrollsUp.java
diff --git a/uitest/src/com/vaadin/tests/components/window/CenteredInVisualViewport.java b/uitest/src/main/java/com/vaadin/tests/components/window/CenteredInVisualViewport.java
index 428b2ae3f9..428b2ae3f9 100644
--- a/uitest/src/com/vaadin/tests/components/window/CenteredInVisualViewport.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/CenteredInVisualViewport.java
diff --git a/uitest/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.java b/uitest/src/main/java/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.java
index 42fab79376..42fab79376 100644
--- a/uitest/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.java
diff --git a/uitest/src/com/vaadin/tests/components/window/CloseModalSubWindow.java b/uitest/src/main/java/com/vaadin/tests/components/window/CloseModalSubWindow.java
index 4e07c591ae..4e07c591ae 100644
--- a/uitest/src/com/vaadin/tests/components/window/CloseModalSubWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/CloseModalSubWindow.java
diff --git a/uitest/src/com/vaadin/tests/components/window/CloseSubWindow.java b/uitest/src/main/java/com/vaadin/tests/components/window/CloseSubWindow.java
index 83eebc4531..83eebc4531 100644
--- a/uitest/src/com/vaadin/tests/components/window/CloseSubWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/CloseSubWindow.java
diff --git a/uitest/src/com/vaadin/tests/components/window/ComboboxScrollableWindow.java b/uitest/src/main/java/com/vaadin/tests/components/window/ComboboxScrollableWindow.java
index b952df0ed9..b952df0ed9 100644
--- a/uitest/src/com/vaadin/tests/components/window/ComboboxScrollableWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ComboboxScrollableWindow.java
diff --git a/uitest/src/com/vaadin/tests/components/window/DownloadAndUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/window/DownloadAndUpdate.java
index 573f55b29d..573f55b29d 100644
--- a/uitest/src/com/vaadin/tests/components/window/DownloadAndUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/DownloadAndUpdate.java
diff --git a/uitest/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.java b/uitest/src/main/java/com/vaadin/tests/components/window/EmbeddedInSubWindow.java
index 579590ed78..579590ed78 100644
--- a/uitest/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/EmbeddedInSubWindow.java
diff --git a/uitest/src/com/vaadin/tests/components/window/ExecuteJavaScript.java b/uitest/src/main/java/com/vaadin/tests/components/window/ExecuteJavaScript.java
index 8184d10d85..8184d10d85 100644
--- a/uitest/src/com/vaadin/tests/components/window/ExecuteJavaScript.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ExecuteJavaScript.java
diff --git a/uitest/src/com/vaadin/tests/components/window/ExtraLargeSubWindow.java b/uitest/src/main/java/com/vaadin/tests/components/window/ExtraLargeSubWindow.java
index af997f3619..af997f3619 100644
--- a/uitest/src/com/vaadin/tests/components/window/ExtraLargeSubWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ExtraLargeSubWindow.java
diff --git a/uitest/src/com/vaadin/tests/components/window/ExtraWindowShown.java b/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShown.java
index 92fbcffd01..92fbcffd01 100644
--- a/uitest/src/com/vaadin/tests/components/window/ExtraWindowShown.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShown.java
diff --git a/uitest/src/com/vaadin/tests/components/window/ExtraWindowShownWaiAria.java b/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShownWaiAria.java
index c7379f666b..c7379f666b 100644
--- a/uitest/src/com/vaadin/tests/components/window/ExtraWindowShownWaiAria.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ExtraWindowShownWaiAria.java
diff --git a/uitest/src/com/vaadin/tests/components/window/FullSizedWindow.java b/uitest/src/main/java/com/vaadin/tests/components/window/FullSizedWindow.java
index 4557ba71cc..4557ba71cc 100644
--- a/uitest/src/com/vaadin/tests/components/window/FullSizedWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/FullSizedWindow.java
diff --git a/uitest/src/com/vaadin/tests/components/window/GridInWindow.java b/uitest/src/main/java/com/vaadin/tests/components/window/GridInWindow.java
index 918a991cc1..918a991cc1 100644
--- a/uitest/src/com/vaadin/tests/components/window/GridInWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/GridInWindow.java
diff --git a/uitest/src/com/vaadin/tests/components/window/HugeWindowShouldBeClosable.java b/uitest/src/main/java/com/vaadin/tests/components/window/HugeWindowShouldBeClosable.java
index 3b8067c726..3b8067c726 100644
--- a/uitest/src/com/vaadin/tests/components/window/HugeWindowShouldBeClosable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/HugeWindowShouldBeClosable.java
diff --git a/uitest/src/com/vaadin/tests/components/window/LazyWindowResize.java b/uitest/src/main/java/com/vaadin/tests/components/window/LazyWindowResize.java
index dd98024f1c..dd98024f1c 100644
--- a/uitest/src/com/vaadin/tests/components/window/LazyWindowResize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/LazyWindowResize.java
diff --git a/uitest/src/com/vaadin/tests/components/window/LegacyWindowOpenTest.java b/uitest/src/main/java/com/vaadin/tests/components/window/LegacyWindowOpenTest.java
index ad36e04d88..ad36e04d88 100644
--- a/uitest/src/com/vaadin/tests/components/window/LegacyWindowOpenTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/LegacyWindowOpenTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/LongNotifications.java b/uitest/src/main/java/com/vaadin/tests/components/window/LongNotifications.java
index be67cfe9a0..be67cfe9a0 100644
--- a/uitest/src/com/vaadin/tests/components/window/LongNotifications.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/LongNotifications.java
diff --git a/uitest/src/com/vaadin/tests/components/window/MaximizedWindowOrder.java b/uitest/src/main/java/com/vaadin/tests/components/window/MaximizedWindowOrder.java
index 7da1517e8f..7da1517e8f 100644
--- a/uitest/src/com/vaadin/tests/components/window/MaximizedWindowOrder.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/MaximizedWindowOrder.java
diff --git a/uitest/src/com/vaadin/tests/components/window/ModalWindowFocus.java b/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowFocus.java
index 574a2d4991..574a2d4991 100644
--- a/uitest/src/com/vaadin/tests/components/window/ModalWindowFocus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowFocus.java
diff --git a/uitest/src/com/vaadin/tests/components/window/ModalWindowInitialLocation.java b/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowInitialLocation.java
index 3fa3730104..3fa3730104 100644
--- a/uitest/src/com/vaadin/tests/components/window/ModalWindowInitialLocation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowInitialLocation.java
diff --git a/uitest/src/com/vaadin/tests/components/window/ModalWindowNativeSelect.java b/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowNativeSelect.java
index 3713facaf0..3713facaf0 100644
--- a/uitest/src/com/vaadin/tests/components/window/ModalWindowNativeSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowNativeSelect.java
diff --git a/uitest/src/com/vaadin/tests/components/window/MoveToTop.java b/uitest/src/main/java/com/vaadin/tests/components/window/MoveToTop.java
index a5a4eb6df3..a5a4eb6df3 100644
--- a/uitest/src/com/vaadin/tests/components/window/MoveToTop.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/MoveToTop.java
diff --git a/uitest/src/com/vaadin/tests/components/window/OpenModalWindowAndFocusField.java b/uitest/src/main/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusField.java
index 1c82a3de02..1c82a3de02 100644
--- a/uitest/src/com/vaadin/tests/components/window/OpenModalWindowAndFocusField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusField.java
diff --git a/uitest/src/com/vaadin/tests/components/window/PageOpenTest.java b/uitest/src/main/java/com/vaadin/tests/components/window/PageOpenTest.java
index a566b09cdc..a566b09cdc 100644
--- a/uitest/src/com/vaadin/tests/components/window/PageOpenTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/PageOpenTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/PositionedSubWindows.java b/uitest/src/main/java/com/vaadin/tests/components/window/PositionedSubWindows.java
index 9fe44dd7e8..9fe44dd7e8 100644
--- a/uitest/src/com/vaadin/tests/components/window/PositionedSubWindows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/PositionedSubWindows.java
diff --git a/uitest/src/com/vaadin/tests/components/window/RepaintWindowContents.java b/uitest/src/main/java/com/vaadin/tests/components/window/RepaintWindowContents.java
index 18fe8f2fac..18fe8f2fac 100644
--- a/uitest/src/com/vaadin/tests/components/window/RepaintWindowContents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/RepaintWindowContents.java
diff --git a/uitest/src/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpened.java b/uitest/src/main/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpened.java
index 403795b676..403795b676 100644
--- a/uitest/src/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpened.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpened.java
diff --git a/uitest/src/com/vaadin/tests/components/window/SubWindowFocus.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java
index 637df36e19..637df36e19 100644
--- a/uitest/src/com/vaadin/tests/components/window/SubWindowFocus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java
diff --git a/uitest/src/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
index 2a0f60f390..2a0f60f390 100644
--- a/uitest/src/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
diff --git a/uitest/src/com/vaadin/tests/components/window/SubWindowOrder.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowOrder.java
index 4585a036ff..4585a036ff 100644
--- a/uitest/src/com/vaadin/tests/components/window/SubWindowOrder.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowOrder.java
diff --git a/uitest/src/com/vaadin/tests/components/window/SubWindowPositionUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowPositionUpdate.java
index 9383dba80f..9383dba80f 100644
--- a/uitest/src/com/vaadin/tests/components/window/SubWindowPositionUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowPositionUpdate.java
diff --git a/uitest/src/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java
index 473b3e1f9c..473b3e1f9c 100644
--- a/uitest/src/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java
diff --git a/uitest/src/com/vaadin/tests/components/window/SubWindows.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindows.java
index 0ea6b8b21c..0ea6b8b21c 100644
--- a/uitest/src/com/vaadin/tests/components/window/SubWindows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindows.java
diff --git a/uitest/src/com/vaadin/tests/components/window/SubwindowDraggability.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubwindowDraggability.java
index 45fb343b45..45fb343b45 100644
--- a/uitest/src/com/vaadin/tests/components/window/SubwindowDraggability.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubwindowDraggability.java
diff --git a/uitest/src/com/vaadin/tests/components/window/SubwindowInvalidLayout.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubwindowInvalidLayout.java
index 8349c82911..8349c82911 100644
--- a/uitest/src/com/vaadin/tests/components/window/SubwindowInvalidLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubwindowInvalidLayout.java
diff --git a/uitest/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java b/uitest/src/main/java/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java
index 669774f715..669774f715 100644
--- a/uitest/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java
diff --git a/uitest/src/com/vaadin/tests/components/window/UncloseableWindowCloseShortcut.java b/uitest/src/main/java/com/vaadin/tests/components/window/UncloseableWindowCloseShortcut.java
index 1db8e0c87b..1db8e0c87b 100644
--- a/uitest/src/com/vaadin/tests/components/window/UncloseableWindowCloseShortcut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/UncloseableWindowCloseShortcut.java
diff --git a/uitest/src/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java b/uitest/src/main/java/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java
index 1a34e90446..1a34e90446 100644
--- a/uitest/src/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowBGColorChameleonIE8.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowBGColorChameleonIE8.java
index 121d6300bc..121d6300bc 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowBGColorChameleonIE8.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowBGColorChameleonIE8.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowCaption.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowCaption.java
index fcb915f363..fcb915f363 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowCaption.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowClickEvents.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowClickEvents.java
index 00cd580ed8..00cd580ed8 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowClickEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowClickEvents.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowCloseShortcuts.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowCloseShortcuts.java
index d9c22a26ee..d9c22a26ee 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowCloseShortcuts.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowCloseShortcuts.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowInUiWithNoContent.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowInUiWithNoContent.java
index 0915b93c26..0915b93c26 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowInUiWithNoContent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowInUiWithNoContent.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java
index a8102a7d1a..a8102a7d1a 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowMoveListener.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowMoveListener.java
index 63aebebdad..63aebebdad 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowMoveListener.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowMoveListener.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowResizeListener.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowResizeListener.java
index e66767dac9..e66767dac9 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowResizeListener.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowResizeListener.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
index 09d03cdd28..09d03cdd28 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowScrollingUp.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingUp.java
index 81996635af..81996635af 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowScrollingUp.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingUp.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowShadow.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowShadow.java
index 12e7899503..12e7899503 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowShadow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowShadow.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
index ba991eebec..ba991eebec 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowStyleNames.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowStyleNames.java
index 615f391613..615f391613 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowStyleNames.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowStyleNames.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowTest.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowTest.java
index 2639e257f5..2639e257f5 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowThemes.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowThemes.java
index 788adc7902..788adc7902 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowThemes.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowThemes.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowWithIcon.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowWithIcon.java
index 15ceb569b4..15ceb569b4 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowWithIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowWithIcon.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowWithInvalidCloseListener.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowWithInvalidCloseListener.java
index 991b5626eb..991b5626eb 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowWithInvalidCloseListener.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowWithInvalidCloseListener.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowZIndex.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowZIndex.java
index 5d1a2540b8..5d1a2540b8 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowZIndex.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowZIndex.java
diff --git a/uitest/src/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
index 8b8ad4cf70..8b8ad4cf70 100644
--- a/uitest/src/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
diff --git a/uitest/src/com/vaadin/tests/containers/BeanItemContainerTest.java b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerTest.java
index 905ec2f9ff..905ec2f9ff 100644
--- a/uitest/src/com/vaadin/tests/containers/BeanItemContainerTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerTest.java
diff --git a/uitest/src/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java b/uitest/src/main/java/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java
index b1e080fc16..b1e080fc16 100644
--- a/uitest/src/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java
diff --git a/uitest/src/com/vaadin/tests/containers/IndexedContainerFilteringTest.java b/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
index a1dba3eed8..a1dba3eed8 100644
--- a/uitest/src/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
diff --git a/uitest/src/com/vaadin/tests/containers/TableWithFileSystemContainer.java b/uitest/src/main/java/com/vaadin/tests/containers/TableWithFileSystemContainer.java
index 25d0053fb2..25d0053fb2 100644
--- a/uitest/src/com/vaadin/tests/containers/TableWithFileSystemContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/TableWithFileSystemContainer.java
diff --git a/uitest/src/com/vaadin/tests/containers/TestItemSorter.java b/uitest/src/main/java/com/vaadin/tests/containers/TestItemSorter.java
index 2e217fd961..2e217fd961 100644
--- a/uitest/src/com/vaadin/tests/containers/TestItemSorter.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/TestItemSorter.java
diff --git a/uitest/src/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java b/uitest/src/main/java/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java
index c9d4a07c22..c9d4a07c22 100644
--- a/uitest/src/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java
diff --git a/uitest/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
index 49416a73e5..49416a73e5 100644
--- a/uitest/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
diff --git a/uitest/src/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java
index 321f2ac98f..321f2ac98f 100644
--- a/uitest/src/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java
diff --git a/uitest/src/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java
index 93bd265eda..93bd265eda 100644
--- a/uitest/src/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java
diff --git a/uitest/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
index d099b92fb3..d099b92fb3 100644
--- a/uitest/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
diff --git a/uitest/src/com/vaadin/tests/containers/sqlcontainer/SqlcontainertableApplication.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/SqlcontainertableApplication.java
index 89893a453e..89893a453e 100644
--- a/uitest/src/com/vaadin/tests/containers/sqlcontainer/SqlcontainertableApplication.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/SqlcontainertableApplication.java
diff --git a/uitest/src/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java
index 2ff74a76ef..2ff74a76ef 100644
--- a/uitest/src/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java
diff --git a/uitest/src/com/vaadin/tests/contextclick/AbstractContextClickUI.java b/uitest/src/main/java/com/vaadin/tests/contextclick/AbstractContextClickUI.java
index e1d741ee88..e1d741ee88 100644
--- a/uitest/src/com/vaadin/tests/contextclick/AbstractContextClickUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/AbstractContextClickUI.java
diff --git a/uitest/src/com/vaadin/tests/contextclick/BrowserContextMenuInSubComponent.java b/uitest/src/main/java/com/vaadin/tests/contextclick/BrowserContextMenuInSubComponent.java
index d3edf0ba43..d3edf0ba43 100644
--- a/uitest/src/com/vaadin/tests/contextclick/BrowserContextMenuInSubComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/BrowserContextMenuInSubComponent.java
diff --git a/uitest/src/com/vaadin/tests/contextclick/GridContextClick.java b/uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java
index 77009a0762..77009a0762 100644
--- a/uitest/src/com/vaadin/tests/contextclick/GridContextClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java
diff --git a/uitest/src/com/vaadin/tests/contextclick/TableContextClick.java b/uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java
index 95fa85dc90..95fa85dc90 100644
--- a/uitest/src/com/vaadin/tests/contextclick/TableContextClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java
diff --git a/uitest/src/com/vaadin/tests/contextclick/TreeContextClick.java b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeContextClick.java
index 6b58138ab2..6b58138ab2 100644
--- a/uitest/src/com/vaadin/tests/contextclick/TreeContextClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeContextClick.java
diff --git a/uitest/src/com/vaadin/tests/contextclick/TreeTableContextClick.java b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java
index 406f5d589e..406f5d589e 100644
--- a/uitest/src/com/vaadin/tests/contextclick/TreeTableContextClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java
diff --git a/uitest/src/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java b/uitest/src/main/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java
index 9d0c835c68..9d0c835c68 100644
--- a/uitest/src/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java
+++ b/uitest/src/main/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java
diff --git a/uitest/src/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java b/uitest/src/main/java/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java
index 23c22a7026..23c22a7026 100644
--- a/uitest/src/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java
+++ b/uitest/src/main/java/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java
diff --git a/uitest/src/main/java/com/vaadin/tests/data/bean/Address.java b/uitest/src/main/java/com/vaadin/tests/data/bean/Address.java
new file mode 100644
index 0000000000..15cdf34ae5
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/data/bean/Address.java
@@ -0,0 +1,63 @@
+package com.vaadin.tests.data.bean;
+
+import java.io.Serializable;
+
+@SuppressWarnings("serial")
+public class Address implements Serializable {
+
+    private String streetAddress = "";
+    private Integer postalCode = null;
+    private String city = "";
+    private Country country = null;
+
+    public Address() {
+
+    }
+
+    public Address(String streetAddress, int postalCode, String city,
+            Country country) {
+        setStreetAddress(streetAddress);
+        setPostalCode(postalCode);
+        setCity(city);
+        setCountry(country);
+    }
+
+    @Override
+    public String toString() {
+        return "Address [streetAddress=" + streetAddress + ", postalCode="
+                + postalCode + ", city=" + city + ", country=" + country + "]";
+    }
+
+    public String getStreetAddress() {
+        return streetAddress;
+    }
+
+    public void setStreetAddress(String streetAddress) {
+        this.streetAddress = streetAddress;
+    }
+
+    public Integer getPostalCode() {
+        return postalCode;
+    }
+
+    public void setPostalCode(Integer postalCode) {
+        this.postalCode = postalCode;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public Country getCountry() {
+        return country;
+    }
+
+    public void setCountry(Country country) {
+        this.country = country;
+    }
+
+}
diff --git a/uitest/src/main/java/com/vaadin/tests/data/bean/AnotherTestEnum.java b/uitest/src/main/java/com/vaadin/tests/data/bean/AnotherTestEnum.java
new file mode 100644
index 0000000000..fc8f22a947
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/data/bean/AnotherTestEnum.java
@@ -0,0 +1,16 @@
+package com.vaadin.tests.data.bean;
+
+public enum AnotherTestEnum {
+    ONE("ONE"), TWO("TWO");
+
+    private String id;
+
+    private AnotherTestEnum(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public String toString() {
+        return id;
+    }
+}
diff --git a/uitest/src/main/java/com/vaadin/tests/data/bean/BeanToValidate.java b/uitest/src/main/java/com/vaadin/tests/data/bean/BeanToValidate.java
new file mode 100644
index 0000000000..034609764f
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/data/bean/BeanToValidate.java
@@ -0,0 +1,69 @@
+package com.vaadin.tests.data.bean;
+
+import javax.validation.constraints.Digits;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+public class BeanToValidate {
+    @NotNull
+    @Size(min = 3, max = 16)
+    private String firstname;
+
+    @NotNull(message = "Last name must not be empty")
+    private String lastname;
+
+    @Min(value = 18, message = "Must be 18 or above")
+    @Max(150)
+    private int age;
+
+    @Digits(integer = 3, fraction = 2)
+    private String decimals;
+
+    @Pattern(regexp = "V*", message = "Must start with letter V")
+    @Size(min = 3, max = 6, message = "Must contain 3 - 6 letters")
+    private String nickname;
+
+    public String getFirstname() {
+        return firstname;
+    }
+
+    public void setFirstname(String firstname) {
+        this.firstname = firstname;
+    }
+
+    public String getLastname() {
+        return lastname;
+    }
+
+    public void setLastname(String lastname) {
+        this.lastname = lastname;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(int age) {
+        this.age = age;
+    }
+
+    public String getDecimals() {
+        return decimals;
+    }
+
+    public void setDecimals(String decimals) {
+        this.decimals = decimals;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+}
diff --git a/uitest/src/main/java/com/vaadin/tests/data/bean/BeanWithReadOnlyField.java b/uitest/src/main/java/com/vaadin/tests/data/bean/BeanWithReadOnlyField.java
new file mode 100644
index 0000000000..77f5613f86
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/data/bean/BeanWithReadOnlyField.java
@@ -0,0 +1,18 @@
+package com.vaadin.tests.data.bean;
+
+public class BeanWithReadOnlyField {
+    private String readOnlyField;
+    private String writableField;
+
+    public String getWritableField() {
+        return writableField;
+    }
+
+    public void setWritableField(String writableField) {
+        this.writableField = writableField;
+    }
+
+    public String getReadOnlyField() {
+        return readOnlyField;
+    }
+}
diff --git a/uitest/src/main/java/com/vaadin/tests/data/bean/Country.java b/uitest/src/main/java/com/vaadin/tests/data/bean/Country.java
new file mode 100644
index 0000000000..afdf8dcfa1
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/data/bean/Country.java
@@ -0,0 +1,18 @@
+package com.vaadin.tests.data.bean;
+
+public enum Country {
+
+    FINLAND("Finland"), SWEDEN("Sweden"), USA("USA"), RUSSIA("Russia"), NETHERLANDS(
+            "Netherlands"), SOUTH_AFRICA("South Africa");
+
+    private String name;
+
+    private Country(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}
diff --git a/uitest/src/main/java/com/vaadin/tests/data/bean/Person.java b/uitest/src/main/java/com/vaadin/tests/data/bean/Person.java
new file mode 100644
index 0000000000..f7bad31d0e
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/data/bean/Person.java
@@ -0,0 +1,143 @@
+package com.vaadin.tests.data.bean;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class Person {
+    private String firstName;
+    private String lastName;
+    private String email;
+    private int age;
+    private Sex sex;
+    private Address address;
+    private boolean deceased;
+    private Date birthDate;
+
+    private Integer salary; // null if unknown
+    private Double salaryDouble; // null if unknown
+
+    private BigDecimal rent;
+
+    public Person() {
+
+    }
+
+    @Override
+    public String toString() {
+        return "Person [firstName=" + firstName + ", lastName=" + lastName
+                + ", email=" + email + ", age=" + age + ", sex=" + sex
+                + ", address=" + address + ", deceased=" + deceased
+                + ", salary=" + salary + ", salaryDouble=" + salaryDouble
+                + ", rent=" + rent + "]";
+    }
+
+    public Person(String firstName, String lastName, String email, int age,
+            Sex sex, Address address) {
+        super();
+        this.firstName = firstName;
+        this.lastName = lastName;
+        this.email = email;
+        this.age = age;
+        this.sex = sex;
+        this.address = address;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(int age) {
+        this.age = age;
+    }
+
+    public Address getAddress() {
+        return address;
+    }
+
+    public void setAddress(Address address) {
+        this.address = address;
+    }
+
+    public Sex getSex() {
+        return sex;
+    }
+
+    public void setSex(Sex sex) {
+        this.sex = sex;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public boolean getDeceased() {
+        return deceased;
+    }
+
+    public void setDeceased(boolean deceased) {
+        this.deceased = deceased;
+    }
+
+    public Integer getSalary() {
+        return salary;
+    }
+
+    public void setSalary(Integer salary) {
+        this.salary = salary;
+    }
+
+    public BigDecimal getRent() {
+        return rent;
+    }
+
+    public void setRent(BigDecimal rent) {
+        this.rent = rent;
+    }
+
+    public Double getSalaryDouble() {
+        return salaryDouble;
+    }
+
+    public void setSalaryDouble(Double salaryDouble) {
+        this.salaryDouble = salaryDouble;
+    }
+
+    public Date getBirthDate() {
+        return birthDate;
+    }
+
+    public void setBirthDate(Date birthDate) {
+        this.birthDate = birthDate;
+    }
+
+    public static Person createTestPerson1() {
+        return new Person("Foo", "Bar", "yeah@cool.com", 46, Sex.MALE,
+                new Address("Street", 1123, "Turku", Country.FINLAND));
+    }
+
+    public static Person createTestPerson2() {
+        return new Person("Maya", "Dinkelstein", "maya@foo.bar", 18,
+                Sex.FEMALE, new Address("Red street", 12, "Amsterdam",
+                        Country.NETHERLANDS));
+    }
+}
diff --git a/uitest/src/main/java/com/vaadin/tests/data/bean/PersonWithBeanValidationAnnotations.java b/uitest/src/main/java/com/vaadin/tests/data/bean/PersonWithBeanValidationAnnotations.java
new file mode 100644
index 0000000000..575730d946
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/data/bean/PersonWithBeanValidationAnnotations.java
@@ -0,0 +1,159 @@
+package com.vaadin.tests.data.bean;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.validation.constraints.Digits;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Past;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+public class PersonWithBeanValidationAnnotations {
+    @NotNull
+    @Size(min = 5, max = 20)
+    @Pattern(regexp = "A.*")
+    private String firstName;
+
+    @NotNull
+    private String lastName;
+
+    private String email;
+
+    @Min(0)
+    @Max(100)
+    private int age;
+
+    @NotNull
+    private Sex sex;
+
+    private Address address;
+    private boolean deceased;
+
+    @NotNull
+    @Past
+    private Date birthDate;
+
+    @Min(0)
+    private Integer salary; // null if unknown
+
+    @Digits(integer = 6, fraction = 2)
+    private Double salaryDouble; // null if unknown
+
+    private BigDecimal rent;
+
+    public PersonWithBeanValidationAnnotations() {
+
+    }
+
+    @Override
+    public String toString() {
+        return "Person [firstName=" + firstName + ", lastName=" + lastName
+                + ", email=" + email + ", age=" + age + ", sex=" + sex
+                + ", address=" + address + ", deceased=" + deceased
+                + ", salary=" + salary + ", salaryDouble=" + salaryDouble
+                + ", rent=" + rent + "]";
+    }
+
+    public PersonWithBeanValidationAnnotations(String firstName,
+            String lastName, String email, int age, Sex sex, Address address) {
+        super();
+        this.firstName = firstName;
+        this.lastName = lastName;
+        this.email = email;
+        this.age = age;
+        this.sex = sex;
+        this.address = address;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(int age) {
+        this.age = age;
+    }
+
+    public Address getAddress() {
+        return address;
+    }
+
+    public void setAddress(Address address) {
+        this.address = address;
+    }
+
+    public Sex getSex() {
+        return sex;
+    }
+
+    public void setSex(Sex sex) {
+        this.sex = sex;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public boolean getDeceased() {
+        return deceased;
+    }
+
+    public void setDeceased(boolean deceased) {
+        this.deceased = deceased;
+    }
+
+    public Integer getSalary() {
+        return salary;
+    }
+
+    public void setSalary(Integer salary) {
+        this.salary = salary;
+    }
+
+    public BigDecimal getRent() {
+        return rent;
+    }
+
+    public void setRent(BigDecimal rent) {
+        this.rent = rent;
+    }
+
+    public Double getSalaryDouble() {
+        return salaryDouble;
+    }
+
+    public void setSalaryDouble(Double salaryDouble) {
+        this.salaryDouble = salaryDouble;
+    }
+
+    public Date getBirthDate() {
+        return birthDate;
+    }
+
+    public void setBirthDate(Date birthDate) {
+        this.birthDate = birthDate;
+    }
+
+}
diff --git a/uitest/src/main/java/com/vaadin/tests/data/bean/Sex.java b/uitest/src/main/java/com/vaadin/tests/data/bean/Sex.java
new file mode 100644
index 0000000000..a4e3f20a11
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/data/bean/Sex.java
@@ -0,0 +1,20 @@
+package com.vaadin.tests.data.bean;
+
+public enum Sex {
+    MALE("Male"), FEMALE("Female"), UNKNOWN("Unknown");
+
+    private String stringRepresentation;
+
+    private Sex(String stringRepresentation) {
+        this.stringRepresentation = stringRepresentation;
+    }
+
+    public String getStringRepresentation() {
+        return stringRepresentation;
+    }
+
+    @Override
+    public String toString() {
+        return getStringRepresentation();
+    }
+}
diff --git a/uitest/src/main/java/com/vaadin/tests/data/bean/TestEnum.java b/uitest/src/main/java/com/vaadin/tests/data/bean/TestEnum.java
new file mode 100644
index 0000000000..bf6f721052
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/data/bean/TestEnum.java
@@ -0,0 +1,16 @@
+package com.vaadin.tests.data.bean;
+
+public enum TestEnum {
+    ONE("1"), TWO("2");
+
+    private String id;
+
+    private TestEnum(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public String toString() {
+        return id;
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/dd/AcceptAnythingWindow.java b/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java
index 5d57de388c..5d57de388c 100644
--- a/uitest/src/com/vaadin/tests/dd/AcceptAnythingWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java
diff --git a/uitest/src/com/vaadin/tests/dd/AcceptFromComponent.java b/uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java
index 99dd069142..99dd069142 100644
--- a/uitest/src/com/vaadin/tests/dd/AcceptFromComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java
diff --git a/uitest/src/com/vaadin/tests/dd/ActiveDragSourceClassName.java b/uitest/src/main/java/com/vaadin/tests/dd/ActiveDragSourceClassName.java
index 9ef1b4029b..9ef1b4029b 100644
--- a/uitest/src/com/vaadin/tests/dd/ActiveDragSourceClassName.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/ActiveDragSourceClassName.java
diff --git a/uitest/src/com/vaadin/tests/dd/CustomDDImplementation.java b/uitest/src/main/java/com/vaadin/tests/dd/CustomDDImplementation.java
index f6e196761e..f6e196761e 100644
--- a/uitest/src/com/vaadin/tests/dd/CustomDDImplementation.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/CustomDDImplementation.java
diff --git a/uitest/src/com/vaadin/tests/dd/DDInterrupt.java b/uitest/src/main/java/com/vaadin/tests/dd/DDInterrupt.java
index 1939bbbce5..1939bbbce5 100644
--- a/uitest/src/com/vaadin/tests/dd/DDInterrupt.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDInterrupt.java
diff --git a/uitest/src/com/vaadin/tests/dd/DDTest1.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java
index 161a9b423e..161a9b423e 100644
--- a/uitest/src/com/vaadin/tests/dd/DDTest1.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java
diff --git a/uitest/src/com/vaadin/tests/dd/DDTest2.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java
index e9fb2910b0..e9fb2910b0 100644
--- a/uitest/src/com/vaadin/tests/dd/DDTest2.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java
diff --git a/uitest/src/com/vaadin/tests/dd/DDTest4.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java
index acd54274da..acd54274da 100644
--- a/uitest/src/com/vaadin/tests/dd/DDTest4.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java
diff --git a/uitest/src/com/vaadin/tests/dd/DDTest5.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest5.java
index 43342fdc35..43342fdc35 100644
--- a/uitest/src/com/vaadin/tests/dd/DDTest5.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest5.java
diff --git a/uitest/src/com/vaadin/tests/dd/DDTest6.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java
index 2122e8e982..2122e8e982 100644
--- a/uitest/src/com/vaadin/tests/dd/DDTest6.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java
diff --git a/uitest/src/com/vaadin/tests/dd/DDTest7.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java
index 3c819ce15c..3c819ce15c 100644
--- a/uitest/src/com/vaadin/tests/dd/DDTest7.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java
diff --git a/uitest/src/com/vaadin/tests/dd/DDTest8.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java
index beaae4175e..beaae4175e 100644
--- a/uitest/src/com/vaadin/tests/dd/DDTest8.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java
diff --git a/uitest/src/com/vaadin/tests/dd/DragAndDropFiles.java b/uitest/src/main/java/com/vaadin/tests/dd/DragAndDropFiles.java
index 4ecabee617..4ecabee617 100644
--- a/uitest/src/com/vaadin/tests/dd/DragAndDropFiles.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DragAndDropFiles.java
diff --git a/uitest/src/com/vaadin/tests/dd/DragDropPane.java b/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java
index 6296051ee2..6296051ee2 100644
--- a/uitest/src/com/vaadin/tests/dd/DragDropPane.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java
diff --git a/uitest/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java b/uitest/src/main/java/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
index fe33bce76b..fe33bce76b 100644
--- a/uitest/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
diff --git a/uitest/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java b/uitest/src/main/java/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
index d17c618f59..d17c618f59 100644
--- a/uitest/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
diff --git a/uitest/src/com/vaadin/tests/dd/MyDragSourceConnector.java b/uitest/src/main/java/com/vaadin/tests/dd/MyDragSourceConnector.java
index 66179692b4..66179692b4 100644
--- a/uitest/src/com/vaadin/tests/dd/MyDragSourceConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/MyDragSourceConnector.java
diff --git a/uitest/src/com/vaadin/tests/dd/MyDropTargetConnector.java b/uitest/src/main/java/com/vaadin/tests/dd/MyDropTargetConnector.java
index 5bbb397502..5bbb397502 100644
--- a/uitest/src/com/vaadin/tests/dd/MyDropTargetConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/MyDropTargetConnector.java
diff --git a/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSource.java b/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSource.java
index 020a6b56c5..020a6b56c5 100644
--- a/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSource.java
diff --git a/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java b/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java
index e19bbaf2c5..e19bbaf2c5 100644
--- a/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java
diff --git a/uitest/src/com/vaadin/tests/dd/ScrolledDropTarget.java b/uitest/src/main/java/com/vaadin/tests/dd/ScrolledDropTarget.java
index 951b9a4a57..951b9a4a57 100644
--- a/uitest/src/com/vaadin/tests/dd/ScrolledDropTarget.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/ScrolledDropTarget.java
diff --git a/uitest/src/com/vaadin/tests/dd/SpacebarPanner.java b/uitest/src/main/java/com/vaadin/tests/dd/SpacebarPanner.java
index d6179066fb..d6179066fb 100644
--- a/uitest/src/com/vaadin/tests/dd/SpacebarPanner.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/SpacebarPanner.java
diff --git a/uitest/src/com/vaadin/tests/dd/StartHtml5Drag.java b/uitest/src/main/java/com/vaadin/tests/dd/StartHtml5Drag.java
index 609b2fe4fc..609b2fe4fc 100644
--- a/uitest/src/com/vaadin/tests/dd/StartHtml5Drag.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/StartHtml5Drag.java
diff --git a/uitest/src/com/vaadin/tests/dd/TreeDragStart.java b/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java
index b86cb361c0..b86cb361c0 100644
--- a/uitest/src/com/vaadin/tests/dd/TreeDragStart.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java
diff --git a/uitest/src/com/vaadin/tests/dd/VMyDragSource.java b/uitest/src/main/java/com/vaadin/tests/dd/VMyDragSource.java
index 8cca6d6459..8cca6d6459 100644
--- a/uitest/src/com/vaadin/tests/dd/VMyDragSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/VMyDragSource.java
diff --git a/uitest/src/com/vaadin/tests/dd/VMyDropTarget.java b/uitest/src/main/java/com/vaadin/tests/dd/VMyDropTarget.java
index 58bd326524..58bd326524 100644
--- a/uitest/src/com/vaadin/tests/dd/VMyDropTarget.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/VMyDropTarget.java
diff --git a/uitest/src/com/vaadin/tests/debug/DebugWindowPresent.java b/uitest/src/main/java/com/vaadin/tests/debug/DebugWindowPresent.java
index 3e04d27628..3e04d27628 100644
--- a/uitest/src/com/vaadin/tests/debug/DebugWindowPresent.java
+++ b/uitest/src/main/java/com/vaadin/tests/debug/DebugWindowPresent.java
diff --git a/uitest/src/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayouts.java b/uitest/src/main/java/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayouts.java
index 88b0386c97..88b0386c97 100644
--- a/uitest/src/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayouts.java
+++ b/uitest/src/main/java/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayouts.java
diff --git a/uitest/src/com/vaadin/tests/debug/PreserveCustomDebugSectionOpen.java b/uitest/src/main/java/com/vaadin/tests/debug/PreserveCustomDebugSectionOpen.java
index 0ac2e87510..0ac2e87510 100644
--- a/uitest/src/com/vaadin/tests/debug/PreserveCustomDebugSectionOpen.java
+++ b/uitest/src/main/java/com/vaadin/tests/debug/PreserveCustomDebugSectionOpen.java
diff --git a/uitest/src/com/vaadin/tests/debug/ProfilerZeroOverhead.java b/uitest/src/main/java/com/vaadin/tests/debug/ProfilerZeroOverhead.java
index 7daf38a0e5..7daf38a0e5 100644
--- a/uitest/src/com/vaadin/tests/debug/ProfilerZeroOverhead.java
+++ b/uitest/src/main/java/com/vaadin/tests/debug/ProfilerZeroOverhead.java
diff --git a/uitest/src/com/vaadin/tests/debug/PushVersionInfo.java b/uitest/src/main/java/com/vaadin/tests/debug/PushVersionInfo.java
index d8c23a390f..d8c23a390f 100644
--- a/uitest/src/com/vaadin/tests/debug/PushVersionInfo.java
+++ b/uitest/src/main/java/com/vaadin/tests/debug/PushVersionInfo.java
diff --git a/uitest/src/com/vaadin/tests/declarative/DeclarativeEditor.java b/uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java
index d62f71b513..d62f71b513 100644
--- a/uitest/src/com/vaadin/tests/declarative/DeclarativeEditor.java
+++ b/uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java
diff --git a/uitest/src/com/vaadin/tests/declarative/Potus.java b/uitest/src/main/java/com/vaadin/tests/declarative/Potus.java
index 23448a9b7f..23448a9b7f 100644
--- a/uitest/src/com/vaadin/tests/declarative/Potus.java
+++ b/uitest/src/main/java/com/vaadin/tests/declarative/Potus.java
diff --git a/uitest/src/com/vaadin/tests/declarative/PotusCrud.java b/uitest/src/main/java/com/vaadin/tests/declarative/PotusCrud.java
index 70ad956045..70ad956045 100644
--- a/uitest/src/com/vaadin/tests/declarative/PotusCrud.java
+++ b/uitest/src/main/java/com/vaadin/tests/declarative/PotusCrud.java
diff --git a/uitest/src/com/vaadin/tests/declarative/PotusCrudUI.java b/uitest/src/main/java/com/vaadin/tests/declarative/PotusCrudUI.java
index f1d94f7f16..f1d94f7f16 100644
--- a/uitest/src/com/vaadin/tests/declarative/PotusCrudUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/declarative/PotusCrudUI.java
diff --git a/uitest/src/com/vaadin/tests/declarative/PotusForm.java b/uitest/src/main/java/com/vaadin/tests/declarative/PotusForm.java
index 506a25f663..506a25f663 100644
--- a/uitest/src/com/vaadin/tests/declarative/PotusForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/declarative/PotusForm.java
diff --git a/uitest/src/com/vaadin/tests/errorhandler/ErrorHandlers.java b/uitest/src/main/java/com/vaadin/tests/errorhandler/ErrorHandlers.java
index a123af0f7d..a123af0f7d 100644
--- a/uitest/src/com/vaadin/tests/errorhandler/ErrorHandlers.java
+++ b/uitest/src/main/java/com/vaadin/tests/errorhandler/ErrorHandlers.java
diff --git a/uitest/src/com/vaadin/tests/extensions/BasicExtension.java b/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtension.java
index a9615ff5d7..a9615ff5d7 100644
--- a/uitest/src/com/vaadin/tests/extensions/BasicExtension.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtension.java
diff --git a/uitest/src/com/vaadin/tests/extensions/BasicExtensionTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtensionTest.java
index c56cfb10ab..c56cfb10ab 100644
--- a/uitest/src/com/vaadin/tests/extensions/BasicExtensionTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/BasicExtensionTest.java
diff --git a/uitest/src/com/vaadin/tests/extensions/BrowserPopupExtensionTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/BrowserPopupExtensionTest.java
index 732b1aca74..732b1aca74 100644
--- a/uitest/src/com/vaadin/tests/extensions/BrowserPopupExtensionTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/BrowserPopupExtensionTest.java
diff --git a/uitest/src/com/vaadin/tests/extensions/HelloWorldExtension.java b/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtension.java
index 34711a4b92..34711a4b92 100644
--- a/uitest/src/com/vaadin/tests/extensions/HelloWorldExtension.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtension.java
diff --git a/uitest/src/com/vaadin/tests/extensions/HelloWorldExtensionTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtensionTest.java
index 021d2dfa30..021d2dfa30 100644
--- a/uitest/src/com/vaadin/tests/extensions/HelloWorldExtensionTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/HelloWorldExtensionTest.java
diff --git a/uitest/src/com/vaadin/tests/extensions/IframeIsOpenedInNonIOS.java b/uitest/src/main/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOS.java
index d1b2e12e42..d1b2e12e42 100644
--- a/uitest/src/com/vaadin/tests/extensions/IframeIsOpenedInNonIOS.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOS.java
diff --git a/uitest/src/com/vaadin/tests/extensions/JavascriptManagerTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/JavascriptManagerTest.java
index f2a8b24cb1..f2a8b24cb1 100644
--- a/uitest/src/com/vaadin/tests/extensions/JavascriptManagerTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/JavascriptManagerTest.java
diff --git a/uitest/src/com/vaadin/tests/extensions/LayoutMemoryUsageIE8Extension.java b/uitest/src/main/java/com/vaadin/tests/extensions/LayoutMemoryUsageIE8Extension.java
index f61d3b8bdd..f61d3b8bdd 100644
--- a/uitest/src/com/vaadin/tests/extensions/LayoutMemoryUsageIE8Extension.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/LayoutMemoryUsageIE8Extension.java
diff --git a/uitest/src/com/vaadin/tests/extensions/ResponsiveLayoutUpdate.java b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveLayoutUpdate.java
index 4634ebff15..4634ebff15 100644
--- a/uitest/src/com/vaadin/tests/extensions/ResponsiveLayoutUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveLayoutUpdate.java
diff --git a/uitest/src/com/vaadin/tests/extensions/ResponsiveUI.java b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveUI.java
index f534215e18..f534215e18 100644
--- a/uitest/src/com/vaadin/tests/extensions/ResponsiveUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveUI.java
diff --git a/uitest/src/com/vaadin/tests/extensions/ResponsiveWidthAndHeight.java b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeight.java
index 1c3acbec8d..1c3acbec8d 100644
--- a/uitest/src/com/vaadin/tests/extensions/ResponsiveWidthAndHeight.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeight.java
diff --git a/uitest/src/com/vaadin/tests/extensions/ResponsiveWithCrossDomainStyles.java b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveWithCrossDomainStyles.java
index 9f9453d505..9f9453d505 100644
--- a/uitest/src/com/vaadin/tests/extensions/ResponsiveWithCrossDomainStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveWithCrossDomainStyles.java
diff --git a/uitest/src/com/vaadin/tests/extensions/SetThemeAndResponsiveLayout.java b/uitest/src/main/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayout.java
index f3df1a1176..f3df1a1176 100644
--- a/uitest/src/com/vaadin/tests/extensions/SetThemeAndResponsiveLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayout.java
diff --git a/uitest/src/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java
index 6f14fb301c..6f14fb301c 100644
--- a/uitest/src/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java
index 0405ea2e10..0405ea2e10 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java
index 894944d186..894944d186 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/BasicCrudGrid.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGrid.java
index d7f66b0cd9..d7f66b0cd9 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/BasicCrudGrid.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGrid.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRow.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRow.java
index 0fc0669288..0fc0669288 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRow.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRow.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/BasicCrudTable.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudTable.java
index ad54cd55ba..ad54cd55ba 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/BasicCrudTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudTable.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/BasicPersonForm.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicPersonForm.java
index 52d3e60af5..52d3e60af5 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/BasicPersonForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicPersonForm.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/ComplexAddress.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexAddress.java
index d6d657379a..d6d657379a 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/ComplexAddress.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexAddress.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/ComplexPerson.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexPerson.java
index bb4fe89575..bb4fe89575 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/ComplexPerson.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexPerson.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/Country.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/Country.java
index 2c2ffd7160..2c2ffd7160 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/Country.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/Country.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/DateForm.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java
index 6080f18391..6080f18391 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/DateForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java
index 2c202af02b..2c202af02b 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java
index 5f25070f2e..5f25070f2e 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/FormManyToMany.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormManyToMany.java
index f4f612503c..f4f612503c 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/FormManyToMany.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormManyToMany.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/FormOneToMany.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormOneToMany.java
index e269a39441..e269a39441 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/FormOneToMany.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormOneToMany.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/FormOneToOne.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormOneToOne.java
index b16cb29a8a..b16cb29a8a 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/FormOneToOne.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormOneToOne.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
index 6caa8f3e26..6caa8f3e26 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/Gender.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/Gender.java
index dcc6687c17..dcc6687c17 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/Gender.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/Gender.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java
index 58f2292f84..58f2292f84 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/PersonBeanWithValidationAnnotations.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/PersonBeanWithValidationAnnotations.java
index 5f81ee248b..5f81ee248b 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/PersonBeanWithValidationAnnotations.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/PersonBeanWithValidationAnnotations.java
diff --git a/uitest/src/com/vaadin/tests/fields/FormManyToMany.java b/uitest/src/main/java/com/vaadin/tests/fields/FormManyToMany.java
index 43fba20f33..43fba20f33 100644
--- a/uitest/src/com/vaadin/tests/fields/FormManyToMany.java
+++ b/uitest/src/main/java/com/vaadin/tests/fields/FormManyToMany.java
diff --git a/uitest/src/com/vaadin/tests/fields/FormOneToMany.java b/uitest/src/main/java/com/vaadin/tests/fields/FormOneToMany.java
index a010e935ab..a010e935ab 100644
--- a/uitest/src/com/vaadin/tests/fields/FormOneToMany.java
+++ b/uitest/src/main/java/com/vaadin/tests/fields/FormOneToMany.java
diff --git a/uitest/src/com/vaadin/tests/fields/FormOneToOne.java b/uitest/src/main/java/com/vaadin/tests/fields/FormOneToOne.java
index 36f4dfe0ea..36f4dfe0ea 100644
--- a/uitest/src/com/vaadin/tests/fields/FormOneToOne.java
+++ b/uitest/src/main/java/com/vaadin/tests/fields/FormOneToOne.java
diff --git a/uitest/src/com/vaadin/tests/fields/TabIndexes.java b/uitest/src/main/java/com/vaadin/tests/fields/TabIndexes.java
index 32fb36815b..32fb36815b 100644
--- a/uitest/src/com/vaadin/tests/fields/TabIndexes.java
+++ b/uitest/src/main/java/com/vaadin/tests/fields/TabIndexes.java
diff --git a/uitest/src/com/vaadin/tests/fonticon/FontIcons.java b/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java
index e9d2b91e95..e9d2b91e95 100644
--- a/uitest/src/com/vaadin/tests/fonticon/FontIcons.java
+++ b/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java
diff --git a/uitest/src/com/vaadin/tests/integration/EmbedSizeTest.java b/uitest/src/main/java/com/vaadin/tests/integration/EmbedSizeTest.java
index 77c0723cdd..77c0723cdd 100644
--- a/uitest/src/com/vaadin/tests/integration/EmbedSizeTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/EmbedSizeTest.java
diff --git a/uitest/src/com/vaadin/tests/integration/FlagSeResource.java b/uitest/src/main/java/com/vaadin/tests/integration/FlagSeResource.java
index 6c2fcdc2d4..6c2fcdc2d4 100644
--- a/uitest/src/com/vaadin/tests/integration/FlagSeResource.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/FlagSeResource.java
diff --git a/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java b/uitest/src/main/java/com/vaadin/tests/integration/IntegrationTestApplication.java
index e49e527975..e49e527975 100644
--- a/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/IntegrationTestApplication.java
diff --git a/uitest/src/com/vaadin/tests/integration/JSR286Portlet.java b/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java
index 800a056041..800a056041 100644
--- a/uitest/src/com/vaadin/tests/integration/JSR286Portlet.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java
diff --git a/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java b/uitest/src/main/java/com/vaadin/tests/integration/LiferayThemeDemo.java
index 8a8df93742..8a8df93742 100644
--- a/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/LiferayThemeDemo.java
diff --git a/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java b/uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
index c8fa448172..c8fa448172 100644
--- a/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
diff --git a/uitest/src/com/vaadin/tests/integration/ProxyTest.java b/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java
index 887eae315d..887eae315d 100644
--- a/uitest/src/com/vaadin/tests/integration/ProxyTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationDefaultPushUI.java b/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUI.java
index 4c3e1beaa5..4c3e1beaa5 100644
--- a/uitest/src/com/vaadin/tests/integration/ServletIntegrationDefaultPushUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUI.java
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationLongPollingUI.java b/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUI.java
index 0bcac5575d..0bcac5575d 100644
--- a/uitest/src/com/vaadin/tests/integration/ServletIntegrationLongPollingUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUI.java
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationStreamingUI.java b/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationStreamingUI.java
index 5d5801f0db..5d5801f0db 100644
--- a/uitest/src/com/vaadin/tests/integration/ServletIntegrationStreamingUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationStreamingUI.java
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationUI.java b/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationUI.java
index b81d57eccd..b81d57eccd 100755
--- a/uitest/src/com/vaadin/tests/integration/ServletIntegrationUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationUI.java
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java b/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java
index 18e275618a..18e275618a 100644
--- a/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java
diff --git a/uitest/src/com/vaadin/tests/integration/SpecialNameResource.java b/uitest/src/main/java/com/vaadin/tests/integration/SpecialNameResource.java
index 3806e61c36..3806e61c36 100644
--- a/uitest/src/com/vaadin/tests/integration/SpecialNameResource.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/SpecialNameResource.java
diff --git a/uitest/src/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdate.java b/uitest/src/main/java/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdate.java
index cfebfef004..cfebfef004 100644
--- a/uitest/src/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdate.java
diff --git a/uitest/src/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java b/uitest/src/main/java/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java
index b2cadebd02..b2cadebd02 100644
--- a/uitest/src/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java
diff --git a/uitest/src/com/vaadin/tests/layouts/CaptionsInLayouts.java b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java
index 74cfe12ad7..74cfe12ad7 100644
--- a/uitest/src/com/vaadin/tests/layouts/CaptionsInLayouts.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java
diff --git a/uitest/src/com/vaadin/tests/layouts/CaptionsInLayoutsWaiAria.java b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayoutsWaiAria.java
index ec323f2db2..ec323f2db2 100644
--- a/uitest/src/com/vaadin/tests/layouts/CaptionsInLayoutsWaiAria.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayoutsWaiAria.java
diff --git a/uitest/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java b/uitest/src/main/java/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
index 4fa93e27b9..4fa93e27b9 100644
--- a/uitest/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
diff --git a/uitest/src/com/vaadin/tests/layouts/CssLayoutAbsoluteUrl.java b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutAbsoluteUrl.java
index e5430a09af..e5430a09af 100644
--- a/uitest/src/com/vaadin/tests/layouts/CssLayoutAbsoluteUrl.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutAbsoluteUrl.java
diff --git a/uitest/src/com/vaadin/tests/layouts/CssLayoutCustomCss.java b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutCustomCss.java
index 2f717d2b64..2f717d2b64 100644
--- a/uitest/src/com/vaadin/tests/layouts/CssLayoutCustomCss.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutCustomCss.java
diff --git a/uitest/src/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java
index 093dc782fb..093dc782fb 100644
--- a/uitest/src/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java
diff --git a/uitest/src/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
index df4fc8615d..df4fc8615d 100644
--- a/uitest/src/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
diff --git a/uitest/src/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java
index ed3c5e66d3..ed3c5e66d3 100644
--- a/uitest/src/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java
diff --git a/uitest/src/com/vaadin/tests/layouts/DeepComponentTrees.java b/uitest/src/main/java/com/vaadin/tests/layouts/DeepComponentTrees.java
index 643612d254..643612d254 100644
--- a/uitest/src/com/vaadin/tests/layouts/DeepComponentTrees.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/DeepComponentTrees.java
diff --git a/uitest/src/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java b/uitest/src/main/java/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java
index f596fdb77e..f596fdb77e 100644
--- a/uitest/src/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java
diff --git a/uitest/src/com/vaadin/tests/layouts/GridLayoutCaptions.java b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutCaptions.java
index 923f91f246..923f91f246 100644
--- a/uitest/src/com/vaadin/tests/layouts/GridLayoutCaptions.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutCaptions.java
diff --git a/uitest/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
index 4bf33903a1..4bf33903a1 100644
--- a/uitest/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
diff --git a/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel.java b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel.java
index 524799ab3c..524799ab3c 100644
--- a/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel.java
diff --git a/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
index bdda348005..bdda348005 100644
--- a/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
diff --git a/uitest/src/com/vaadin/tests/layouts/GridLayoutNPE.java b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutNPE.java
index 3531a4e13c..3531a4e13c 100644
--- a/uitest/src/com/vaadin/tests/layouts/GridLayoutNPE.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutNPE.java
diff --git a/uitest/src/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java
index 5d45f72142..5d45f72142 100644
--- a/uitest/src/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java
diff --git a/uitest/src/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java
index 9753526a9e..9753526a9e 100644
--- a/uitest/src/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java
diff --git a/uitest/src/com/vaadin/tests/layouts/HiddenHorizontalLayout.java b/uitest/src/main/java/com/vaadin/tests/layouts/HiddenHorizontalLayout.java
index 739779a3e0..739779a3e0 100644
--- a/uitest/src/com/vaadin/tests/layouts/HiddenHorizontalLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/HiddenHorizontalLayout.java
diff --git a/uitest/src/com/vaadin/tests/layouts/HorizontalLayoutAndCaretPosition.java b/uitest/src/main/java/com/vaadin/tests/layouts/HorizontalLayoutAndCaretPosition.java
index a8a25d03ce..a8a25d03ce 100644
--- a/uitest/src/com/vaadin/tests/layouts/HorizontalLayoutAndCaretPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/HorizontalLayoutAndCaretPosition.java
diff --git a/uitest/src/com/vaadin/tests/layouts/HorizontalLayoutWithLabelAndButton.java b/uitest/src/main/java/com/vaadin/tests/layouts/HorizontalLayoutWithLabelAndButton.java
index 9381f2caeb..9381f2caeb 100644
--- a/uitest/src/com/vaadin/tests/layouts/HorizontalLayoutWithLabelAndButton.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/HorizontalLayoutWithLabelAndButton.java
diff --git a/uitest/src/com/vaadin/tests/layouts/HtmlInCaption.java b/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java
index 830b96b3d7..830b96b3d7 100644
--- a/uitest/src/com/vaadin/tests/layouts/HtmlInCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java
diff --git a/uitest/src/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeak.java b/uitest/src/main/java/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeak.java
index 504ee8b41b..504ee8b41b 100644
--- a/uitest/src/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeak.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeak.java
diff --git a/uitest/src/com/vaadin/tests/layouts/LayoutPerformanceTests.java b/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java
index 4e50f0d83b..4e50f0d83b 100644
--- a/uitest/src/com/vaadin/tests/layouts/LayoutPerformanceTests.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java
diff --git a/uitest/src/com/vaadin/tests/layouts/MarginWithExpandRatio.java b/uitest/src/main/java/com/vaadin/tests/layouts/MarginWithExpandRatio.java
index 3697ab1c26..3697ab1c26 100644
--- a/uitest/src/com/vaadin/tests/layouts/MarginWithExpandRatio.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/MarginWithExpandRatio.java
diff --git a/uitest/src/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java b/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
index 364a0e267a..364a0e267a 100644
--- a/uitest/src/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
diff --git a/uitest/src/com/vaadin/tests/layouts/MovingInvisibleField.java b/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java
index 1285e5b52e..1285e5b52e 100644
--- a/uitest/src/com/vaadin/tests/layouts/MovingInvisibleField.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java
diff --git a/uitest/src/com/vaadin/tests/layouts/OrderedLayoutBasics.java b/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java
index 3d4b20d5d9..3d4b20d5d9 100644
--- a/uitest/src/com/vaadin/tests/layouts/OrderedLayoutBasics.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java
diff --git a/uitest/src/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java b/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java
index 41f1de2c4a..41f1de2c4a 100644
--- a/uitest/src/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java
diff --git a/uitest/src/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayout.java b/uitest/src/main/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayout.java
index a139c7f67a..a139c7f67a 100644
--- a/uitest/src/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayout.java
diff --git a/uitest/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java b/uitest/src/main/java/com/vaadin/tests/layouts/TestAbsoluteLayout.java
index 5abe915307..5abe915307 100644
--- a/uitest/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/TestAbsoluteLayout.java
diff --git a/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java b/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutClickListeners.java
index 22a37022c2..22a37022c2 100644
--- a/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutClickListeners.java
diff --git a/uitest/src/com/vaadin/tests/layouts/TestLayoutPerformance.java b/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java
index f80d91ae1b..f80d91ae1b 100644
--- a/uitest/src/com/vaadin/tests/layouts/TestLayoutPerformance.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java
diff --git a/uitest/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.java b/uitest/src/main/java/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
index 257e0174d5..257e0174d5 100644
--- a/uitest/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
diff --git a/uitest/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
index bc7268356d..bc7268356d 100644
--- a/uitest/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
diff --git a/uitest/src/com/vaadin/tests/layouts/VerticalLayoutSlotExpansionAndAlignment.java b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutSlotExpansionAndAlignment.java
index 77f0d6cdda..77f0d6cdda 100644
--- a/uitest/src/com/vaadin/tests/layouts/VerticalLayoutSlotExpansionAndAlignment.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutSlotExpansionAndAlignment.java
diff --git a/uitest/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponents.java b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponents.java
index 906de9bb77..906de9bb77 100644
--- a/uitest/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponents.java
diff --git a/uitest/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java
index f3d4029663..f3d4029663 100644
--- a/uitest/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java
diff --git a/uitest/src/com/vaadin/tests/layouts/customlayout/DefaultLocationInCustomLayout.java b/uitest/src/main/java/com/vaadin/tests/layouts/customlayout/DefaultLocationInCustomLayout.java
index 18ec491c0b..18ec491c0b 100644
--- a/uitest/src/com/vaadin/tests/layouts/customlayout/DefaultLocationInCustomLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/customlayout/DefaultLocationInCustomLayout.java
diff --git a/uitest/src/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java
index cd86fbcf3c..cd86fbcf3c 100644
--- a/uitest/src/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java
diff --git a/uitest/src/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java
index c07deccd68..c07deccd68 100644
--- a/uitest/src/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java
diff --git a/uitest/src/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumns.java b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumns.java
index fc37455752..fc37455752 100644
--- a/uitest/src/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumns.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java
index 7ea8739cf4..7ea8739cf4 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAlignment.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAlignment.java
index bfdc53bf7c..bfdc53bf7c 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAlignment.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAlignment.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseCaption.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseCaption.java
index 37ce77e745..37ce77e745 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseCaption.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseComponentSizing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseComponentSizing.java
index d9377c6a8b..d9377c6a8b 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseComponentSizing.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseComponentSizing.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseIcon.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseIcon.java
index 34ec7928ff..34ec7928ff 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseIcon.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutExpand.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutExpand.java
index f21db94f80..f21db94f80 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutExpand.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java
index e98573d170..e98573d170 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutSizing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutSizing.java
index edc0b275d1..edc0b275d1 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutSizing.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutSizing.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java
index 02fcb677cd..02fcb677cd 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseRegError.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseRegError.java
index df4053b533..df4053b533 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseRegError.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseRegError.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java
index 84254b4935..84254b4935 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAlignment.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAlignment.java
index e061532690..e061532690 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAlignment.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAlignment.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridBaseLayoutTestUI.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridBaseLayoutTestUI.java
index c08e5286a6..c08e5286a6 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridBaseLayoutTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridBaseLayoutTestUI.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridCaption.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridCaption.java
index 7b1c3d9a65..7b1c3d9a65 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridCaption.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridComponentSizing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridComponentSizing.java
index bebccfbf9d..bebccfbf9d 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridComponentSizing.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridComponentSizing.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java
index 863a4f2c1d..863a4f2c1d 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpand.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpand.java
index b3a84cdc26..b3a84cdc26 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpand.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java
index 78a67bdf82..78a67bdf82 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java
index 5b4dd2a947..5b4dd2a947 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizing.java
index 8358f91997..8358f91997 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizing.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizing.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java
index c4787045fc..c4787045fc 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HAlignment.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HAlignment.java
index 9864fcaa41..9864fcaa41 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HAlignment.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HAlignment.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HCaption.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HCaption.java
index 3088a00c39..3088a00c39 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HCaption.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HComponentSizing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HComponentSizing.java
index b042c018eb..b042c018eb 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HComponentSizing.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HComponentSizing.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HIcon.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HIcon.java
index cb4eb321b9..cb4eb321b9 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HIcon.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutExpand.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutExpand.java
index 273ca07bc4..273ca07bc4 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutExpand.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutMarginSpacing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutMarginSpacing.java
index 9fea380155..9fea380155 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutMarginSpacing.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutMarginSpacing.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegError.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegError.java
index 3c7134a061..3c7134a061 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegError.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegError.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutSizing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutSizing.java
index 350037b05c..350037b05c 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutSizing.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutSizing.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/UndefWideLabel.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/UndefWideLabel.java
index c998ce458a..c998ce458a 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/UndefWideLabel.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/UndefWideLabel.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VAddReplaceMove.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VAddReplaceMove.java
index a0ef960f57..a0ef960f57 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VAddReplaceMove.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VAddReplaceMove.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VAlignment.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VAlignment.java
index 9872b4bfd7..9872b4bfd7 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VAlignment.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VAlignment.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VCaption.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VCaption.java
index b2f50961cb..b2f50961cb 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VCaption.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizing.java
index 67fcb85652..67fcb85652 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizing.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizing.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VIcon.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VIcon.java
index 1420be4907..1420be4907 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VIcon.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpand.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpand.java
index 15a31b16f0..15a31b16f0 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpand.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutMarginSpacing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutMarginSpacing.java
index d6d9040bae..d6d9040bae 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutMarginSpacing.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutMarginSpacing.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegError.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegError.java
index 72fd35b842..72fd35b842 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegError.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegError.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizing.java
index ea6464cfb7..ea6464cfb7 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizing.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizing.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/broadcastingmessages/Broadcaster.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/broadcastingmessages/Broadcaster.java
index e268aed7b6..e268aed7b6 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/broadcastingmessages/Broadcaster.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/broadcastingmessages/Broadcaster.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/broadcastingmessages/BroadcasterUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/broadcastingmessages/BroadcasterUI.java
index 0d63df5e95..0d63df5e95 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/broadcastingmessages/BroadcasterUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/broadcastingmessages/BroadcasterUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java
index dbe1cbb717..dbe1cbb717 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v70/SimpleLoginMainView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginMainView.java
index cb59aa1608..cb59aa1608 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v70/SimpleLoginMainView.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginMainView.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v70/SimpleLoginUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginUI.java
index 1f94d43abe..1f94d43abe 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v70/SimpleLoginUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java
index 3ff1c2df40..3ff1c2df40 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java
index 63e43b29f1..63e43b29f1 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7_3/ThemeChangeUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_3/ThemeChangeUI.java
index c0082edcca..c0082edcca 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7_3/ThemeChangeUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_3/ThemeChangeUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7_4/ConfiguringColumnWidths.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringColumnWidths.java
index 3204ebd11c..3204ebd11c 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7_4/ConfiguringColumnWidths.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringColumnWidths.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7_4/ConfiguringGridHeadersAndFooters.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringGridHeadersAndFooters.java
index 57e807a224..57e807a224 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7_4/ConfiguringGridHeadersAndFooters.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringGridHeadersAndFooters.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java
index 3fd9c87262..3fd9c87262 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7_4/GridExampleBean.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/GridExampleBean.java
index c39f458a6b..c39f458a6b 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7_4/GridExampleBean.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/GridExampleBean.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7_4/GridExampleHelper.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/GridExampleHelper.java
index 539d3431e8..539d3431e8 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7_4/GridExampleHelper.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/GridExampleHelper.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7_4/ShowingInlineDataInGrid.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ShowingInlineDataInGrid.java
index 72f101ab7a..72f101ab7a 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7_4/ShowingInlineDataInGrid.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ShowingInlineDataInGrid.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7_4/UsingGridWithAContainer.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/UsingGridWithAContainer.java
index 4cf3f14c2b..4cf3f14c2b 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7_4/UsingGridWithAContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/UsingGridWithAContainer.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java
index eaa099f3eb..eaa099f3eb 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java
index 0cb4492929..0cb4492929 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java
index a0e4a5851b..a0e4a5851b 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
index 952cf8c681..952cf8c681 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java
index 8438135c60..8438135c60 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java
index 408995867c..408995867c 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java
index 213e23982b..213e23982b 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java
index f4eed8ddd6..f4eed8ddd6 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java
index b744a8de5c..b744a8de5c 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
index 84f6ec26ff..84f6ec26ff 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
index 8485bba499..8485bba499 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
index 9a9bc8fae0..9a9bc8fae0 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java
index fd43115732..fd43115732 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java
index 4ef080afc2..4ef080afc2 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java
index 17c37f2115..17c37f2115 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java
index 483f841ce2..483f841ce2 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
index 8197cd82ae..8197cd82ae 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java
index 39aef56a1e..39aef56a1e 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java
index fb84a4068b..fb84a4068b 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java
index 4d95d9cc48..4d95d9cc48 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java
index 18a27b85b2..18a27b85b2 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java
index 986811e0f4..986811e0f4 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyComponent.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponent.java
index 6512754683..6512754683 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponent.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java
index f291dfe1a9..f291dfe1a9 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java
index 8a73e90496..8a73e90496 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyPickerWidget.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyPickerWidget.java
index 6a0aee9670..6a0aee9670 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyPickerWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/MyPickerWidget.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java
index b22d3dfc1a..b22d3dfc1a 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java
index 148e7f22ea..148e7f22ea 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java
index 850fa1044f..850fa1044f 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java
index c534a4845f..c534a4845f 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/Analytics.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Analytics.java
index 338fb20893..338fb20893 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/Analytics.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Analytics.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java
index b12f5829fc..b12f5829fc 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/CapsLockWarning.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/CapsLockWarning.java
index 4165e63951..4165e63951 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/CapsLockWarning.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/CapsLockWarning.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/CapsLockWarningUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/CapsLockWarningUI.java
index 19a7da7114..19a7da7114 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/CapsLockWarningUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/CapsLockWarningUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java
index 002e3478bf..002e3478bf 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java
index 7b37166eab..7b37166eab 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java
index 1bc282de19..1bc282de19 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java
index d233a54d86..d233a54d86 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/Flot.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Flot.java
index 86666b12e8..86666b12e8 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/Flot.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Flot.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotClickRpc.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotClickRpc.java
index 3802fe6e3f..3802fe6e3f 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotClickRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotClickRpc.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java
index 99c4fdd91b..99c4fdd91b 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java
index f6449b1997..f6449b1997 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotState.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotState.java
index 54cb65db05..54cb65db05 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotState.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/FlotState.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/JSAPIUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/JSAPIUI.java
index ea9cd52d34..ea9cd52d34 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/JSAPIUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/JSAPIUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/RedButton.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RedButton.java
index 5c5037d5ad..5c5037d5ad 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/RedButton.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RedButton.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java
index fb6a4dc83a..fb6a4dc83a 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/Refresher.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Refresher.java
index 6878fc1bc6..6878fc1bc6 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/Refresher.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Refresher.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/RefresherTestUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RefresherTestUI.java
index e9243ac0cb..e9243ac0cb 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/RefresherTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/RefresherTestUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b1/Addition.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/Addition.java
index 696137c3b1..696137c3b1 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b1/Addition.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/Addition.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b1/AxessingWebPageAndBrowserInfoUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/AxessingWebPageAndBrowserInfoUI.java
index 4fbe62a2ce..4fbe62a2ce 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b1/AxessingWebPageAndBrowserInfoUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/AxessingWebPageAndBrowserInfoUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b1/BootstrapListenerCode.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/BootstrapListenerCode.java
index 422e44e402..422e44e402 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b1/BootstrapListenerCode.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/BootstrapListenerCode.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b1/CapsLockWarningWithRpc.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/CapsLockWarningWithRpc.java
index 280be5982e..280be5982e 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b1/CapsLockWarningWithRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/CapsLockWarningWithRpc.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b1/ReducingRoundTrips.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/ReducingRoundTrips.java
index 03310ab9e8..03310ab9e8 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b1/ReducingRoundTrips.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b1/ReducingRoundTrips.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b2/CleanupUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b2/CleanupUI.java
index 4e70748985..4e70748985 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b2/CleanupUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b2/CleanupUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b5/HandlingLogout.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/HandlingLogout.java
index 0356b4c5a8..0356b4c5a8 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b5/HandlingLogout.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/HandlingLogout.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java
index 99b5973661..99b5973661 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b6/LettingUserDownloadFile.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/LettingUserDownloadFile.java
index d5c99c931b..d5c99c931b 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b6/LettingUserDownloadFile.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/LettingUserDownloadFile.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b6/MyPopupUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/MyPopupUI.java
index eb9afc02cd..eb9afc02cd 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b6/MyPopupUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/MyPopupUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b6/OpeningUIInPopup.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/OpeningUIInPopup.java
index da9c73dd94..da9c73dd94 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b6/OpeningUIInPopup.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b6/OpeningUIInPopup.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b9/CountView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/CountView.java
index a2ff67f6d9..a2ff67f6d9 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b9/CountView.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/CountView.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b9/LoginView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java
index 28f8443440..28f8443440 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b9/LoginView.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b9/MainView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainView.java
index 3764b7622e..3764b7622e 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b9/MainView.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainView.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b9/MainViewEarlierExample.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainViewEarlierExample.java
index e638770346..e638770346 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b9/MainViewEarlierExample.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainViewEarlierExample.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b9/MainView__LastNavigatorExample.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainView__LastNavigatorExample.java
index 5344a06a31..5344a06a31 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b9/MainView__LastNavigatorExample.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MainView__LastNavigatorExample.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b9/MessageView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MessageView.java
index 30e86a2be7..30e86a2be7 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b9/MessageView.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/MessageView.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b9/NavigationtestUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/NavigationtestUI.java
index 62941443b2..62941443b2 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b9/NavigationtestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/NavigationtestUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b9/SassyUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/SassyUI.java
index fa212780f5..fa212780f5 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b9/SassyUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/SassyUI.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b9/SecretView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/SecretView.java
index 21fb479bc0..21fb479bc0 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b9/SecretView.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/SecretView.java
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b9/SettingsView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/SettingsView.java
index be8ea9e533..be8ea9e533 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b9/SettingsView.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/SettingsView.java
diff --git a/uitest/src/com/vaadin/tests/navigator/NavigatorListenerModifiesListeners.java b/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorListenerModifiesListeners.java
index 139dbaefb6..139dbaefb6 100644
--- a/uitest/src/com/vaadin/tests/navigator/NavigatorListenerModifiesListeners.java
+++ b/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorListenerModifiesListeners.java
diff --git a/uitest/src/com/vaadin/tests/navigator/NavigatorTest.java b/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorTest.java
index ebbc684c9c..ebbc684c9c 100644
--- a/uitest/src/com/vaadin/tests/navigator/NavigatorTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorTest.java
diff --git a/uitest/src/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonAction.java b/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonAction.java
index 5c78a3f42a..5c78a3f42a 100644
--- a/uitest/src/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonAction.java
+++ b/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonAction.java
diff --git a/uitest/src/com/vaadin/tests/overlays/OverlayTouchScrolling.java b/uitest/src/main/java/com/vaadin/tests/overlays/OverlayTouchScrolling.java
index fdcfdf7266..fdcfdf7266 100644
--- a/uitest/src/com/vaadin/tests/overlays/OverlayTouchScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/overlays/OverlayTouchScrolling.java
diff --git a/uitest/src/com/vaadin/tests/performance/BasicPerformanceTest.java b/uitest/src/main/java/com/vaadin/tests/performance/BasicPerformanceTest.java
index a97f2611d1..a97f2611d1 100644
--- a/uitest/src/com/vaadin/tests/performance/BasicPerformanceTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/performance/BasicPerformanceTest.java
diff --git a/uitest/src/com/vaadin/tests/performance/ThreadMemoryLeaksTest.java b/uitest/src/main/java/com/vaadin/tests/performance/ThreadMemoryLeaksTest.java
index 5ffc7141af..5ffc7141af 100644
--- a/uitest/src/com/vaadin/tests/performance/ThreadMemoryLeaksTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/performance/ThreadMemoryLeaksTest.java
diff --git a/uitest/src/com/vaadin/tests/push/BarInUIDL.java b/uitest/src/main/java/com/vaadin/tests/push/BarInUIDL.java
index a5d23dcd1f..a5d23dcd1f 100644
--- a/uitest/src/com/vaadin/tests/push/BarInUIDL.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/BarInUIDL.java
diff --git a/uitest/src/com/vaadin/tests/push/BasicPush.java b/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java
index 7379b08f5b..7379b08f5b 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPush.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushLongPolling.java b/uitest/src/main/java/com/vaadin/tests/push/BasicPushLongPolling.java
index 8b6f634aae..8b6f634aae 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushLongPolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/BasicPushLongPolling.java
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java b/uitest/src/main/java/com/vaadin/tests/push/BasicPushStreaming.java
index c906c5f6e1..c906c5f6e1 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushStreaming.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/BasicPushStreaming.java
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java b/uitest/src/main/java/com/vaadin/tests/push/BasicPushWebsocket.java
index 84c0b19ce8..84c0b19ce8 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushWebsocket.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/BasicPushWebsocket.java
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushWebsocketXhr.java b/uitest/src/main/java/com/vaadin/tests/push/BasicPushWebsocketXhr.java
index e31eb2a369..e31eb2a369 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushWebsocketXhr.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/BasicPushWebsocketXhr.java
diff --git a/uitest/src/com/vaadin/tests/push/EnableDisablePush.java b/uitest/src/main/java/com/vaadin/tests/push/EnableDisablePush.java
index d5646c976b..d5646c976b 100644
--- a/uitest/src/com/vaadin/tests/push/EnableDisablePush.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/EnableDisablePush.java
diff --git a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTime.java b/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTime.java
index 815b85ecc4..815b85ecc4 100644
--- a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTime.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTime.java
diff --git a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeLongPolling.java b/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTimeLongPolling.java
index 3080b96ec4..3080b96ec4 100644
--- a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeLongPolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTimeLongPolling.java
diff --git a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeStreaming.java b/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTimeStreaming.java
index 04a9c68e32..04a9c68e32 100644
--- a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeStreaming.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTimeStreaming.java
diff --git a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocket.java b/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocket.java
index f73e7b728c..f73e7b728c 100644
--- a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocket.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocket.java
diff --git a/uitest/src/com/vaadin/tests/push/ManualLongPollingPushUI.java b/uitest/src/main/java/com/vaadin/tests/push/ManualLongPollingPushUI.java
index 190f6daa24..190f6daa24 100644
--- a/uitest/src/com/vaadin/tests/push/ManualLongPollingPushUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/ManualLongPollingPushUI.java
diff --git a/uitest/src/com/vaadin/tests/push/PushConfiguration.java b/uitest/src/main/java/com/vaadin/tests/push/PushConfiguration.java
index 5e56a5f361..5e56a5f361 100644
--- a/uitest/src/com/vaadin/tests/push/PushConfiguration.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushConfiguration.java
diff --git a/uitest/src/com/vaadin/tests/push/PushConfigurator.java b/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java
index 7da58af1da..7da58af1da 100644
--- a/uitest/src/com/vaadin/tests/push/PushConfigurator.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java
diff --git a/uitest/src/com/vaadin/tests/push/PushErrorHandling.java b/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java
index a1182c0daf..a1182c0daf 100644
--- a/uitest/src/com/vaadin/tests/push/PushErrorHandling.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java
diff --git a/uitest/src/com/vaadin/tests/push/PushFromInit.java b/uitest/src/main/java/com/vaadin/tests/push/PushFromInit.java
index 63af3d9ec7..63af3d9ec7 100644
--- a/uitest/src/com/vaadin/tests/push/PushFromInit.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushFromInit.java
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeData.java b/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java
index f9625b80be..f9625b80be 100644
--- a/uitest/src/com/vaadin/tests/push/PushLargeData.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeDataLongPolling.java b/uitest/src/main/java/com/vaadin/tests/push/PushLargeDataLongPolling.java
index c2fdb5ae95..c2fdb5ae95 100644
--- a/uitest/src/com/vaadin/tests/push/PushLargeDataLongPolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushLargeDataLongPolling.java
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeDataStreaming.java b/uitest/src/main/java/com/vaadin/tests/push/PushLargeDataStreaming.java
index ef300ab222..ef300ab222 100644
--- a/uitest/src/com/vaadin/tests/push/PushLargeDataStreaming.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushLargeDataStreaming.java
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocket.java b/uitest/src/main/java/com/vaadin/tests/push/PushLargeDataWebsocket.java
index a893d7f1ef..a893d7f1ef 100644
--- a/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocket.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushLargeDataWebsocket.java
diff --git a/uitest/src/com/vaadin/tests/push/PushWithPreserveOnRefresh.java b/uitest/src/main/java/com/vaadin/tests/push/PushWithPreserveOnRefresh.java
index af19f8849f..af19f8849f 100644
--- a/uitest/src/com/vaadin/tests/push/PushWithPreserveOnRefresh.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushWithPreserveOnRefresh.java
diff --git a/uitest/src/com/vaadin/tests/push/PushWithRequireJS.java b/uitest/src/main/java/com/vaadin/tests/push/PushWithRequireJS.java
index 93e9d392ee..93e9d392ee 100644
--- a/uitest/src/com/vaadin/tests/push/PushWithRequireJS.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushWithRequireJS.java
diff --git a/uitest/src/com/vaadin/tests/push/RefreshCloseConnection.java b/uitest/src/main/java/com/vaadin/tests/push/RefreshCloseConnection.java
index 4d02c4e62e..4d02c4e62e 100644
--- a/uitest/src/com/vaadin/tests/push/RefreshCloseConnection.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/RefreshCloseConnection.java
diff --git a/uitest/src/com/vaadin/tests/push/RoundTripTest.java b/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java
index 4e192db7f8..4e192db7f8 100644
--- a/uitest/src/com/vaadin/tests/push/RoundTripTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java
diff --git a/uitest/src/com/vaadin/tests/push/SendMultibyteCharacters.java b/uitest/src/main/java/com/vaadin/tests/push/SendMultibyteCharacters.java
index e41f769724..e41f769724 100644
--- a/uitest/src/com/vaadin/tests/push/SendMultibyteCharacters.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/SendMultibyteCharacters.java
diff --git a/uitest/src/com/vaadin/tests/push/StreamingReconnectWhilePushing.java b/uitest/src/main/java/com/vaadin/tests/push/StreamingReconnectWhilePushing.java
index 74d089374c..74d089374c 100644
--- a/uitest/src/com/vaadin/tests/push/StreamingReconnectWhilePushing.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/StreamingReconnectWhilePushing.java
diff --git a/uitest/src/com/vaadin/tests/push/TablePushStreaming.java b/uitest/src/main/java/com/vaadin/tests/push/TablePushStreaming.java
index 04aad63813..04aad63813 100644
--- a/uitest/src/com/vaadin/tests/push/TablePushStreaming.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/TablePushStreaming.java
diff --git a/uitest/src/com/vaadin/tests/push/TogglePush.java b/uitest/src/main/java/com/vaadin/tests/push/TogglePush.java
index e662545134..e662545134 100644
--- a/uitest/src/com/vaadin/tests/push/TogglePush.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/TogglePush.java
diff --git a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java b/uitest/src/main/java/com/vaadin/tests/push/TrackMessageSizeUI.java
index 182a2e67e4..182a2e67e4 100644
--- a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/TrackMessageSizeUI.java
diff --git a/uitest/src/com/vaadin/tests/requesthandlers/AppResource404.java b/uitest/src/main/java/com/vaadin/tests/requesthandlers/AppResource404.java
index a6a5a5a084..a6a5a5a084 100644
--- a/uitest/src/com/vaadin/tests/requesthandlers/AppResource404.java
+++ b/uitest/src/main/java/com/vaadin/tests/requesthandlers/AppResource404.java
diff --git a/uitest/src/com/vaadin/tests/requesthandlers/CommunicationError.java b/uitest/src/main/java/com/vaadin/tests/requesthandlers/CommunicationError.java
index 26f3dff1a2..26f3dff1a2 100644
--- a/uitest/src/com/vaadin/tests/requesthandlers/CommunicationError.java
+++ b/uitest/src/main/java/com/vaadin/tests/requesthandlers/CommunicationError.java
diff --git a/uitest/src/com/vaadin/tests/resources/CachingJavaScriptComponent.java b/uitest/src/main/java/com/vaadin/tests/resources/CachingJavaScriptComponent.java
index b6e409d4ba..b6e409d4ba 100644
--- a/uitest/src/com/vaadin/tests/resources/CachingJavaScriptComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/resources/CachingJavaScriptComponent.java
diff --git a/uitest/src/com/vaadin/tests/resources/DownloadLargeFileResource.java b/uitest/src/main/java/com/vaadin/tests/resources/DownloadLargeFileResource.java
index d799e1a8d4..d799e1a8d4 100644
--- a/uitest/src/com/vaadin/tests/resources/DownloadLargeFileResource.java
+++ b/uitest/src/main/java/com/vaadin/tests/resources/DownloadLargeFileResource.java
diff --git a/uitest/src/com/vaadin/tests/resources/NonExistingFileResource.java b/uitest/src/main/java/com/vaadin/tests/resources/NonExistingFileResource.java
index f55c1f1f1d..f55c1f1f1d 100644
--- a/uitest/src/com/vaadin/tests/resources/NonExistingFileResource.java
+++ b/uitest/src/main/java/com/vaadin/tests/resources/NonExistingFileResource.java
diff --git a/uitest/src/com/vaadin/tests/resources/PublishedFileHandlerCaching.java b/uitest/src/main/java/com/vaadin/tests/resources/PublishedFileHandlerCaching.java
index a2828032c7..a2828032c7 100644
--- a/uitest/src/com/vaadin/tests/resources/PublishedFileHandlerCaching.java
+++ b/uitest/src/main/java/com/vaadin/tests/resources/PublishedFileHandlerCaching.java
diff --git a/uitest/src/com/vaadin/tests/resources/ResourceDownload.java b/uitest/src/main/java/com/vaadin/tests/resources/ResourceDownload.java
index e323f5285b..e323f5285b 100644
--- a/uitest/src/com/vaadin/tests/resources/ResourceDownload.java
+++ b/uitest/src/main/java/com/vaadin/tests/resources/ResourceDownload.java
diff --git a/uitest/src/com/vaadin/tests/rpclogger/LoggingServerRpcHandler.java b/uitest/src/main/java/com/vaadin/tests/rpclogger/LoggingServerRpcHandler.java
index 1cb66972ef..1cb66972ef 100644
--- a/uitest/src/com/vaadin/tests/rpclogger/LoggingServerRpcHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/rpclogger/LoggingServerRpcHandler.java
diff --git a/uitest/src/com/vaadin/tests/rpclogger/LoggingUidlRequestHandler.java b/uitest/src/main/java/com/vaadin/tests/rpclogger/LoggingUidlRequestHandler.java
index 5eff9b56d9..5eff9b56d9 100644
--- a/uitest/src/com/vaadin/tests/rpclogger/LoggingUidlRequestHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/rpclogger/LoggingUidlRequestHandler.java
diff --git a/uitest/src/com/vaadin/tests/rpclogger/RPCLoggerService.java b/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerService.java
index a70a51b603..a70a51b603 100644
--- a/uitest/src/com/vaadin/tests/rpclogger/RPCLoggerService.java
+++ b/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerService.java
diff --git a/uitest/src/com/vaadin/tests/rpclogger/RPCLoggerServlet.java b/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerServlet.java
index adb4302ba3..adb4302ba3 100644
--- a/uitest/src/com/vaadin/tests/rpclogger/RPCLoggerServlet.java
+++ b/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerServlet.java
diff --git a/uitest/src/com/vaadin/tests/rpclogger/RPCLoggerUI.java b/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerUI.java
index bac82f232d..bac82f232d 100644
--- a/uitest/src/com/vaadin/tests/rpclogger/RPCLoggerUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerUI.java
diff --git a/uitest/src/com/vaadin/tests/serialization/ChangeStateWhenReattaching.java b/uitest/src/main/java/com/vaadin/tests/serialization/ChangeStateWhenReattaching.java
index 814d52048f..814d52048f 100644
--- a/uitest/src/com/vaadin/tests/serialization/ChangeStateWhenReattaching.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/ChangeStateWhenReattaching.java
diff --git a/uitest/src/com/vaadin/tests/serialization/DelegateToWidgetTest.java b/uitest/src/main/java/com/vaadin/tests/serialization/DelegateToWidgetTest.java
index 96f003d6c5..96f003d6c5 100644
--- a/uitest/src/com/vaadin/tests/serialization/DelegateToWidgetTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/DelegateToWidgetTest.java
diff --git a/uitest/src/com/vaadin/tests/serialization/DelegateWithoutStateClassTest.java b/uitest/src/main/java/com/vaadin/tests/serialization/DelegateWithoutStateClassTest.java
index b01a6b243a..b01a6b243a 100644
--- a/uitest/src/com/vaadin/tests/serialization/DelegateWithoutStateClassTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/DelegateWithoutStateClassTest.java
diff --git a/uitest/src/com/vaadin/tests/serialization/EncodeResultDisplay.java b/uitest/src/main/java/com/vaadin/tests/serialization/EncodeResultDisplay.java
index 01d1b14243..01d1b14243 100644
--- a/uitest/src/com/vaadin/tests/serialization/EncodeResultDisplay.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/EncodeResultDisplay.java
diff --git a/uitest/src/com/vaadin/tests/serialization/GenericWidgetHandling.java b/uitest/src/main/java/com/vaadin/tests/serialization/GenericWidgetHandling.java
index 7f599f2c0a..7f599f2c0a 100644
--- a/uitest/src/com/vaadin/tests/serialization/GenericWidgetHandling.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/GenericWidgetHandling.java
diff --git a/uitest/src/com/vaadin/tests/serialization/LegacySerializerUI.java b/uitest/src/main/java/com/vaadin/tests/serialization/LegacySerializerUI.java
index 618462b203..618462b203 100644
--- a/uitest/src/com/vaadin/tests/serialization/LegacySerializerUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/LegacySerializerUI.java
diff --git a/uitest/src/com/vaadin/tests/serialization/NoLayout.java b/uitest/src/main/java/com/vaadin/tests/serialization/NoLayout.java
index 8ce8c437a4..8ce8c437a4 100644
--- a/uitest/src/com/vaadin/tests/serialization/NoLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/NoLayout.java
diff --git a/uitest/src/com/vaadin/tests/serialization/SerializerNamespaceTest.java b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerNamespaceTest.java
index fa3578c41d..fa3578c41d 100644
--- a/uitest/src/com/vaadin/tests/serialization/SerializerNamespaceTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerNamespaceTest.java
diff --git a/uitest/src/com/vaadin/tests/serialization/SerializerTest.java b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java
index d1af180d4e..d1af180d4e 100644
--- a/uitest/src/com/vaadin/tests/serialization/SerializerTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/ButtonsTest.java b/uitest/src/main/java/com/vaadin/tests/themes/ButtonsTest.java
index 41d986237c..41d986237c 100644
--- a/uitest/src/com/vaadin/tests/themes/ButtonsTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/ButtonsTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/CSSInjectTest.java b/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java
index 738d8fc681..738d8fc681 100644
--- a/uitest/src/com/vaadin/tests/themes/CSSInjectTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/LegacyComponentThemeChange.java b/uitest/src/main/java/com/vaadin/tests/themes/LegacyComponentThemeChange.java
index 0a57b77aa3..0a57b77aa3 100644
--- a/uitest/src/com/vaadin/tests/themes/LegacyComponentThemeChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/LegacyComponentThemeChange.java
diff --git a/uitest/src/com/vaadin/tests/themes/LiferayThemeTest.java b/uitest/src/main/java/com/vaadin/tests/themes/LiferayThemeTest.java
index 0132a1a0aa..0132a1a0aa 100644
--- a/uitest/src/com/vaadin/tests/themes/LiferayThemeTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/LiferayThemeTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/ThemeChangeFavicon.java b/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeFavicon.java
index 8995583975..8995583975 100644
--- a/uitest/src/com/vaadin/tests/themes/ThemeChangeFavicon.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeFavicon.java
diff --git a/uitest/src/com/vaadin/tests/themes/ThemeChangeOnTheFly.java b/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeOnTheFly.java
index 0ea5c18bc9..0ea5c18bc9 100644
--- a/uitest/src/com/vaadin/tests/themes/ThemeChangeOnTheFly.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeOnTheFly.java
diff --git a/uitest/src/com/vaadin/tests/themes/base/DisabledMenuBarItem.java b/uitest/src/main/java/com/vaadin/tests/themes/base/DisabledMenuBarItem.java
index 16a822789a..16a822789a 100644
--- a/uitest/src/com/vaadin/tests/themes/base/DisabledMenuBarItem.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/base/DisabledMenuBarItem.java
diff --git a/uitest/src/com/vaadin/tests/themes/chameleon/ChameleonNotification.java b/uitest/src/main/java/com/vaadin/tests/themes/chameleon/ChameleonNotification.java
index fc26a7b4f4..fc26a7b4f4 100644
--- a/uitest/src/com/vaadin/tests/themes/chameleon/ChameleonNotification.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/chameleon/ChameleonNotification.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/Accordions.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Accordions.java
index 3c7ad2ad33..3c7ad2ad33 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/Accordions.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Accordions.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/AlignTopIconInButton.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/AlignTopIconInButton.java
index eb4be8e0d8..eb4be8e0d8 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/AlignTopIconInButton.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/AlignTopIconInButton.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ButtonsAndLinks.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ButtonsAndLinks.java
index ee88595ba7..ee88595ba7 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ButtonsAndLinks.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ButtonsAndLinks.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/CalendarTest.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java
index e18665f2fa..e18665f2fa 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/CalendarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/CheckBoxes.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/CheckBoxes.java
index f77cf9a315..f77cf9a315 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/CheckBoxes.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/CheckBoxes.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ColorPickers.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java
index 8e32b07ebd..8e32b07ebd 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ColorPickers.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ComboBoxes.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ComboBoxes.java
index 4a88d87cd2..4a88d87cd2 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ComboBoxes.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ComboBoxes.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/CommonParts.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/CommonParts.java
index ea7c42ba2e..ea7c42ba2e 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/CommonParts.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/CommonParts.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ContrastFontColor.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ContrastFontColor.java
index ad73302a31..ad73302a31 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ContrastFontColor.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ContrastFontColor.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/DateFields.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java
index 9c95b7400c..9c95b7400c 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/DateFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/Dragging.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Dragging.java
index 8de518be23..8de518be23 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/Dragging.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Dragging.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java
index 1d7ba7eefb..1d7ba7eefb 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/Forms.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Forms.java
index 32aef68520..32aef68520 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/Forms.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Forms.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/GridDisabled.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/GridDisabled.java
index 9bb0c0c0e3..9bb0c0c0e3 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/GridDisabled.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/GridDisabled.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ImmediateUpload.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ImmediateUpload.java
index 87f24d98d4..87f24d98d4 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ImmediateUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ImmediateUpload.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/Labels.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Labels.java
index 9954979d50..9954979d50 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/Labels.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Labels.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/MenuBars.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/MenuBars.java
index fc74166b29..fc74166b29 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/MenuBars.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/MenuBars.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/NativeSelects.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/NativeSelects.java
index e9c1c78049..e9c1c78049 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/NativeSelects.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/NativeSelects.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/NonDraggableWindow.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/NonDraggableWindow.java
index 9783db4413..9783db4413 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/NonDraggableWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/NonDraggableWindow.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/NotificationStyle.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/NotificationStyle.java
index e918bb64d0..e918bb64d0 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/NotificationStyle.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/NotificationStyle.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/Panels.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Panels.java
index d98daf7b05..d98daf7b05 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/Panels.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Panels.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/PopupViews.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java
index 58988c06d6..58988c06d6 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/PopupViews.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ResponsiveStyles.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ResponsiveStyles.java
index b1a4b2e30b..b1a4b2e30b 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ResponsiveStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ResponsiveStyles.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ResponsiveStylesDesign.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ResponsiveStylesDesign.java
index a975c76e1c..a975c76e1c 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ResponsiveStylesDesign.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ResponsiveStylesDesign.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/Sliders.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Sliders.java
index 9642cb5ccf..9642cb5ccf 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/Sliders.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Sliders.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/SplitPanels.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/SplitPanels.java
index 4983bc5813..4983bc5813 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/SplitPanels.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/SplitPanels.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/StringGenerator.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/StringGenerator.java
index bffd94137c..bffd94137c 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/StringGenerator.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/StringGenerator.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/TableSortIndicator.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/TableSortIndicator.java
index 8e873b0f1a..8e873b0f1a 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/TableSortIndicator.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/TableSortIndicator.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/TableWithEmptyCaption.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/TableWithEmptyCaption.java
index a3a81b3798..a3a81b3798 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/TableWithEmptyCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/TableWithEmptyCaption.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/Tables.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java
index 071e6b746a..071e6b746a 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/Tables.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/Tabsheets.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tabsheets.java
index 421da5ffe7..421da5ffe7 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/Tabsheets.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tabsheets.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/TestIcon.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/TestIcon.java
index 0d34bf2b63..0d34bf2b63 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/TestIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/TestIcon.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/TextFieldBevel.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFieldBevel.java
index 4e1debc5b6..4e1debc5b6 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/TextFieldBevel.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFieldBevel.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/TextFields.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFields.java
index be6e430b23..be6e430b23 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/TextFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFields.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/Trees.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Trees.java
index 02846d8921..02846d8921 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/Trees.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Trees.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidth.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidth.java
index 6ef585cc12..6ef585cc12 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidth.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ValoMenuLayout.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoMenuLayout.java
index 0e62f983a6..0e62f983a6 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ValoMenuLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoMenuLayout.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ValoMiscTests.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoMiscTests.java
index b59c500d28..b59c500d28 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ValoMiscTests.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoMiscTests.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUI.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
index 3bf6fd7ca3..3bf6fd7ca3 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/WindowTitleOverflow.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/WindowTitleOverflow.java
index 804095419e..804095419e 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/WindowTitleOverflow.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/WindowTitleOverflow.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1225.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1225.java
index 019e84daf3..019e84daf3 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1225.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1225.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1230.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1230.java
index 3a707934b6..3a707934b6 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1230.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1230.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket124.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket124.java
index 3c2724e991..3c2724e991 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket124.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket124.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1245.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1245.java
index 082363a1e5..082363a1e5 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1245.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1245.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket12727.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket12727.java
index 40711c6b7f..40711c6b7f 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket12727.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket12727.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1365.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1365.java
index 04c1645d98..04c1645d98 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1365.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1365.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1368.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1368.java
index b2816480fc..b2816480fc 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1368.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1368.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1397.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1397.java
index 40ffd78740..40ffd78740 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1397.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1397.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1435.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1435.java
index 9c8f400e1d..9c8f400e1d 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1435.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1435.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1444.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1444.java
index c786d8aab8..c786d8aab8 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1444.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1444.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1465ModalNotification.java
index 005beab7c4..005beab7c4 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1465ModalNotification.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1506.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506.java
index 4788d27aad..4788d27aad 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1506.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1506_Panel.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_Panel.java
index b59b7f8e5e..b59b7f8e5e 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1506_Panel.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_Panel.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1506_TestContainer.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
index d6b53db7c7..d6b53db7c7 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
index 288a9ef7d2..288a9ef7d2 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1519.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1519.java
index c603e996ca..c603e996ca 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1519.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1519.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1572.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1572.java
index 5233a9dd6f..5233a9dd6f 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1572.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1572.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1581.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1581.java
index 76673021bb..76673021bb 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1581.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1581.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1589.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1589.java
index 45ff15e456..45ff15e456 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1589.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1589.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1598.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1598.java
index a890c08ddb..a890c08ddb 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1598.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1598.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket161.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket161.java
index 988128f4af..988128f4af 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket161.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket161.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1632.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1632.java
index c227bcc3d8..c227bcc3d8 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1632.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1632.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1659.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1659.java
index 826a5539d8..826a5539d8 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1659.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1659.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1663.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1663.java
index 684e14ed2a..684e14ed2a 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1663.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1663.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1673.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1673.java
index 7d2e7b7271..7d2e7b7271 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1673.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1673.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1710.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1710.java
index 3dda830607..3dda830607 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1710.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1710.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1737.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1737.java
index 33515bad87..33515bad87 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1737.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1737.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1767.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1767.java
index 85e0758b73..85e0758b73 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1767.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1767.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1772.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1772.java
index 7dfc608dcc..7dfc608dcc 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1772.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1772.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1775.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1775.java
index c6f3e56af4..c6f3e56af4 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1775.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1775.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1804.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1804.java
index bf648b0d92..bf648b0d92 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1804.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1804.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1805.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1805.java
index e07310487f..e07310487f 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1805.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1805.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1806.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1806.java
index 60ea9528d3..60ea9528d3 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1806.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1806.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1811.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1811.java
index e8f23da3d1..e8f23da3d1 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1811.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1811.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1819.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1819.java
index b9a0060ce0..b9a0060ce0 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1819.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1819.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
index 60078daacd..60078daacd 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1857.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1857.java
index 5c6f45de87..5c6f45de87 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1857.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1857.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1868.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1868.java
index 8bbd8a8350..8bbd8a8350 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1868.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1868.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1869.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1869.java
index 8f5c1ce633..8f5c1ce633 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1869.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1869.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1878.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1878.java
index 6078320b61..6078320b61 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1878.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1878.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1900.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1900.java
index 35b7adc7b3..35b7adc7b3 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1900.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1900.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1904.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1904.java
index 677d88057c..677d88057c 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1904.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1904.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1916.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1916.java
index 16e930b754..16e930b754 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1916.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1916.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1919.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1919.java
index 086313823e..086313823e 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1919.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1919.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1921.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1921.java
index ab43b45576..ab43b45576 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1921.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1921.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1923.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1923.java
index 939fe05e58..939fe05e58 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1923.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1923.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1925.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1925.java
index c00404ba98..c00404ba98 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1925.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1925.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1939.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1939.java
index 9b360d1da7..9b360d1da7 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1939.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1939.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1940.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1940.java
index 79790f4414..79790f4414 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1940.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1940.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1953.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1953.java
index 98c55329da..98c55329da 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1953.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1953.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1966.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966.java
index 2023094458..2023094458 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1966.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966_2.java
index 2088e64d9a..2088e64d9a 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966_2.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966_3.java
index 421bea27f9..421bea27f9 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966_3.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1969.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1969.java
index 73746fb07d..73746fb07d 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1969.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1969.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1970.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1970.java
index eb98153be0..eb98153be0 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1970.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1970.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1972.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1972.java
index 3d0adb6588..3d0adb6588 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1972.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1972.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1973.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1973.java
index c4e7dbfcd7..c4e7dbfcd7 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1973.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1973.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1973_2.java
index 301d9931ad..301d9931ad 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1973_2.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1975.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1975.java
index 18caac808b..18caac808b 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1975.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1975.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1982.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1982.java
index d8ec0f63fb..d8ec0f63fb 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1982.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1982.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1983.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1983.java
index 789e8c3a45..789e8c3a45 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1983.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1983.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1986.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1986.java
index f58a54ec9a..f58a54ec9a 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1986.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1986.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1991.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1991.java
index 02175ea5d1..02175ea5d1 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1991.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1991.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1995.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1995.java
index 402baa1d34..402baa1d34 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1995.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1995.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket20.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket20.java
index 5f6305bcb0..5f6305bcb0 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket20.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket20.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2001.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2001.java
index cf442e2218..cf442e2218 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2001.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2001.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2002.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2002.java
index 5424c31e8a..5424c31e8a 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2002.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2002.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2007.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2007.java
index 7d157c663c..7d157c663c 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2007.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2007.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2009.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2009.java
index 64881c046a..64881c046a 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2009.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2009.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2011.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2011.java
index 3ca09a2d80..3ca09a2d80 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2011.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2011.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2014.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2014.java
index 7fdd56df67..7fdd56df67 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2014.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2014.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2021.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2021.java
index c6cbdbfa94..c6cbdbfa94 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2021.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2021.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2022.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2022.java
index 8631f8ea93..8631f8ea93 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2022.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2022.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2023.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2023.java
index 7c79f86fb2..7c79f86fb2 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2023.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2023.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2024.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2024.java
index 2861c9beca..2861c9beca 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2024.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2024.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2026.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2026.java
index 59efa74df8..59efa74df8 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2026.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2026.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2029.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2029.java
index 6c2418c387..6c2418c387 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2029.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2029.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2037.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2037.java
index e7af6a7c55..e7af6a7c55 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2037.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2037.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2038.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2038.java
index 12866da570..12866da570 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2038.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2038.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2040.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2040.java
index 5113c2e9c3..5113c2e9c3 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2040.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2040.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2042.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2042.java
index 56431258c0..56431258c0 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2042.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2042.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2043.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2043.java
index 2ebcae1d33..2ebcae1d33 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2043.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2043.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2048.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2048.java
index 8fa7c296d0..8fa7c296d0 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2048.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2048.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2051.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2051.java
index 172ced73cc..172ced73cc 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2051.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2051.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2053.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2053.java
index 14c8273c0d..14c8273c0d 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2053.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2053.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2060.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2060.java
index 8996639226..8996639226 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2060.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2060.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2061.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061.java
index 3838986bfa..3838986bfa 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2061.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061b.java
index 22c7471282..22c7471282 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061b.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061c.java
index e6255d71c7..e6255d71c7 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061c.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2062.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2062.java
index 0402b4cbd5..0402b4cbd5 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2062.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2062.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2083.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2083.java
index a94dafafcb..a94dafafcb 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2083.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2083.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2090.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2090.java
index ed79a60794..ed79a60794 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2090.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2090.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2095.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2095.java
index 270da9dc3f..270da9dc3f 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2095.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2095.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2098.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2098.java
index 983824daa9..983824daa9 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2098.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2098.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2099.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2099.java
index 0dc65cc25e..0dc65cc25e 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2099.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2099.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2101.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2101.java
index dd10943108..dd10943108 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2101.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2101.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2103.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2103.java
index a21864a67d..a21864a67d 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2103.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2103.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2104.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2104.java
index da9f7fecc8..da9f7fecc8 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2104.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2104.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2106.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2106.java
index 08b7a738a7..08b7a738a7 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2106.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2106.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2107.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2107.java
index 7de0e2da24..7de0e2da24 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2107.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2107.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2117.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2117.java
index 9cfa63b29e..9cfa63b29e 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2117.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2117.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2119.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2119.java
index c8002ff2cb..c8002ff2cb 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2119.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2119.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2125.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2125.java
index ba94bd394d..ba94bd394d 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2125.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2125.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2126.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2126.java
index bc182181e4..bc182181e4 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2126.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2126.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2151.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2151.java
index b48a327523..b48a327523 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2151.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2151.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2157.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2157.java
index 89676605ff..89676605ff 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2157.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2157.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2178.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2178.java
index bae6d72974..bae6d72974 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2178.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2178.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2179.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2179.java
index 06fb162f59..06fb162f59 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2179.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2179.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2180.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2180.java
index dafebf06f2..dafebf06f2 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2180.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2180.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2181.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2181.java
index beefb9b719..beefb9b719 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2181.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2181.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2186.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2186.java
index 8a467d385e..8a467d385e 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2186.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2186.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2204.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2204.java
index e32b66ffc0..e32b66ffc0 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2204.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2204.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2208.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2208.java
index 5589f242f1..5589f242f1 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2208.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2208.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2209.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2209.java
index 95666f9315..95666f9315 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2209.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2209.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2209OL.java
index b4832dc2d4..b4832dc2d4 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2209OL.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2209OL2.java
index 58abbf51f5..58abbf51f5 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2209OL2.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2215.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2215.java
index 42db5d0efb..42db5d0efb 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2215.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2215.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2221.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2221.java
index 80aaf55845..80aaf55845 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2221.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2221.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2222.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2222.java
index e86072d055..e86072d055 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2222.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2222.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java
index eb7a08eafa..eb7a08eafa 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2231.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2231.java
index 5bc49e5c29..5bc49e5c29 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2231.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2231.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2232.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2232.java
index 16fec93c44..16fec93c44 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2232.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2232.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2234.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2234.java
index c7ccf118fa..c7ccf118fa 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2234.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2234.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2235.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2235.java
index ced57a26ce..ced57a26ce 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2235.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2235.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2240.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2240.java
index 1bec778b75..1bec778b75 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2240.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2240.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2242.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2242.java
index d100f61e30..d100f61e30 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2242.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2242.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2244.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2244.java
index fcb1c55f33..fcb1c55f33 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2244.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2244.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2245.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2245.java
index 493ec8f9f3..493ec8f9f3 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2245.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2245.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2267.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2267.java
index 74f2d77d67..74f2d77d67 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2267.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2267.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2271.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2271.java
index f10f0df76e..f10f0df76e 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2271.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2271.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2282.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2282.java
index b5d4990e21..b5d4990e21 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2282.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2282.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2283.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2283.java
index ffe419293d..ffe419293d 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2283.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2283.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2287.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2287.java
index 717ced35cb..717ced35cb 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2287.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2287.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2289.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2289.java
index 259c9597b1..259c9597b1 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2289.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2289.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2292.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2292.java
index b50a1d073e..b50a1d073e 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2292.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2292.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2294.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2294.java
index ad8642ccf3..ad8642ccf3 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2294.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2294.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2296.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2296.java
index 13fd7cf557..13fd7cf557 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2296.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2296.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2297.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2297.java
index b4a3d02efa..b4a3d02efa 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2297.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2297.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2303.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2303.java
index be85f2d481..be85f2d481 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2303.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2303.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2304.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2304.java
index 83e36eaf13..83e36eaf13 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2304.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2304.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2310.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2310.java
index fb0d399d94..fb0d399d94 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2310.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2310.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2319.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2319.java
index fbe1796b32..fbe1796b32 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2319.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2319.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2323.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2323.java
index d9bbde52aa..d9bbde52aa 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2323.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2323.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2325.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2325.java
index d18bef8919..d18bef8919 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2325.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2325.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2329.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2329.java
index 29101986e6..29101986e6 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2329.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2329.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2337.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2337.java
index 80654ff678..80654ff678 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2337.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2337.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2339.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2339.java
index 8683711bdc..8683711bdc 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2339.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2339.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2341.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2341.java
index 594e603c43..594e603c43 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2341.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2341.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2344.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2344.java
index a24351c3aa..a24351c3aa 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2344.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2344.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2347.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2347.java
index 8cf70894b1..8cf70894b1 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2347.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2347.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2364.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2364.java
index 50a2a4329f..50a2a4329f 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2364.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2364.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2365.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2365.java
index b9e96c2f37..b9e96c2f37 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2365.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2365.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2398.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2398.java
index baa2d001b5..baa2d001b5 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2398.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2398.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2404.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2404.java
index 7cf3ecd26f..7cf3ecd26f 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2404.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2404.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2405.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2405.java
index dc288e2d4a..dc288e2d4a 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2405.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2405.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2406.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2406.java
index 265b988418..265b988418 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2406.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2406.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2407.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2407.java
index 0682485915..0682485915 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2407.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2407.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2411.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2411.java
index 6437a1f514..6437a1f514 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2411.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2411.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2415.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2415.java
index 7019ae6953..7019ae6953 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2415.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2415.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2420.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2420.java
index 2dcfb6a34b..2dcfb6a34b 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2420.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2420.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2425.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2425.java
index 097a91929d..097a91929d 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2425.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2425.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2426.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2426.java
index a80a8464b6..a80a8464b6 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2426.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2426.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2431.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2431.java
index 3228dc87ed..3228dc87ed 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2431.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2431.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2432.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2432.java
index d4c8c31d7f..d4c8c31d7f 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2432.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2432.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2434.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2434.java
index e489e0b02d..e489e0b02d 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2434.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2434.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2436.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2436.java
index ac968db926..ac968db926 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2436.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2436.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2526.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2526.java
index 60fa42c2ce..60fa42c2ce 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2526.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2526.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2742.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2742.java
index de3659540e..de3659540e 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2742.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2742.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2901.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2901.java
index 352b4f9a35..352b4f9a35 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2901.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2901.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2998.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2998.java
index 818a70318e..818a70318e 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2998.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2998.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket3146.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket3146.java
index b894e6827d..b894e6827d 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket3146.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket3146.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket34.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket34.java
index d095889d6d..d095889d6d 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket34.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket34.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket5053.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket5053.java
index 1aae57ebd7..1aae57ebd7 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket5053.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket5053.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket5157.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket5157.java
index 47cc7e1c4d..47cc7e1c4d 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket5157.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket5157.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket5952.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket5952.java
index f09fb955a1..f09fb955a1 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket5952.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket5952.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket6002.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket6002.java
index abb72e158c..abb72e158c 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket6002.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket6002.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket677.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket677.java
index 44ec3d10da..44ec3d10da 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket677.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket677.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket695.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket695.java
index d5ae9bb09f..d5ae9bb09f 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket695.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket695.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket736.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket736.java
index 6acd43c312..6acd43c312 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket736.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket736.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket8291.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket8291.java
index 8667475f14..8667475f14 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket8291.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket8291.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket846.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket846.java
index adc5663a8a..adc5663a8a 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket846.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket846.java
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket932.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket932.java
index 59c663e618..59c663e618 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket932.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket932.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/AdjacentElementsWithTooltips.java b/uitest/src/main/java/com/vaadin/tests/tooltip/AdjacentElementsWithTooltips.java
index 60167e43b4..60167e43b4 100644
--- a/uitest/src/com/vaadin/tests/tooltip/AdjacentElementsWithTooltips.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/AdjacentElementsWithTooltips.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/ButtonTooltips.java b/uitest/src/main/java/com/vaadin/tests/tooltip/ButtonTooltips.java
index c341aa689b..c341aa689b 100644
--- a/uitest/src/com/vaadin/tests/tooltip/ButtonTooltips.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/ButtonTooltips.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/DragAndDropWrapperTooltips.java b/uitest/src/main/java/com/vaadin/tests/tooltip/DragAndDropWrapperTooltips.java
index 606a773141..606a773141 100644
--- a/uitest/src/com/vaadin/tests/tooltip/DragAndDropWrapperTooltips.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/DragAndDropWrapperTooltips.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/LongTooltip.java b/uitest/src/main/java/com/vaadin/tests/tooltip/LongTooltip.java
index 0eee9d4976..0eee9d4976 100644
--- a/uitest/src/com/vaadin/tests/tooltip/LongTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/LongTooltip.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/MenuBarTooltip.java b/uitest/src/main/java/com/vaadin/tests/tooltip/MenuBarTooltip.java
index ff470336f5..ff470336f5 100644
--- a/uitest/src/com/vaadin/tests/tooltip/MenuBarTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/MenuBarTooltip.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/SliderTooltip.java b/uitest/src/main/java/com/vaadin/tests/tooltip/SliderTooltip.java
index 8cf7232fab..8cf7232fab 100644
--- a/uitest/src/com/vaadin/tests/tooltip/SliderTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/SliderTooltip.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/StationaryTooltip.java b/uitest/src/main/java/com/vaadin/tests/tooltip/StationaryTooltip.java
index 5c7b52d96f..5c7b52d96f 100644
--- a/uitest/src/com/vaadin/tests/tooltip/StationaryTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/StationaryTooltip.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/TooltipAndJavascript.java b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipAndJavascript.java
index 2ada6e819a..2ada6e819a 100644
--- a/uitest/src/com/vaadin/tests/tooltip/TooltipAndJavascript.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipAndJavascript.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/TooltipConfiguration.java b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java
index f67db4219f..f67db4219f 100644
--- a/uitest/src/com/vaadin/tests/tooltip/TooltipConfiguration.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/TooltipInWindow.java b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipInWindow.java
index 690b65432a..690b65432a 100644
--- a/uitest/src/com/vaadin/tests/tooltip/TooltipInWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipInWindow.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/TooltipWidthUpdating.java b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java
index c5e49d1af3..c5e49d1af3 100644
--- a/uitest/src/com/vaadin/tests/tooltip/TooltipWidthUpdating.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/ValidatorCaptionTooltip.java b/uitest/src/main/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltip.java
index 20dc514c10..20dc514c10 100644
--- a/uitest/src/com/vaadin/tests/tooltip/ValidatorCaptionTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltip.java
diff --git a/uitest/src/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdate.java b/uitest/src/main/java/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdate.java
index 9cd2929ca6..9cd2929ca6 100644
--- a/uitest/src/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdate.java
diff --git a/uitest/src/com/vaadin/tests/urifragments/SettingNullFragment.java b/uitest/src/main/java/com/vaadin/tests/urifragments/SettingNullFragment.java
index 4c3921e1a4..4c3921e1a4 100644
--- a/uitest/src/com/vaadin/tests/urifragments/SettingNullFragment.java
+++ b/uitest/src/main/java/com/vaadin/tests/urifragments/SettingNullFragment.java
diff --git a/uitest/src/com/vaadin/tests/util/Address.java b/uitest/src/main/java/com/vaadin/tests/util/Address.java
index 5ef0669e1b..5ef0669e1b 100644
--- a/uitest/src/com/vaadin/tests/util/Address.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/Address.java
diff --git a/uitest/src/com/vaadin/tests/util/AlwaysFailValidator.java b/uitest/src/main/java/com/vaadin/tests/util/AlwaysFailValidator.java
index ddb58999ee..ddb58999ee 100644
--- a/uitest/src/com/vaadin/tests/util/AlwaysFailValidator.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/AlwaysFailValidator.java
diff --git a/uitest/src/com/vaadin/tests/util/LargeContainer.java b/uitest/src/main/java/com/vaadin/tests/util/LargeContainer.java
index a6430ec0c2..a6430ec0c2 100644
--- a/uitest/src/com/vaadin/tests/util/LargeContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/LargeContainer.java
diff --git a/uitest/src/com/vaadin/tests/util/Log.java b/uitest/src/main/java/com/vaadin/tests/util/Log.java
index 54e266fa40..54e266fa40 100644
--- a/uitest/src/com/vaadin/tests/util/Log.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/Log.java
diff --git a/uitest/src/com/vaadin/tests/util/LogPrintWriter.java b/uitest/src/main/java/com/vaadin/tests/util/LogPrintWriter.java
index 1ec6f02ac9..1ec6f02ac9 100644
--- a/uitest/src/com/vaadin/tests/util/LogPrintWriter.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/LogPrintWriter.java
diff --git a/uitest/src/com/vaadin/tests/util/LoremIpsum.java b/uitest/src/main/java/com/vaadin/tests/util/LoremIpsum.java
index 38938fddee..38938fddee 100644
--- a/uitest/src/com/vaadin/tests/util/LoremIpsum.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/LoremIpsum.java
diff --git a/uitest/src/com/vaadin/tests/util/Millionaire.java b/uitest/src/main/java/com/vaadin/tests/util/Millionaire.java
index 44d4def416..44d4def416 100644
--- a/uitest/src/com/vaadin/tests/util/Millionaire.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/Millionaire.java
diff --git a/uitest/src/com/vaadin/tests/util/Person.java b/uitest/src/main/java/com/vaadin/tests/util/Person.java
index eca7b0bed8..eca7b0bed8 100644
--- a/uitest/src/com/vaadin/tests/util/Person.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/Person.java
diff --git a/uitest/src/com/vaadin/tests/util/PersonContainer.java b/uitest/src/main/java/com/vaadin/tests/util/PersonContainer.java
index 709086be29..709086be29 100644
--- a/uitest/src/com/vaadin/tests/util/PersonContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/PersonContainer.java
diff --git a/uitest/src/com/vaadin/tests/util/PortableRandom.java b/uitest/src/main/java/com/vaadin/tests/util/PortableRandom.java
index 44c3201cf4..44c3201cf4 100644
--- a/uitest/src/com/vaadin/tests/util/PortableRandom.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/PortableRandom.java
diff --git a/uitest/src/com/vaadin/tests/util/Product.java b/uitest/src/main/java/com/vaadin/tests/util/Product.java
index 46ec1935b0..46ec1935b0 100644
--- a/uitest/src/com/vaadin/tests/util/Product.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/Product.java
diff --git a/uitest/src/com/vaadin/tests/util/RangeCollection.java b/uitest/src/main/java/com/vaadin/tests/util/RangeCollection.java
index cfc4c61fd2..cfc4c61fd2 100644
--- a/uitest/src/com/vaadin/tests/util/RangeCollection.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/RangeCollection.java
diff --git a/uitest/src/com/vaadin/tests/util/ResizeTerrorizer.java b/uitest/src/main/java/com/vaadin/tests/util/ResizeTerrorizer.java
index 679baa0d26..679baa0d26 100644
--- a/uitest/src/com/vaadin/tests/util/ResizeTerrorizer.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/ResizeTerrorizer.java
diff --git a/uitest/src/com/vaadin/tests/util/Role.java b/uitest/src/main/java/com/vaadin/tests/util/Role.java
index 83f63db4ab..83f63db4ab 100644
--- a/uitest/src/com/vaadin/tests/util/Role.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/Role.java
diff --git a/uitest/src/com/vaadin/tests/util/SampleDirectory.java b/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java
index a4829334a5..a4829334a5 100644
--- a/uitest/src/com/vaadin/tests/util/SampleDirectory.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java
diff --git a/uitest/src/com/vaadin/tests/util/TestClickListener.java b/uitest/src/main/java/com/vaadin/tests/util/TestClickListener.java
index b9f6d66b3e..b9f6d66b3e 100644
--- a/uitest/src/com/vaadin/tests/util/TestClickListener.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/TestClickListener.java
diff --git a/uitest/src/com/vaadin/tests/util/TestDataGenerator.java b/uitest/src/main/java/com/vaadin/tests/util/TestDataGenerator.java
index 8becb709f0..8becb709f0 100644
--- a/uitest/src/com/vaadin/tests/util/TestDataGenerator.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/TestDataGenerator.java
diff --git a/uitest/src/com/vaadin/tests/util/TestUtils.java b/uitest/src/main/java/com/vaadin/tests/util/TestUtils.java
index 5c6315a23a..5c6315a23a 100644
--- a/uitest/src/com/vaadin/tests/util/TestUtils.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/TestUtils.java
diff --git a/uitest/src/com/vaadin/tests/util/User.java b/uitest/src/main/java/com/vaadin/tests/util/User.java
index 003f485017..003f485017 100644
--- a/uitest/src/com/vaadin/tests/util/User.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/User.java
diff --git a/uitest/src/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java b/uitest/src/main/java/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java
index 3849268bf7..3849268bf7 100644
--- a/uitest/src/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java
diff --git a/uitest/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java b/uitest/src/main/java/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
index 11f98eb888..11f98eb888 100644
--- a/uitest/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
+++ b/uitest/src/main/java/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
diff --git a/uitest/src/com/vaadin/tests/validation/RequiredErrorMessage.java b/uitest/src/main/java/com/vaadin/tests/validation/RequiredErrorMessage.java
index dca6130217..dca6130217 100644
--- a/uitest/src/com/vaadin/tests/validation/RequiredErrorMessage.java
+++ b/uitest/src/main/java/com/vaadin/tests/validation/RequiredErrorMessage.java
diff --git a/uitest/src/com/vaadin/tests/validation/RequiredIndicatorForReadOnly.java b/uitest/src/main/java/com/vaadin/tests/validation/RequiredIndicatorForReadOnly.java
index 6e806b60f4..6e806b60f4 100644
--- a/uitest/src/com/vaadin/tests/validation/RequiredIndicatorForReadOnly.java
+++ b/uitest/src/main/java/com/vaadin/tests/validation/RequiredIndicatorForReadOnly.java
diff --git a/uitest/src/com/vaadin/tests/validation/TestValidators.java b/uitest/src/main/java/com/vaadin/tests/validation/TestValidators.java
index 746a460da8..746a460da8 100644
--- a/uitest/src/com/vaadin/tests/validation/TestValidators.java
+++ b/uitest/src/main/java/com/vaadin/tests/validation/TestValidators.java
diff --git a/uitest/src/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java b/uitest/src/main/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java
index 4fa6eda5c3..4fa6eda5c3 100644
--- a/uitest/src/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.java b/uitest/src/main/java/com/vaadin/tests/widgetset/TestingWidgetSet.java
index 1c04c57526..1c04c57526 100644
--- a/uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/TestingWidgetSet.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/AbstractSuperclassForBean.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/AbstractSuperclassForBean.java
index 0ea19bd965..0ea19bd965 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/AbstractSuperclassForBean.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/AbstractSuperclassForBean.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java
index 86c918536f..86c918536f 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/BeanWithAbstractSuperclass.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/BeanWithAbstractSuperclass.java
index a3530f19e9..a3530f19e9 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/BeanWithAbstractSuperclass.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/BeanWithAbstractSuperclass.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/ClientRpcClassConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassConnector.java
index f4d226bb03..f4d226bb03 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/ClientRpcClassConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/ClientRpcClassWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassWidget.java
index c922259fae..c922259fae 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/ClientRpcClassWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassWidget.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/ComplexTestBean.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ComplexTestBean.java
index 0d6a1292e2..0d6a1292e2 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/ComplexTestBean.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ComplexTestBean.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/CustomUIConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/CustomUIConnector.java
index 7a93f5e360..7a93f5e360 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/CustomUIConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/CustomUIConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/CustomUIConnectorRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/CustomUIConnectorRpc.java
index d905daeea6..d905daeea6 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/CustomUIConnectorRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/CustomUIConnectorRpc.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/DelegateConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateConnector.java
index f25a33225c..f25a33225c 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/DelegateConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/DelegateState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateState.java
index c188e655ba..c188e655ba 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/DelegateState.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateState.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/DelegateWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateWidget.java
index 498180cb96..498180cb96 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/DelegateWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateWidget.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/DelegateWithoutStateClassConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateWithoutStateClassConnector.java
index 0808abf09a..0808abf09a 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/DelegateWithoutStateClassConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DelegateWithoutStateClassConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/DummyLabelConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DummyLabelConnector.java
index 43400ada60..43400ada60 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/DummyLabelConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/DummyLabelConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/EncoderResultDisplayConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/EncoderResultDisplayConnector.java
index f2e9710404..f2e9710404 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/EncoderResultDisplayConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/EncoderResultDisplayConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/GenericWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/GenericWidget.java
index 142fdd2e52..142fdd2e52 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/GenericWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/GenericWidget.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/GenericWidgetConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/GenericWidgetConnector.java
index 35d071a6df..35d071a6df 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/GenericWidgetConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/GenericWidgetConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/GenericWidgetState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/GenericWidgetState.java
index 4b1f6c4c7a..4b1f6c4c7a 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/GenericWidgetState.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/GenericWidgetState.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/IdTestLabelConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/IdTestLabelConnector.java
index 5683ef03c6..5683ef03c6 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/IdTestLabelConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/IdTestLabelConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/IntermediateReplaceConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/IntermediateReplaceConnector.java
index 7f2b5a9a93..7f2b5a9a93 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/IntermediateReplaceConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/IntermediateReplaceConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/LabelState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LabelState.java
index 7f8468b215..7f8468b215 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/LabelState.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LabelState.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/LayoutDetectorConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutDetectorConnector.java
index e999c83b75..e999c83b75 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/LayoutDetectorConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutDetectorConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/LayoutDuringStateUpdateConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutDuringStateUpdateConnector.java
index 799fe9ebee..799fe9ebee 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/LayoutDuringStateUpdateConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutDuringStateUpdateConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/LayoutMemoryUsageIE8ExtensionConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutMemoryUsageIE8ExtensionConnector.java
index 718706da97..718706da97 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/LayoutMemoryUsageIE8ExtensionConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutMemoryUsageIE8ExtensionConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/LegacySerializerConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LegacySerializerConnector.java
index 9c261b9505..9c261b9505 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/LegacySerializerConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LegacySerializerConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java
index 5fdec05970..5fdec05970 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/MockApplicationConnection.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockApplicationConnection.java
index 8237d75c6c..8237d75c6c 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/MockApplicationConnection.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockApplicationConnection.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/MockServerCommunicationHandler.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockServerCommunicationHandler.java
index 14b5671181..14b5671181 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/MockServerCommunicationHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockServerCommunicationHandler.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/MockServerMessageHandler.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockServerMessageHandler.java
index 39b89b55ca..39b89b55ca 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/MockServerMessageHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/MockServerMessageHandler.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/NoLayoutRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/NoLayoutRpc.java
index 7c2693db1d..7c2693db1d 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/NoLayoutRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/NoLayoutRpc.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/ProfilerCompilationCanary.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ProfilerCompilationCanary.java
index d5ab1da2f9..d5ab1da2f9 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/ProfilerCompilationCanary.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ProfilerCompilationCanary.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/ReplacedConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ReplacedConnector.java
index 7f116e4803..7f116e4803 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/ReplacedConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ReplacedConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/ReplacingConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ReplacingConnector.java
index 03e50aab16..03e50aab16 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/ReplacingConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ReplacingConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/ResizeTerrorizerControlConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ResizeTerrorizerControlConnector.java
index d3a0c78948..d3a0c78948 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/ResizeTerrorizerControlConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ResizeTerrorizerControlConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/RoundTripTesterConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/RoundTripTesterConnector.java
index b22b3fc4b8..b22b3fc4b8 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/RoundTripTesterConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/RoundTripTesterConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/RoundTripTesterRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/RoundTripTesterRpc.java
index e71f9f1230..e71f9f1230 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/RoundTripTesterRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/RoundTripTesterRpc.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/RunOverflowFixConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/RunOverflowFixConnector.java
index a6789ebaf6..a6789ebaf6 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/RunOverflowFixConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/RunOverflowFixConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/ScrollableGridLayoutConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ScrollableGridLayoutConnector.java
index d6431ac9f9..d6431ac9f9 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/ScrollableGridLayoutConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ScrollableGridLayoutConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java
index 124b1b5600..124b1b5600 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestRpc.java
index 95c04ebcfe..95c04ebcfe 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestRpc.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestState.java
index 5610ad7bfb..5610ad7bfb 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestState.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestState.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/SimpleTestBean.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SimpleTestBean.java
index 51d172ee21..51d172ee21 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/SimpleTestBean.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SimpleTestBean.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/TestWidgetConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestWidgetConnector.java
index 33a8956810..33a8956810 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/TestWidgetConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestWidgetConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/TestingPushConnection.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestingPushConnection.java
index c9a5a93332..c9a5a93332 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/TestingPushConnection.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestingPushConnection.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/TestingWidgetsetEntryPoint.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestingWidgetsetEntryPoint.java
index 7268d02993..7268d02993 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/TestingWidgetsetEntryPoint.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/TestingWidgetsetEntryPoint.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnector.java
index 948c1ece3d..948c1ece3d 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnectorState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnectorState.java
index 9dbededb50..9dbededb50 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnectorState.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/UseStateFromHierachyChangeConnectorState.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/VExtendedTextArea.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/VExtendedTextArea.java
index dce7fc04cf..dce7fc04cf 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/VExtendedTextArea.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/VExtendedTextArea.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/VIdTestLabel.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/VIdTestLabel.java
index 52610e2a47..52610e2a47 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/VIdTestLabel.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/VIdTestLabel.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/WidgetUtilTestComponentState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/WidgetUtilTestComponentState.java
index aa946d4ceb..aa946d4ceb 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/WidgetUtilTestComponentState.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/WidgetUtilTestComponentState.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/WidgetUtilTestConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/WidgetUtilTestConnector.java
index 2776f698fe..2776f698fe 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/WidgetUtilTestConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/WidgetUtilTestConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/WidgetUtilTestWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/WidgetUtilTestWidget.java
index 6ff0f2433e..6ff0f2433e 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/WidgetUtilTestWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/WidgetUtilTestWidget.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/csrf/CsrfButtonConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/csrf/CsrfButtonConnector.java
index 39dca8d799..39dca8d799 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/csrf/CsrfButtonConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/csrf/CsrfButtonConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/dd/SpacebarPannerConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/dd/SpacebarPannerConnector.java
index e13dd5030b..e13dd5030b 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/dd/SpacebarPannerConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/dd/SpacebarPannerConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/extension/BrowserContextMenuExtensionConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/extension/BrowserContextMenuExtensionConnector.java
index 9b05ff35d8..9b05ff35d8 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/extension/BrowserContextMenuExtensionConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/extension/BrowserContextMenuExtensionConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java
index c735797731..c735797731 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java
index e7ebcfeb51..e7ebcfeb51 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
index b6386afe44..b6386afe44 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridCellFocusOnResetSizeWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridCellFocusOnResetSizeWidget.java
index b2893463a7..b2893463a7 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridCellFocusOnResetSizeWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridCellFocusOnResetSizeWidget.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClickExtensionConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClickExtensionConnector.java
index 64020683f6..64020683f6 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClickExtensionConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClickExtensionConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java
index 2b8f454ed1..2b8f454ed1 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererRpc.java
index 90eee9e1c6..90eee9e1c6 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererRpc.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientDataSourcesWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientDataSourcesWidget.java
index e352b10064..e352b10064 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridClientDataSourcesWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientDataSourcesWidget.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridColumnAutoWidthClientWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridColumnAutoWidthClientWidget.java
index d73bc84227..d73bc84227 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridColumnAutoWidthClientWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridColumnAutoWidthClientWidget.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridDataChangeHandlerWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridDataChangeHandlerWidget.java
index a865d90b43..a865d90b43 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridDataChangeHandlerWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridDataChangeHandlerWidget.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridDefaultTextRendererWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridDefaultTextRendererWidget.java
index 4f1ea48be5..4f1ea48be5 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridDefaultTextRendererWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridDefaultTextRendererWidget.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridHeightByRowOnInitWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridHeightByRowOnInitWidget.java
index 8202c2ccc0..8202c2ccc0 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridHeightByRowOnInitWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridHeightByRowOnInitWidget.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridRendererChangeWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridRendererChangeWidget.java
index d35580b3c6..d35580b3c6 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridRendererChangeWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridRendererChangeWidget.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java
index e89057a148..e89057a148 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/IntArrayRendererConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/MySelectionModelConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/MySelectionModelConnector.java
index 81a9ab5bf1..81a9ab5bf1 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/MySelectionModelConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/MySelectionModelConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java
index 04dd08d274..04dd08d274 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PojoRendererConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/PureGWTTestApplication.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PureGWTTestApplication.java
index bda1a0c33e..bda1a0c33e 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/PureGWTTestApplication.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/PureGWTTestApplication.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java
index 63faf1d651..63faf1d651 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/RowAwareRendererConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcButtonConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcButtonConnector.java
index 43d96afd2b..43d96afd2b 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcButtonConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcButtonConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcServiceTest.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcServiceTest.java
index 16df928d77..16df928d77 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcServiceTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcServiceTest.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcServiceTestAsync.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcServiceTestAsync.java
index 93eda8ca34..93eda8ca34 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcServiceTestAsync.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/gwtrpc/GwtRpcServiceTestAsync.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java
index 95e286e4de..95e286e4de 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java
index f825115ec8..f825115ec8 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java
index eb869dedbc..eb869dedbc 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java
index dca007c2ee..dca007c2ee 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java
index c1b6aef830..c1b6aef830 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java
index 6b12e7d3c6..6b12e7d3c6 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentClientRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentClientRpc.java
index fc7eadced1..fc7eadced1 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentClientRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentClientRpc.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java
index 36c54c8ee6..36c54c8ee6 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentServerRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentServerRpc.java
index d8d8ec8827..d8d8ec8827 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentServerRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentServerRpc.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentState.java
index df7e8c08ee..df7e8c08ee 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentState.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentState.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java
index ba27fee6a3..ba27fee6a3 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java
index df3dd5b753..df3dd5b753 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/VWidgetContainer.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/VWidgetContainer.java
index 2a305a8469..2a305a8469 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/VWidgetContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/VWidgetContainer.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java
index 88911e245d..88911e245d 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/CapsLockWarningConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a3/CapsLockWarningConnector.java
index 3ac0db54fa..3ac0db54fa 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/CapsLockWarningConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a3/CapsLockWarningConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/ClientSideModule.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a3/ClientSideModule.java
index 48bd8a76fb..48bd8a76fb 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/ClientSideModule.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a3/ClientSideModule.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherConnector.java
index bee8eaed41..bee8eaed41 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherRpc.java
index 77fe7f78b5..77fe7f78b5 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherRpc.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherState.java
index 8ba705559d..8ba705559d 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherState.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherState.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningRpc.java
index cf73f2a00d..cf73f2a00d 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningRpc.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningWithRpcConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningWithRpcConnector.java
index 2f1d31a9d7..2f1d31a9d7 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningWithRpcConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/minitutorials/v7b1/CapsLockWarningWithRpcConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/superText/ExtraSuperTextAreaConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/superText/ExtraSuperTextAreaConnector.java
index b9037208f9..b9037208f9 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/superText/ExtraSuperTextAreaConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/superText/ExtraSuperTextAreaConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/superText/ExtraSuperTextAreaState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/superText/ExtraSuperTextAreaState.java
index 44456b27ba..44456b27ba 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/superText/ExtraSuperTextAreaState.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/superText/ExtraSuperTextAreaState.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/superText/SuperTextAreaConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/superText/SuperTextAreaConnector.java
index fda1fc6f0a..fda1fc6f0a 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/superText/SuperTextAreaConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/superText/SuperTextAreaConnector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/superText/SuperTextAreaState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/superText/SuperTextAreaState.java
index 005075429c..005075429c 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/superText/SuperTextAreaState.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/superText/SuperTextAreaState.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/rebind/TestWidgetRegistryGenerator.java b/uitest/src/main/java/com/vaadin/tests/widgetset/rebind/TestWidgetRegistryGenerator.java
index c7b29e271b..c7b29e271b 100644
--- a/uitest/src/com/vaadin/tests/widgetset/rebind/TestWidgetRegistryGenerator.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/rebind/TestWidgetRegistryGenerator.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/ClientRpcClass.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ClientRpcClass.java
index b5136b926e..b5136b926e 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/ClientRpcClass.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ClientRpcClass.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/ClientRpcClassComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ClientRpcClassComponent.java
index 5b03634755..5b03634755 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/ClientRpcClassComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ClientRpcClassComponent.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/DelegateToWidgetComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/DelegateToWidgetComponent.java
index 808b3bb9b7..808b3bb9b7 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/DelegateToWidgetComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/DelegateToWidgetComponent.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/DelegateWithoutStateClassComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/DelegateWithoutStateClassComponent.java
index 2af7efa8a4..2af7efa8a4 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/DelegateWithoutStateClassComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/DelegateWithoutStateClassComponent.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/DummyLabel.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/DummyLabel.java
index 881cbcc7c5..881cbcc7c5 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/DummyLabel.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/DummyLabel.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/ExtraSuperTextArea.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ExtraSuperTextArea.java
index b741c099b5..b741c099b5 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/ExtraSuperTextArea.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ExtraSuperTextArea.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/GenericWidgetComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/GenericWidgetComponent.java
index 32320f0158..32320f0158 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/GenericWidgetComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/GenericWidgetComponent.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/IdTestLabel.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/IdTestLabel.java
index c505151341..c505151341 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/IdTestLabel.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/IdTestLabel.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/LayoutDetector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/LayoutDetector.java
index 4b1aea67ea..4b1aea67ea 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/LayoutDetector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/LayoutDetector.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/LayoutDuringStateUpdateComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/LayoutDuringStateUpdateComponent.java
index f12b8726cc..f12b8726cc 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/LayoutDuringStateUpdateComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/LayoutDuringStateUpdateComponent.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java
index 37a33cc693..37a33cc693 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/OverriddenDecendants.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/OverriddenDecendants.java
index aadabb3fcc..aadabb3fcc 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/OverriddenDecendants.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/OverriddenDecendants.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/ReplaceComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ReplaceComponent.java
index 81c8af95a6..81c8af95a6 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/ReplaceComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ReplaceComponent.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/ReplaceComponentUI.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ReplaceComponentUI.java
index 1f83cb0d48..1f83cb0d48 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/ReplaceComponentUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ReplaceComponentUI.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/RoundTripTester.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/RoundTripTester.java
index ab123be70d..ab123be70d 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/RoundTripTester.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/RoundTripTester.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/ScrollableGridLayout.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ScrollableGridLayout.java
index 6958172aa8..6958172aa8 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/ScrollableGridLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ScrollableGridLayout.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/SerializerTestExtension.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/SerializerTestExtension.java
index 5fc5c19497..5fc5c19497 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/SerializerTestExtension.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/SerializerTestExtension.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/SuperTextArea.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/SuperTextArea.java
index 6e73915e44..6e73915e44 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/SuperTextArea.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/SuperTextArea.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/TestWidgetComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/TestWidgetComponent.java
index 1750e99727..1750e99727 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/TestWidgetComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/TestWidgetComponent.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/UseStateFromHierachyComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/UseStateFromHierachyComponent.java
index 3349024340..3349024340 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/UseStateFromHierachyComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/UseStateFromHierachyComponent.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/WidgetUtilUI.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/WidgetUtilUI.java
index 0489a8676f..0489a8676f 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/WidgetUtilUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/WidgetUtilUI.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/csrf/CsrfButton.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/CsrfButton.java
index 567127927d..567127927d 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/csrf/CsrfButton.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/CsrfButton.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUI.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUI.java
index f8f1754385..f8f1754385 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUI.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabled.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabled.java
index 6283285b40..6283285b40 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabled.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabled.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabled.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabled.java
index cd02c6da77..cd02c6da77 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabled.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabled.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java
index ce260f108d..ce260f108d 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpc.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpc.java
index c9f949c465..c9f949c465 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpc.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpc.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcButton.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcButton.java
index c04800713d..c04800713d 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcButton.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcButton.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcServletTest.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcServletTest.java
index df01b4dc81..df01b4dc81 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcServletTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcServletTest.java
diff --git a/WebContent/META-INF/MANIFEST.MF b/uitest/src/main/resources/META-INF/MANIFEST.MF
index 59499bce4a..59499bce4a 100644
--- a/WebContent/META-INF/MANIFEST.MF
+++ b/uitest/src/main/resources/META-INF/MANIFEST.MF
diff --git a/uitest/src/com/vaadin/launcher/keystore b/uitest/src/main/resources/com/vaadin/launcher/keystore
index 1314185e2a..1314185e2a 100644
--- a/uitest/src/com/vaadin/launcher/keystore
+++ b/uitest/src/main/resources/com/vaadin/launcher/keystore
diff --git a/uitest/src/com/vaadin/tests/appengine/img1.png b/uitest/src/main/resources/com/vaadin/tests/appengine/img1.png
index d249324e0c..d249324e0c 100644
--- a/uitest/src/com/vaadin/tests/appengine/img1.png
+++ b/uitest/src/main/resources/com/vaadin/tests/appengine/img1.png
diff --git a/WebContent/VAADIN/themes/tests-tickets/icons/fi.gif b/uitest/src/main/resources/com/vaadin/tests/components/combobox/fi.gif
index 8d3a191828..8d3a191828 100644
--- a/WebContent/VAADIN/themes/tests-tickets/icons/fi.gif
+++ b/uitest/src/main/resources/com/vaadin/tests/components/combobox/fi.gif
diff --git a/uitest/src/com/vaadin/tests/components/combobox/fi.png b/uitest/src/main/resources/com/vaadin/tests/components/combobox/fi.png
index 976a9663ce..976a9663ce 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/fi.png
+++ b/uitest/src/main/resources/com/vaadin/tests/components/combobox/fi.png
diff --git a/uitest/src/com/vaadin/tests/components/combobox/fi_small.png b/uitest/src/main/resources/com/vaadin/tests/components/combobox/fi_small.png
index 2908973fa4..2908973fa4 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/fi_small.png
+++ b/uitest/src/main/resources/com/vaadin/tests/components/combobox/fi_small.png
diff --git a/WebContent/VAADIN/themes/tests-tickets/icons/se.gif b/uitest/src/main/resources/com/vaadin/tests/components/combobox/se.gif
index 80f6285228..80f6285228 100644
--- a/WebContent/VAADIN/themes/tests-tickets/icons/se.gif
+++ b/uitest/src/main/resources/com/vaadin/tests/components/combobox/se.gif
diff --git a/uitest/src/com/vaadin/tests/components/customlayout/template.htm b/uitest/src/main/resources/com/vaadin/tests/components/customlayout/template.htm
index fa023050da..fa023050da 100644
--- a/uitest/src/com/vaadin/tests/components/customlayout/template.htm
+++ b/uitest/src/main/resources/com/vaadin/tests/components/customlayout/template.htm
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth b/uitest/src/main/resources/com/vaadin/tests/components/datefield/DisabledDateFieldWidth
index 48b11e1f7c..48b11e1f7c 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth
+++ b/uitest/src/main/resources/com/vaadin/tests/components/datefield/DisabledDateFieldWidth
diff --git a/uitest/src/com/vaadin/tests/components/embedded/test.pdf b/uitest/src/main/resources/com/vaadin/tests/components/embedded/test.pdf
index e44a87e9ad..e44a87e9ad 100644
--- a/uitest/src/com/vaadin/tests/components/embedded/test.pdf
+++ b/uitest/src/main/resources/com/vaadin/tests/components/embedded/test.pdf
diff --git a/uitest/src/com/vaadin/tests/components/embedded/åäö-日本語.pdf b/uitest/src/main/resources/com/vaadin/tests/components/embedded/åäö-日本語.pdf
index e44a87e9ad..e44a87e9ad 100644
--- a/uitest/src/com/vaadin/tests/components/embedded/åäö-日本語.pdf
+++ b/uitest/src/main/resources/com/vaadin/tests/components/embedded/åäö-日本語.pdf
diff --git a/uitest/src/com/vaadin/tests/components/flash/simple.swf b/uitest/src/main/resources/com/vaadin/tests/components/flash/simple.swf
index ea404f307f..ea404f307f 100644
--- a/uitest/src/com/vaadin/tests/components/flash/simple.swf
+++ b/uitest/src/main/resources/com/vaadin/tests/components/flash/simple.swf
diff --git a/uitest/src/com/vaadin/tests/components/grid/JavaScriptStringRenderer.js b/uitest/src/main/resources/com/vaadin/tests/components/grid/JavaScriptStringRenderer.js
index e3061bf12f..e3061bf12f 100644
--- a/uitest/src/com/vaadin/tests/components/grid/JavaScriptStringRenderer.js
+++ b/uitest/src/main/resources/com/vaadin/tests/components/grid/JavaScriptStringRenderer.js
diff --git a/uitest/src/com/vaadin/tests/components/grid/declarative/GridBasicFeatures.html b/uitest/src/main/resources/com/vaadin/tests/components/grid/declarative/GridBasicFeatures.html
index e99025abfb..e99025abfb 100644
--- a/uitest/src/com/vaadin/tests/components/grid/declarative/GridBasicFeatures.html
+++ b/uitest/src/main/resources/com/vaadin/tests/components/grid/declarative/GridBasicFeatures.html
diff --git a/uitest/src/com/vaadin/tests/components/grid/declarative/GridItemEditor.html b/uitest/src/main/resources/com/vaadin/tests/components/grid/declarative/GridItemEditor.html
index 0f9bb49da2..0f9bb49da2 100644
--- a/uitest/src/com/vaadin/tests/components/grid/declarative/GridItemEditor.html
+++ b/uitest/src/main/resources/com/vaadin/tests/components/grid/declarative/GridItemEditor.html
diff --git a/uitest/src/com/vaadin/tests/components/grid/declarative/GridMultiSelect.html b/uitest/src/main/resources/com/vaadin/tests/components/grid/declarative/GridMultiSelect.html
index a27ff84e72..a27ff84e72 100644
--- a/uitest/src/com/vaadin/tests/components/grid/declarative/GridMultiSelect.html
+++ b/uitest/src/main/resources/com/vaadin/tests/components/grid/declarative/GridMultiSelect.html
diff --git a/uitest/src/com/vaadin/tests/components/grid/myBeanJsRenderer.js b/uitest/src/main/resources/com/vaadin/tests/components/grid/myBeanJsRenderer.js
index 5e7bde5ec7..5e7bde5ec7 100644
--- a/uitest/src/com/vaadin/tests/components/grid/myBeanJsRenderer.js
+++ b/uitest/src/main/resources/com/vaadin/tests/components/grid/myBeanJsRenderer.js
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentConnector.js b/uitest/src/main/resources/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentConnector.js
index 183bf6af9c..183bf6af9c 100644
--- a/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentConnector.js
+++ b/uitest/src/main/resources/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentConnector.js
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/MyJS.js b/uitest/src/main/resources/com/vaadin/tests/components/javascriptcomponent/MyJS.js
index 9876448311..9876448311 100644
--- a/uitest/src/com/vaadin/tests/components/javascriptcomponent/MyJS.js
+++ b/uitest/src/main/resources/com/vaadin/tests/components/javascriptcomponent/MyJS.js
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/ResizeJsConnector.js b/uitest/src/main/resources/com/vaadin/tests/components/javascriptcomponent/ResizeJsConnector.js
index 4e871aa1b7..4e871aa1b7 100644
--- a/uitest/src/com/vaadin/tests/components/javascriptcomponent/ResizeJsConnector.js
+++ b/uitest/src/main/resources/com/vaadin/tests/components/javascriptcomponent/ResizeJsConnector.js
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/js_label.js b/uitest/src/main/resources/com/vaadin/tests/components/javascriptcomponent/js_label.js
index c4900daa81..c4900daa81 100755
--- a/uitest/src/com/vaadin/tests/components/javascriptcomponent/js_label.js
+++ b/uitest/src/main/resources/com/vaadin/tests/components/javascriptcomponent/js_label.js
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/wholly_different.js b/uitest/src/main/resources/com/vaadin/tests/components/javascriptcomponent/wholly_different.js
index f22ef13a76..f22ef13a76 100755
--- a/uitest/src/com/vaadin/tests/components/javascriptcomponent/wholly_different.js
+++ b/uitest/src/main/resources/com/vaadin/tests/components/javascriptcomponent/wholly_different.js
diff --git a/uitest/src/com/vaadin/tests/components/loginform/LoginFormInIframe.html_disabled b/uitest/src/main/resources/com/vaadin/tests/components/loginform/LoginFormInIframe.html_disabled
index 075bb3c57f..075bb3c57f 100644
--- a/uitest/src/com/vaadin/tests/components/loginform/LoginFormInIframe.html_disabled
+++ b/uitest/src/main/resources/com/vaadin/tests/components/loginform/LoginFormInIframe.html_disabled
diff --git a/uitest/src/com/vaadin/tests/components/media/bip.mp3 b/uitest/src/main/resources/com/vaadin/tests/components/media/bip.mp3
index 2c7e790cf7..2c7e790cf7 100644
--- a/uitest/src/com/vaadin/tests/components/media/bip.mp3
+++ b/uitest/src/main/resources/com/vaadin/tests/components/media/bip.mp3
diff --git a/uitest/src/com/vaadin/tests/components/media/bip.ogg b/uitest/src/main/resources/com/vaadin/tests/components/media/bip.ogg
index 4e5014d92f..4e5014d92f 100644
--- a/uitest/src/com/vaadin/tests/components/media/bip.ogg
+++ b/uitest/src/main/resources/com/vaadin/tests/components/media/bip.ogg
diff --git a/uitest/src/com/vaadin/tests/components/media/toyphone_dialling.mp3 b/uitest/src/main/resources/com/vaadin/tests/components/media/toyphone_dialling.mp3
index 1788026856..1788026856 100644
--- a/uitest/src/com/vaadin/tests/components/media/toyphone_dialling.mp3
+++ b/uitest/src/main/resources/com/vaadin/tests/components/media/toyphone_dialling.mp3
diff --git a/uitest/src/com/vaadin/tests/components/media/toyphone_dialling.ogg b/uitest/src/main/resources/com/vaadin/tests/components/media/toyphone_dialling.ogg
index a042da5795..a042da5795 100644
--- a/uitest/src/com/vaadin/tests/components/media/toyphone_dialling.ogg
+++ b/uitest/src/main/resources/com/vaadin/tests/components/media/toyphone_dialling.ogg
diff --git a/uitest/src/com/vaadin/tests/components/combobox/fi.gif b/uitest/src/main/resources/com/vaadin/tests/components/table/fi.gif
index 8d3a191828..8d3a191828 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/fi.gif
+++ b/uitest/src/main/resources/com/vaadin/tests/components/table/fi.gif
diff --git a/uitest/src/com/vaadin/tests/components/combobox/se.gif b/uitest/src/main/resources/com/vaadin/tests/components/table/se.gif
index 80f6285228..80f6285228 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/se.gif
+++ b/uitest/src/main/resources/com/vaadin/tests/components/table/se.gif
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldPrimaryStyleName b/uitest/src/main/resources/com/vaadin/tests/components/textfield/TextFieldPrimaryStyleName
index 9c99d86a91..9c99d86a91 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldPrimaryStyleName
+++ b/uitest/src/main/resources/com/vaadin/tests/components/textfield/TextFieldPrimaryStyleName
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeContainerChange b/uitest/src/main/resources/com/vaadin/tests/components/tree/TreeContainerChange
index 8ea2dcc107..8ea2dcc107 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeContainerChange
+++ b/uitest/src/main/resources/com/vaadin/tests/components/tree/TreeContainerChange
diff --git a/uitest/src/com/vaadin/tests/components/ui/uiDependency.js b/uitest/src/main/resources/com/vaadin/tests/components/ui/uiDependency.js
index 4a5775c57f..4a5775c57f 100644
--- a/uitest/src/com/vaadin/tests/components/ui/uiDependency.js
+++ b/uitest/src/main/resources/com/vaadin/tests/components/ui/uiDependency.js
diff --git a/uitest/src/com/vaadin/tests/components/upload/file-binary-cb4a65687deb859957ad4b0fd9d67eac.png b/uitest/src/main/resources/com/vaadin/tests/components/upload/file-binary-cb4a65687deb859957ad4b0fd9d67eac.png
index 39daa93ea5..39daa93ea5 100644
--- a/uitest/src/com/vaadin/tests/components/upload/file-binary-cb4a65687deb859957ad4b0fd9d67eac.png
+++ b/uitest/src/main/resources/com/vaadin/tests/components/upload/file-binary-cb4a65687deb859957ad4b0fd9d67eac.png
diff --git a/uitest/src/com/vaadin/tests/components/upload/file-text-6ebed606225d0b6254d45f51aa2dfe9f b/uitest/src/main/resources/com/vaadin/tests/components/upload/file-text-6ebed606225d0b6254d45f51aa2dfe9f
index 584a249bba..584a249bba 100644
--- a/uitest/src/com/vaadin/tests/components/upload/file-text-6ebed606225d0b6254d45f51aa2dfe9f
+++ b/uitest/src/main/resources/com/vaadin/tests/components/upload/file-text-6ebed606225d0b6254d45f51aa2dfe9f
diff --git a/uitest/src/com/vaadin/tests/dd/ScrolledDropTarget.html.disabled b/uitest/src/main/resources/com/vaadin/tests/dd/ScrolledDropTarget.html.disabled
index e69de29bb2..e69de29bb2 100644
--- a/uitest/src/com/vaadin/tests/dd/ScrolledDropTarget.html.disabled
+++ b/uitest/src/main/resources/com/vaadin/tests/dd/ScrolledDropTarget.html.disabled
diff --git a/uitest/src/com/vaadin/tests/dd/html5drop.htm b/uitest/src/main/resources/com/vaadin/tests/dd/html5drop.htm
index ed05fcedea..ed05fcedea 100644
--- a/uitest/src/com/vaadin/tests/dd/html5drop.htm
+++ b/uitest/src/main/resources/com/vaadin/tests/dd/html5drop.htm
diff --git a/uitest/src/com/vaadin/tests/declarative/DeclarativeEditorInitial.html b/uitest/src/main/resources/com/vaadin/tests/declarative/DeclarativeEditorInitial.html
index b38cb59730..b38cb59730 100644
--- a/uitest/src/com/vaadin/tests/declarative/DeclarativeEditorInitial.html
+++ b/uitest/src/main/resources/com/vaadin/tests/declarative/DeclarativeEditorInitial.html
diff --git a/uitest/src/com/vaadin/tests/declarative/PotusCrud.html b/uitest/src/main/resources/com/vaadin/tests/declarative/PotusCrud.html
index dde60652e5..dde60652e5 100644
--- a/uitest/src/com/vaadin/tests/declarative/PotusCrud.html
+++ b/uitest/src/main/resources/com/vaadin/tests/declarative/PotusCrud.html
diff --git a/uitest/src/com/vaadin/tests/declarative/PotusForm.html b/uitest/src/main/resources/com/vaadin/tests/declarative/PotusForm.html
index 4eb6c84e4a..4eb6c84e4a 100644
--- a/uitest/src/com/vaadin/tests/declarative/PotusForm.html
+++ b/uitest/src/main/resources/com/vaadin/tests/declarative/PotusForm.html
diff --git a/uitest/src/com/vaadin/tests/integration/LabelFromDesign.html b/uitest/src/main/resources/com/vaadin/tests/integration/LabelFromDesign.html
index 9aaf3d3d77..9aaf3d3d77 100644
--- a/uitest/src/com/vaadin/tests/integration/LabelFromDesign.html
+++ b/uitest/src/main/resources/com/vaadin/tests/integration/LabelFromDesign.html
diff --git a/uitest/src/com/vaadin/tests/integration/PortletConnectorResource.css b/uitest/src/main/resources/com/vaadin/tests/integration/PortletConnectorResource.css
index 7338e4708a..7338e4708a 100644
--- a/uitest/src/com/vaadin/tests/integration/PortletConnectorResource.css
+++ b/uitest/src/main/resources/com/vaadin/tests/integration/PortletConnectorResource.css
diff --git a/uitest/src/com/vaadin/tests/integration/ProxyTest.html.disabled b/uitest/src/main/resources/com/vaadin/tests/integration/ProxyTest.html.disabled
index b4e11210fc..b4e11210fc 100644
--- a/uitest/src/com/vaadin/tests/integration/ProxyTest.html.disabled
+++ b/uitest/src/main/resources/com/vaadin/tests/integration/ProxyTest.html.disabled
diff --git a/uitest/src/com/vaadin/tests/components/table/fi.gif b/uitest/src/main/resources/com/vaadin/tests/integration/fi.gif
index 8d3a191828..8d3a191828 100644
--- a/uitest/src/com/vaadin/tests/components/table/fi.gif
+++ b/uitest/src/main/resources/com/vaadin/tests/integration/fi.gif
diff --git a/uitest/src/com/vaadin/tests/components/table/se.gif b/uitest/src/main/resources/com/vaadin/tests/integration/se.gif
index 80f6285228..80f6285228 100644
--- a/uitest/src/com/vaadin/tests/components/table/se.gif
+++ b/uitest/src/main/resources/com/vaadin/tests/integration/se.gif
diff --git a/uitest/src/com/vaadin/tests/integration/spe=cial%res&ource.gif b/uitest/src/main/resources/com/vaadin/tests/integration/spe=cial%res&ource.gif
index 41bdd9a6be..41bdd9a6be 100644
--- a/uitest/src/com/vaadin/tests/integration/spe=cial%res&ource.gif
+++ b/uitest/src/main/resources/com/vaadin/tests/integration/spe=cial%res&ource.gif
diff --git a/uitest/src/com/vaadin/tests/m.gif b/uitest/src/main/resources/com/vaadin/tests/m.gif
index 2201bdfc1c..2201bdfc1c 100644
--- a/uitest/src/com/vaadin/tests/m.gif
+++ b/uitest/src/main/resources/com/vaadin/tests/m.gif
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/analytics_connector.js b/uitest/src/main/resources/com/vaadin/tests/minitutorials/v7a3/analytics_connector.js
index 4eadff5803..4eadff5803 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/analytics_connector.js
+++ b/uitest/src/main/resources/com/vaadin/tests/minitutorials/v7a3/analytics_connector.js
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/complex_types_connector.js b/uitest/src/main/resources/com/vaadin/tests/minitutorials/v7a3/complex_types_connector.js
index 496afce432..496afce432 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/complex_types_connector.js
+++ b/uitest/src/main/resources/com/vaadin/tests/minitutorials/v7a3/complex_types_connector.js
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/flot_connector.js b/uitest/src/main/resources/com/vaadin/tests/minitutorials/v7a3/flot_connector.js
index 5e572a4c72..5e572a4c72 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/flot_connector.js
+++ b/uitest/src/main/resources/com/vaadin/tests/minitutorials/v7a3/flot_connector.js
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/jquery.flot.js b/uitest/src/main/resources/com/vaadin/tests/minitutorials/v7a3/jquery.flot.js
index f38561ba10..f38561ba10 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/jquery.flot.js
+++ b/uitest/src/main/resources/com/vaadin/tests/minitutorials/v7a3/jquery.flot.js
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7a3/redbutton.css b/uitest/src/main/resources/com/vaadin/tests/minitutorials/v7a3/redbutton.css
index a70cf5e575..a70cf5e575 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7a3/redbutton.css
+++ b/uitest/src/main/resources/com/vaadin/tests/minitutorials/v7a3/redbutton.css
diff --git a/uitest/src/com/vaadin/tests/push/require.min.js b/uitest/src/main/resources/com/vaadin/tests/push/require.min.js
index d9eb623f4f..d9eb623f4f 100644
--- a/uitest/src/com/vaadin/tests/push/require.min.js
+++ b/uitest/src/main/resources/com/vaadin/tests/push/require.min.js
diff --git a/uitest/src/com/vaadin/tests/resources/cachingtest.js b/uitest/src/main/resources/com/vaadin/tests/resources/cachingtest.js
index f948e680ad..f948e680ad 100644
--- a/uitest/src/com/vaadin/tests/resources/cachingtest.js
+++ b/uitest/src/main/resources/com/vaadin/tests/resources/cachingtest.js
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ResponsiveStylesDesign.html b/uitest/src/main/resources/com/vaadin/tests/themes/valo/ResponsiveStylesDesign.html
index 60da28d843..60da28d843 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ResponsiveStylesDesign.html
+++ b/uitest/src/main/resources/com/vaadin/tests/themes/valo/ResponsiveStylesDesign.html
diff --git a/uitest/src/com/vaadin/tests/tooltip/tooltipandjavascript.js b/uitest/src/main/resources/com/vaadin/tests/tooltip/tooltipandjavascript.js
index f6aea090ba..f6aea090ba 100644
--- a/uitest/src/com/vaadin/tests/tooltip/tooltipandjavascript.js
+++ b/uitest/src/main/resources/com/vaadin/tests/tooltip/tooltipandjavascript.js
diff --git a/uitest/src/com/vaadin/tests/vaadin_spin.swf b/uitest/src/main/resources/com/vaadin/tests/vaadin_spin.swf
index 9e58ce29c6..9e58ce29c6 100644
--- a/uitest/src/com/vaadin/tests/vaadin_spin.swf
+++ b/uitest/src/main/resources/com/vaadin/tests/vaadin_spin.swf
diff --git a/uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml b/uitest/src/main/resources/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
index 3878e85193..3878e85193 100644
--- a/uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
+++ b/uitest/src/main/resources/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
diff --git a/WebContent/html-tests/BottomComponentScrollsUp.html b/uitest/src/main/resources/html-tests/BottomComponentScrollsUp.html
index a264b38ba8..a264b38ba8 100644
--- a/WebContent/html-tests/BottomComponentScrollsUp.html
+++ b/uitest/src/main/resources/html-tests/BottomComponentScrollsUp.html
diff --git a/WebContent/html-tests/ComponentFocus.html b/uitest/src/main/resources/html-tests/ComponentFocus.html
index 0a822520e0..0a822520e0 100644
--- a/WebContent/html-tests/ComponentFocus.html
+++ b/uitest/src/main/resources/html-tests/ComponentFocus.html
diff --git a/WebContent/VAADIN/themes/tests-valo-blueprint/_variables.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-blueprint/_variables.scss
index 696da0b69e..696da0b69e 100644
--- a/WebContent/VAADIN/themes/tests-valo-blueprint/_variables.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-blueprint/_variables.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-blueprint/styles.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-blueprint/styles.scss
index 9433f4eba6..9433f4eba6 100644
--- a/WebContent/VAADIN/themes/tests-valo-blueprint/styles.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-blueprint/styles.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-contrast/_variables.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-contrast/_variables.scss
index 962bc8f299..962bc8f299 100644
--- a/WebContent/VAADIN/themes/tests-valo-contrast/_variables.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-contrast/_variables.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-contrast/styles.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-contrast/styles.scss
index 231a9de50d..231a9de50d 100644
--- a/WebContent/VAADIN/themes/tests-valo-contrast/styles.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-contrast/styles.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-dark/_variables.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-dark/_variables.scss
index ea40e1eb89..ea40e1eb89 100644
--- a/WebContent/VAADIN/themes/tests-valo-dark/_variables.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-dark/_variables.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-dark/styles.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-dark/styles.scss
index 13f98ae418..13f98ae418 100644
--- a/WebContent/VAADIN/themes/tests-valo-dark/styles.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-dark/styles.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-disabled-animations/_variables.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-disabled-animations/_variables.scss
index d2411c675c..d2411c675c 100644
--- a/WebContent/VAADIN/themes/tests-valo-disabled-animations/_variables.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-disabled-animations/_variables.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-disabled-animations/styles.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-disabled-animations/styles.scss
index b941c1b3d1..b941c1b3d1 100644
--- a/WebContent/VAADIN/themes/tests-valo-disabled-animations/styles.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-disabled-animations/styles.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-facebook/_variables.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-facebook/_variables.scss
index 5b83aae4ca..5b83aae4ca 100644
--- a/WebContent/VAADIN/themes/tests-valo-facebook/_variables.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-facebook/_variables.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-facebook/styles.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-facebook/styles.scss
index 7b784627b2..7b784627b2 100644
--- a/WebContent/VAADIN/themes/tests-valo-facebook/styles.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-facebook/styles.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-flat/_variables.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-flat/_variables.scss
index 298e26ac36..298e26ac36 100644
--- a/WebContent/VAADIN/themes/tests-valo-flat/_variables.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-flat/_variables.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-flat/styles.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-flat/styles.scss
index 7b981de04a..7b981de04a 100644
--- a/WebContent/VAADIN/themes/tests-valo-flat/styles.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-flat/styles.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-flatdark/_variables.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-flatdark/_variables.scss
index fa785af8b8..fa785af8b8 100644
--- a/WebContent/VAADIN/themes/tests-valo-flatdark/_variables.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-flatdark/_variables.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-flatdark/styles.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-flatdark/styles.scss
index d0871fcba2..d0871fcba2 100644
--- a/WebContent/VAADIN/themes/tests-valo-flatdark/styles.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-flatdark/styles.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-light/_variables.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-light/_variables.scss
index e851f075e4..e851f075e4 100644
--- a/WebContent/VAADIN/themes/tests-valo-light/_variables.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-light/_variables.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-light/styles.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-light/styles.scss
index 12ee8a780e..12ee8a780e 100644
--- a/WebContent/VAADIN/themes/tests-valo-light/styles.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-light/styles.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-metro/_variables.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-metro/_variables.scss
index f11cdb8b64..f11cdb8b64 100644
--- a/WebContent/VAADIN/themes/tests-valo-metro/_variables.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-metro/_variables.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-metro/styles.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-metro/styles.scss
index 51b3427a12..51b3427a12 100644
--- a/WebContent/VAADIN/themes/tests-valo-metro/styles.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-metro/styles.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-no-font-awesome/_variables.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-no-font-awesome/_variables.scss
index 59b31a4a68..59b31a4a68 100644
--- a/WebContent/VAADIN/themes/tests-valo-no-font-awesome/_variables.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-no-font-awesome/_variables.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-no-font-awesome/styles.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-no-font-awesome/styles.scss
index d66db2b0d6..d66db2b0d6 100644
--- a/WebContent/VAADIN/themes/tests-valo-no-font-awesome/styles.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-no-font-awesome/styles.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-textfield-bevel/_variables.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-textfield-bevel/_variables.scss
index b1b215a40c..b1b215a40c 100644
--- a/WebContent/VAADIN/themes/tests-valo-textfield-bevel/_variables.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-textfield-bevel/_variables.scss
diff --git a/WebContent/VAADIN/themes/tests-valo-textfield-bevel/styles.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-textfield-bevel/styles.scss
index 96a3ca63b6..96a3ca63b6 100644
--- a/WebContent/VAADIN/themes/tests-valo-textfield-bevel/styles.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-textfield-bevel/styles.scss
diff --git a/WebContent/VAADIN/themes/tests-valo/_valotest.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo/_valotest.scss
index 568dfec0b8..568dfec0b8 100644
--- a/WebContent/VAADIN/themes/tests-valo/_valotest.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo/_valotest.scss
diff --git a/WebContent/VAADIN/themes/tests-valo/_variables.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo/_variables.scss
index c227156e2e..c227156e2e 100644
--- a/WebContent/VAADIN/themes/tests-valo/_variables.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo/_variables.scss
diff --git a/WebContent/VAADIN/themes/tests-valo/img/profile-pic-300px.jpg b/uitest/src/main/themes/VAADIN/themes/tests-valo/img/profile-pic-300px.jpg
index 8a98078243..8a98078243 100644
--- a/WebContent/VAADIN/themes/tests-valo/img/profile-pic-300px.jpg
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo/img/profile-pic-300px.jpg
diff --git a/WebContent/VAADIN/themes/tests-valo/styles.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo/styles.scss
index 1ba0b29b04..1ba0b29b04 100644
--- a/WebContent/VAADIN/themes/tests-valo/styles.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo/styles.scss
diff --git a/WebContent/VAADIN/themes/tests-valo/uiDependency.css b/uitest/src/main/themes/VAADIN/themes/tests-valo/uiDependency.css
index e69de29bb2..e69de29bb2 100644
--- a/WebContent/VAADIN/themes/tests-valo/uiDependency.css
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo/uiDependency.css
diff --git a/WebContent/VAADIN/readme.txt b/uitest/src/main/webapp/VAADIN/readme.txt
index 0ab7742490..0ab7742490 100644
--- a/WebContent/VAADIN/readme.txt
+++ b/uitest/src/main/webapp/VAADIN/readme.txt
diff --git a/WebContent/VAADIN/themes/reindeer-tests/styles.css b/uitest/src/main/webapp/VAADIN/themes/reindeer-tests/styles.css
index 9dd88707d1..9dd88707d1 100644
--- a/WebContent/VAADIN/themes/reindeer-tests/styles.css
+++ b/uitest/src/main/webapp/VAADIN/themes/reindeer-tests/styles.css
diff --git a/WebContent/VAADIN/themes/tests-book/favicon.ico b/uitest/src/main/webapp/VAADIN/themes/tests-book/favicon.ico
index 1f81f0de76..1f81f0de76 100644
--- a/WebContent/VAADIN/themes/tests-book/favicon.ico
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-book/favicon.ico
diff --git a/WebContent/VAADIN/themes/tests-book/img/richtextarea-toolbar-fi.png b/uitest/src/main/webapp/VAADIN/themes/tests-book/img/richtextarea-toolbar-fi.png
index 4bb791c856..4bb791c856 100644
--- a/WebContent/VAADIN/themes/tests-book/img/richtextarea-toolbar-fi.png
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-book/img/richtextarea-toolbar-fi.png
diff --git a/WebContent/VAADIN/themes/tests-book/img/smiley.jpg b/uitest/src/main/webapp/VAADIN/themes/tests-book/img/smiley.jpg
index dc1a399c76..dc1a399c76 100644
--- a/WebContent/VAADIN/themes/tests-book/img/smiley.jpg
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-book/img/smiley.jpg
diff --git a/WebContent/VAADIN/themes/tests-book/layouts/layoutname.html b/uitest/src/main/webapp/VAADIN/themes/tests-book/layouts/layoutname.html
index 6b75910783..6b75910783 100644
--- a/WebContent/VAADIN/themes/tests-book/layouts/layoutname.html
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-book/layouts/layoutname.html
diff --git a/WebContent/VAADIN/themes/tests-book/layouts/printpage.html b/uitest/src/main/webapp/VAADIN/themes/tests-book/layouts/printpage.html
index 2e65addcd8..2e65addcd8 100644
--- a/WebContent/VAADIN/themes/tests-book/layouts/printpage.html
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-book/layouts/printpage.html
diff --git a/WebContent/VAADIN/themes/tests-book/styles.css b/uitest/src/main/webapp/VAADIN/themes/tests-book/styles.css
index 02669ae3db..02669ae3db 100644
--- a/WebContent/VAADIN/themes/tests-book/styles.css
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-book/styles.css
diff --git a/WebContent/VAADIN/themes/tests-calendar/styles.css b/uitest/src/main/webapp/VAADIN/themes/tests-calendar/styles.css
index e3fa107751..e3fa107751 100644
--- a/WebContent/VAADIN/themes/tests-calendar/styles.css
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-calendar/styles.css
diff --git a/WebContent/VAADIN/themes/tests-components/images/logo.png b/uitest/src/main/webapp/VAADIN/themes/tests-components/images/logo.png
index 9990cd2f28..9990cd2f28 100644
--- a/WebContent/VAADIN/themes/tests-components/images/logo.png
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-components/images/logo.png
diff --git a/WebContent/VAADIN/themes/tests-components/styles.css b/uitest/src/main/webapp/VAADIN/themes/tests-components/styles.css
index c0b545609c..c0b545609c 100644
--- a/WebContent/VAADIN/themes/tests-components/styles.css
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-components/styles.css
diff --git a/WebContent/VAADIN/themes/tests-responsive/styles.css b/uitest/src/main/webapp/VAADIN/themes/tests-responsive/styles.css
index a06c920fe9..a06c920fe9 100644
--- a/WebContent/VAADIN/themes/tests-responsive/styles.css
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-responsive/styles.css
diff --git a/WebContent/VAADIN/themes/tests-table/styles.css b/uitest/src/main/webapp/VAADIN/themes/tests-table/styles.css
index 78193c0982..78193c0982 100644
--- a/WebContent/VAADIN/themes/tests-table/styles.css
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-table/styles.css
diff --git a/WebContent/VAADIN/themes/tests-tickets/favicon.ico b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/favicon.ico
index 1f81f0de76..1f81f0de76 100644
--- a/WebContent/VAADIN/themes/tests-tickets/favicon.ico
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/favicon.ico
diff --git a/WebContent/VAADIN/themes/tests-tickets/folder with space/resource with special $chars@.txt b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/folder with space/resource with special $chars@.txt
index dff31dd51f..dff31dd51f 100644
--- a/WebContent/VAADIN/themes/tests-tickets/folder with space/resource with special $chars@.txt
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/folder with space/resource with special $chars@.txt
diff --git a/WebContent/VAADIN/themes/tests-tickets/icons/EmbeddedInSubWindow-image.png b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/icons/EmbeddedInSubWindow-image.png
index fb965345bb..fb965345bb 100644
--- a/WebContent/VAADIN/themes/tests-tickets/icons/EmbeddedInSubWindow-image.png
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/icons/EmbeddedInSubWindow-image.png
diff --git a/WebContent/VAADIN/themes/tests-tickets/icons/au.gif b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/icons/au.gif
index 5269c6a0e0..5269c6a0e0 100644
--- a/WebContent/VAADIN/themes/tests-tickets/icons/au.gif
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/icons/au.gif
diff --git a/uitest/src/com/vaadin/tests/integration/fi.gif b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/icons/fi.gif
index 8d3a191828..8d3a191828 100644
--- a/uitest/src/com/vaadin/tests/integration/fi.gif
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/icons/fi.gif
diff --git a/WebContent/VAADIN/themes/tests-tickets/icons/hu.gif b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/icons/hu.gif
index 6142d86817..6142d86817 100644
--- a/WebContent/VAADIN/themes/tests-tickets/icons/hu.gif
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/icons/hu.gif
diff --git a/uitest/src/com/vaadin/tests/integration/se.gif b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/icons/se.gif
index 80f6285228..80f6285228 100644
--- a/uitest/src/com/vaadin/tests/integration/se.gif
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/icons/se.gif
diff --git a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket14340.html b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/layouts/Ticket14340.html
index ccb0717f9c..ccb0717f9c 100644
--- a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket14340.html
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/layouts/Ticket14340.html
diff --git a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1519_News.html b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/layouts/Ticket1519_News.html
index 0ac582cfbe..0ac582cfbe 100644
--- a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1519_News.html
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/layouts/Ticket1519_News.html
diff --git a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1519_Support.html b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/layouts/Ticket1519_Support.html
index aca7e2a66d..aca7e2a66d 100644
--- a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1519_Support.html
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/layouts/Ticket1519_Support.html
diff --git a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1775.html b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/layouts/Ticket1775.html
index 80eec49b7f..80eec49b7f 100644
--- a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1775.html
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/layouts/Ticket1775.html
diff --git a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1975.html b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/layouts/Ticket1975.html
index 9c7a6942c9..9c7a6942c9 100644
--- a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket1975.html
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/layouts/Ticket1975.html
diff --git a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket2022.html b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/layouts/Ticket2022.html
index 6bde912879..6bde912879 100644
--- a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket2022.html
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/layouts/Ticket2022.html
diff --git a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket2296.html b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/layouts/Ticket2296.html
index 9baf164d06..9baf164d06 100644
--- a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket2296.html
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/layouts/Ticket2296.html
diff --git a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket2347.html b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/layouts/Ticket2347.html
index a9bf8d0f9f..a9bf8d0f9f 100644
--- a/WebContent/VAADIN/themes/tests-tickets/layouts/Ticket2347.html
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/layouts/Ticket2347.html
diff --git a/WebContent/VAADIN/themes/tests-tickets/ordinary.txt b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/ordinary.txt
index dff31dd51f..dff31dd51f 100644
--- a/WebContent/VAADIN/themes/tests-tickets/ordinary.txt
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/ordinary.txt
diff --git a/WebContent/VAADIN/themes/tests-tickets/percentagein%20name.txt b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/percentagein%20name.txt
index dff31dd51f..dff31dd51f 100644
--- a/WebContent/VAADIN/themes/tests-tickets/percentagein%20name.txt
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/percentagein%20name.txt
diff --git a/WebContent/VAADIN/themes/tests-tickets/styles.css b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/styles.css
index b96fcbb23d..b96fcbb23d 100644
--- a/WebContent/VAADIN/themes/tests-tickets/styles.css
+++ b/uitest/src/main/webapp/VAADIN/themes/tests-tickets/styles.css
diff --git a/WebContent/WEB-INF/jboss-web.xml b/uitest/src/main/webapp/WEB-INF/jboss-web.xml
index 12548b7c5c..12548b7c5c 100644
--- a/WebContent/WEB-INF/jboss-web.xml
+++ b/uitest/src/main/webapp/WEB-INF/jboss-web.xml
diff --git a/WebContent/WEB-INF/liferay-display.xml b/uitest/src/main/webapp/WEB-INF/liferay-display.xml
index 014ed31b47..014ed31b47 100644
--- a/WebContent/WEB-INF/liferay-display.xml
+++ b/uitest/src/main/webapp/WEB-INF/liferay-display.xml
diff --git a/WebContent/WEB-INF/liferay-portlet.xml b/uitest/src/main/webapp/WEB-INF/liferay-portlet.xml
index ea060ce44a..ea060ce44a 100644
--- a/WebContent/WEB-INF/liferay-portlet.xml
+++ b/uitest/src/main/webapp/WEB-INF/liferay-portlet.xml
diff --git a/WebContent/WEB-INF/portlet.xml b/uitest/src/main/webapp/WEB-INF/portlet.xml
index 3a603c43ae..3a603c43ae 100644
--- a/WebContent/WEB-INF/portlet.xml
+++ b/uitest/src/main/webapp/WEB-INF/portlet.xml
diff --git a/WebContent/WEB-INF/web.xml b/uitest/src/main/webapp/WEB-INF/web.xml
index 0def4001b8..0def4001b8 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/uitest/src/main/webapp/WEB-INF/web.xml
diff --git a/WebContent/WEB-INF/web.xml.2.4 b/uitest/src/main/webapp/WEB-INF/web.xml.2.4
index 96144b8036..96144b8036 100644
--- a/WebContent/WEB-INF/web.xml.2.4
+++ b/uitest/src/main/webapp/WEB-INF/web.xml.2.4
diff --git a/WebContent/statictestfiles/EmbedSizeHostPage.html b/uitest/src/main/webapp/statictestfiles/EmbedSizeHostPage.html
index 3ef6c5d0cd..3ef6c5d0cd 100644
--- a/WebContent/statictestfiles/EmbedSizeHostPage.html
+++ b/uitest/src/main/webapp/statictestfiles/EmbedSizeHostPage.html
diff --git a/WebContent/statictestfiles/LoginFormIframe.html b/uitest/src/main/webapp/statictestfiles/LoginFormIframe.html
index 0d6ee9d86b..0d6ee9d86b 100644
--- a/WebContent/statictestfiles/LoginFormIframe.html
+++ b/uitest/src/main/webapp/statictestfiles/LoginFormIframe.html
diff --git a/WebContent/statictestfiles/PopupViewInEmbeddedApplication.html b/uitest/src/main/webapp/statictestfiles/PopupViewInEmbeddedApplication.html
index cb317dd755..cb317dd755 100644
--- a/WebContent/statictestfiles/PopupViewInEmbeddedApplication.html
+++ b/uitest/src/main/webapp/statictestfiles/PopupViewInEmbeddedApplication.html
diff --git a/WebContent/statictestfiles/TableInIframeRowClickScrollJumpTest.html b/uitest/src/main/webapp/statictestfiles/TableInIframeRowClickScrollJumpTest.html
index dfddbdb7e5..dfddbdb7e5 100644
--- a/WebContent/statictestfiles/TableInIframeRowClickScrollJumpTest.html
+++ b/uitest/src/main/webapp/statictestfiles/TableInIframeRowClickScrollJumpTest.html
diff --git a/WebContent/statictestfiles/applet.html b/uitest/src/main/webapp/statictestfiles/applet.html
index 05e1785e10..05e1785e10 100644
--- a/WebContent/statictestfiles/applet.html
+++ b/uitest/src/main/webapp/statictestfiles/applet.html
diff --git a/WebContent/statictestfiles/browserfeatures/fullHeightScrollbar.html b/uitest/src/main/webapp/statictestfiles/browserfeatures/fullHeightScrollbar.html
index 2e280da64e..2e280da64e 100644
--- a/WebContent/statictestfiles/browserfeatures/fullHeightScrollbar.html
+++ b/uitest/src/main/webapp/statictestfiles/browserfeatures/fullHeightScrollbar.html
diff --git a/WebContent/statictestfiles/com/vaadin/tests/components/embedded/TestApplet.class b/uitest/src/main/webapp/statictestfiles/com/vaadin/tests/components/embedded/TestApplet.class
index 7650e1f870..7650e1f870 100644
--- a/WebContent/statictestfiles/com/vaadin/tests/components/embedded/TestApplet.class
+++ b/uitest/src/main/webapp/statictestfiles/com/vaadin/tests/components/embedded/TestApplet.class
diff --git a/WebContent/statictestfiles/dummy.zip b/uitest/src/main/webapp/statictestfiles/dummy.zip
index e6e34282fe..e6e34282fe 100644
--- a/WebContent/statictestfiles/dummy.zip
+++ b/uitest/src/main/webapp/statictestfiles/dummy.zip
diff --git a/WebContent/statictestfiles/embed-two-uis.html b/uitest/src/main/webapp/statictestfiles/embed-two-uis.html
index 62dff7d8d0..62dff7d8d0 100755
--- a/WebContent/statictestfiles/embed-two-uis.html
+++ b/uitest/src/main/webapp/statictestfiles/embed-two-uis.html
diff --git a/WebContent/statictestfiles/jsextension.js b/uitest/src/main/webapp/statictestfiles/jsextension.js
index 1a46300e45..1a46300e45 100644
--- a/WebContent/statictestfiles/jsextension.js
+++ b/uitest/src/main/webapp/statictestfiles/jsextension.js
diff --git a/WebContent/statictestfiles/layout-resize-test.html b/uitest/src/main/webapp/statictestfiles/layout-resize-test.html
index b798402bb7..b798402bb7 100644
--- a/WebContent/statictestfiles/layout-resize-test.html
+++ b/uitest/src/main/webapp/statictestfiles/layout-resize-test.html
diff --git a/WebContent/statictestfiles/long-html.htm b/uitest/src/main/webapp/statictestfiles/long-html.htm
index daeb744778..daeb744778 100644
--- a/WebContent/statictestfiles/long-html.htm
+++ b/uitest/src/main/webapp/statictestfiles/long-html.htm
diff --git a/WebContent/statictestfiles/static.html b/uitest/src/main/webapp/statictestfiles/static.html
index 17adf5aaba..17adf5aaba 100644
--- a/WebContent/statictestfiles/static.html
+++ b/uitest/src/main/webapp/statictestfiles/static.html
diff --git a/WebContent/statictestfiles/ticket2095.html b/uitest/src/main/webapp/statictestfiles/ticket2095.html
index 228c9e0dab..228c9e0dab 100644
--- a/WebContent/statictestfiles/ticket2095.html
+++ b/uitest/src/main/webapp/statictestfiles/ticket2095.html
diff --git a/WebContent/statictestfiles/ticket2095_popup.html b/uitest/src/main/webapp/statictestfiles/ticket2095_popup.html
index b95dff7ba7..b95dff7ba7 100644
--- a/WebContent/statictestfiles/ticket2095_popup.html
+++ b/uitest/src/main/webapp/statictestfiles/ticket2095_popup.html
diff --git a/WebContent/statictestfiles/vaadinsessions.jsp b/uitest/src/main/webapp/statictestfiles/vaadinsessions.jsp
index b22787a203..b22787a203 100644
--- a/WebContent/statictestfiles/vaadinsessions.jsp
+++ b/uitest/src/main/webapp/statictestfiles/vaadinsessions.jsp
diff --git a/uitest/src/com/vaadin/tests/CurrentTimeMillisTest.java b/uitest/src/test/java/com/vaadin/tests/CurrentTimeMillisTest.java
index 656b269c06..656b269c06 100644
--- a/uitest/src/com/vaadin/tests/CurrentTimeMillisTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/CurrentTimeMillisTest.java
diff --git a/uitest/src/com/vaadin/tests/VerifyAssertionsEnabledTest.java b/uitest/src/test/java/com/vaadin/tests/VerifyAssertionsEnabledTest.java
index 1180cc8332..1180cc8332 100644
--- a/uitest/src/com/vaadin/tests/VerifyAssertionsEnabledTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/VerifyAssertionsEnabledTest.java
diff --git a/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java
index 2a66b6f1f4..2a66b6f1f4 100644
--- a/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java
diff --git a/uitest/src/com/vaadin/tests/VerifyJreVersionTest.java b/uitest/src/test/java/com/vaadin/tests/VerifyJreVersionTest.java
index b78a4ad314..b78a4ad314 100644
--- a/uitest/src/com/vaadin/tests/VerifyJreVersionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/VerifyJreVersionTest.java
diff --git a/uitest/src/com/vaadin/tests/accessibility/WindowWaiAriaRolesTest.java b/uitest/src/test/java/com/vaadin/tests/accessibility/WindowWaiAriaRolesTest.java
index e1d0452708..e1d0452708 100644
--- a/uitest/src/com/vaadin/tests/accessibility/WindowWaiAriaRolesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/accessibility/WindowWaiAriaRolesTest.java
diff --git a/uitest/src/com/vaadin/tests/actions/ActionsOnInvisibleComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/actions/ActionsOnInvisibleComponentsTest.java
index 1231b0036e..1231b0036e 100644
--- a/uitest/src/com/vaadin/tests/actions/ActionsOnInvisibleComponentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/actions/ActionsOnInvisibleComponentsTest.java
diff --git a/uitest/src/com/vaadin/tests/application/CriticalNotificationsTest.java b/uitest/src/test/java/com/vaadin/tests/application/CriticalNotificationsTest.java
index 6229edc1ee..6229edc1ee 100644
--- a/uitest/src/com/vaadin/tests/application/CriticalNotificationsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/CriticalNotificationsTest.java
diff --git a/uitest/src/com/vaadin/tests/application/DeploymentConfigurationTest.java b/uitest/src/test/java/com/vaadin/tests/application/DeploymentConfigurationTest.java
index 9a51980c9e..9a51980c9e 100644
--- a/uitest/src/com/vaadin/tests/application/DeploymentConfigurationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/DeploymentConfigurationTest.java
diff --git a/uitest/src/com/vaadin/tests/application/DetachOldUIOnReloadTest.java b/uitest/src/test/java/com/vaadin/tests/application/DetachOldUIOnReloadTest.java
index 1e156c3e46..1e156c3e46 100644
--- a/uitest/src/com/vaadin/tests/application/DetachOldUIOnReloadTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/DetachOldUIOnReloadTest.java
diff --git a/uitest/src/com/vaadin/tests/application/ErrorInUnloadEventTest.java b/uitest/src/test/java/com/vaadin/tests/application/ErrorInUnloadEventTest.java
index fa316c6749..fa316c6749 100644
--- a/uitest/src/com/vaadin/tests/application/ErrorInUnloadEventTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/ErrorInUnloadEventTest.java
diff --git a/uitest/src/com/vaadin/tests/application/MissingHierarchyDetectionTest.java b/uitest/src/test/java/com/vaadin/tests/application/MissingHierarchyDetectionTest.java
index 3d43b8f885..3d43b8f885 100644
--- a/uitest/src/com/vaadin/tests/application/MissingHierarchyDetectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/MissingHierarchyDetectionTest.java
diff --git a/uitest/src/com/vaadin/tests/application/PreserveWithExpiredHeartbeatTest.java b/uitest/src/test/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeatTest.java
index 04dbdca31e..04dbdca31e 100644
--- a/uitest/src/com/vaadin/tests/application/PreserveWithExpiredHeartbeatTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/PreserveWithExpiredHeartbeatTest.java
diff --git a/uitest/src/com/vaadin/tests/application/ReconnectDialogThemeTest.java b/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogThemeTest.java
index eb55a7fb5e..eb55a7fb5e 100644
--- a/uitest/src/com/vaadin/tests/application/ReconnectDialogThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogThemeTest.java
diff --git a/uitest/src/com/vaadin/tests/application/ReconnectDialogUITest.java b/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogUITest.java
index b07124c216..b07124c216 100644
--- a/uitest/src/com/vaadin/tests/application/ReconnectDialogUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogUITest.java
diff --git a/uitest/src/com/vaadin/tests/application/RefreshFragmentChangeTest.java b/uitest/src/test/java/com/vaadin/tests/application/RefreshFragmentChangeTest.java
index ea415bcaae..ea415bcaae 100644
--- a/uitest/src/com/vaadin/tests/application/RefreshFragmentChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/RefreshFragmentChangeTest.java
diff --git a/uitest/src/com/vaadin/tests/application/RefreshStatePreserveTest.java b/uitest/src/test/java/com/vaadin/tests/application/RefreshStatePreserveTest.java
index a54d8b4ce9..a54d8b4ce9 100644
--- a/uitest/src/com/vaadin/tests/application/RefreshStatePreserveTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/RefreshStatePreserveTest.java
diff --git a/uitest/src/com/vaadin/tests/application/RefreshStatePreserveTitleTest.java b/uitest/src/test/java/com/vaadin/tests/application/RefreshStatePreserveTitleTest.java
index e2740f9537..e2740f9537 100644
--- a/uitest/src/com/vaadin/tests/application/RefreshStatePreserveTitleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/RefreshStatePreserveTitleTest.java
diff --git a/uitest/src/com/vaadin/tests/application/ResynchronizeAfterAsyncRemovalTest.java b/uitest/src/test/java/com/vaadin/tests/application/ResynchronizeAfterAsyncRemovalTest.java
index 7f2dabe9f1..7f2dabe9f1 100644
--- a/uitest/src/com/vaadin/tests/application/ResynchronizeAfterAsyncRemovalTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/ResynchronizeAfterAsyncRemovalTest.java
diff --git a/uitest/src/com/vaadin/tests/application/ResynchronizeUITest.java b/uitest/src/test/java/com/vaadin/tests/application/ResynchronizeUITest.java
index 726616d7b8..726616d7b8 100644
--- a/uitest/src/com/vaadin/tests/application/ResynchronizeUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/ResynchronizeUITest.java
diff --git a/uitest/src/com/vaadin/tests/application/TerminalErrorNotificationTest.java b/uitest/src/test/java/com/vaadin/tests/application/TerminalErrorNotificationTest.java
index ac7d55b396..ac7d55b396 100644
--- a/uitest/src/com/vaadin/tests/application/TerminalErrorNotificationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/TerminalErrorNotificationTest.java
diff --git a/uitest/src/com/vaadin/tests/application/ThreadLocalInstancesTest.java b/uitest/src/test/java/com/vaadin/tests/application/ThreadLocalInstancesTest.java
index 9498413f9b..9498413f9b 100644
--- a/uitest/src/com/vaadin/tests/application/ThreadLocalInstancesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/ThreadLocalInstancesTest.java
diff --git a/uitest/src/com/vaadin/tests/application/TimingInfoReportedTest.java b/uitest/src/test/java/com/vaadin/tests/application/TimingInfoReportedTest.java
index 0b9ab77d81..0b9ab77d81 100644
--- a/uitest/src/com/vaadin/tests/application/TimingInfoReportedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/TimingInfoReportedTest.java
diff --git a/uitest/src/com/vaadin/tests/application/VaadinSessionAttributeTest.java b/uitest/src/test/java/com/vaadin/tests/application/VaadinSessionAttributeTest.java
index 47e86d9039..47e86d9039 100644
--- a/uitest/src/com/vaadin/tests/application/VaadinSessionAttributeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/VaadinSessionAttributeTest.java
diff --git a/uitest/src/com/vaadin/tests/application/WebBrowserSizeTest.java b/uitest/src/test/java/com/vaadin/tests/application/WebBrowserSizeTest.java
index b06d8e4388..b06d8e4388 100644
--- a/uitest/src/com/vaadin/tests/application/WebBrowserSizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/WebBrowserSizeTest.java
diff --git a/uitest/src/com/vaadin/tests/application/WebBrowserTimeZoneTest.java b/uitest/src/test/java/com/vaadin/tests/application/WebBrowserTimeZoneTest.java
index 10b6dfb7a9..10b6dfb7a9 100644
--- a/uitest/src/com/vaadin/tests/application/WebBrowserTimeZoneTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/WebBrowserTimeZoneTest.java
diff --git a/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionIdTest.java b/uitest/src/test/java/com/vaadin/tests/applicationcontext/ChangeSessionIdTest.java
index ec1479ce15..ec1479ce15 100644
--- a/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionIdTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationcontext/ChangeSessionIdTest.java
diff --git a/uitest/src/com/vaadin/tests/applicationcontext/CleanupBrokenUITest.java b/uitest/src/test/java/com/vaadin/tests/applicationcontext/CleanupBrokenUITest.java
index 404e05eefc..404e05eefc 100644
--- a/uitest/src/com/vaadin/tests/applicationcontext/CleanupBrokenUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationcontext/CleanupBrokenUITest.java
diff --git a/uitest/src/com/vaadin/tests/applicationcontext/CloseSessionTest.java b/uitest/src/test/java/com/vaadin/tests/applicationcontext/CloseSessionTest.java
index 1d6bf3f9bf..1d6bf3f9bf 100644
--- a/uitest/src/com/vaadin/tests/applicationcontext/CloseSessionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationcontext/CloseSessionTest.java
diff --git a/uitest/src/com/vaadin/tests/applicationcontext/RpcForClosedUITest.java b/uitest/src/test/java/com/vaadin/tests/applicationcontext/RpcForClosedUITest.java
index bb9d2a9294..bb9d2a9294 100644
--- a/uitest/src/com/vaadin/tests/applicationcontext/RpcForClosedUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationcontext/RpcForClosedUITest.java
diff --git a/uitest/src/com/vaadin/tests/applicationservlet/CustomDeploymentConfTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/CustomDeploymentConfTest.java
index e74eea6c55..e74eea6c55 100644
--- a/uitest/src/com/vaadin/tests/applicationservlet/CustomDeploymentConfTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/CustomDeploymentConfTest.java
diff --git a/uitest/src/com/vaadin/tests/applicationservlet/DisableSendUrlAsParametersTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/DisableSendUrlAsParametersTest.java
index f10f281646..f10f281646 100644
--- a/uitest/src/com/vaadin/tests/applicationservlet/DisableSendUrlAsParametersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/DisableSendUrlAsParametersTest.java
diff --git a/uitest/src/com/vaadin/tests/applicationservlet/MultipleServletConfigurationTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/MultipleServletConfigurationTest.java
index 39e8d04ffc..39e8d04ffc 100644
--- a/uitest/src/com/vaadin/tests/applicationservlet/MultipleServletConfigurationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/MultipleServletConfigurationTest.java
diff --git a/uitest/src/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java
index 3faf5bde72..3faf5bde72 100644
--- a/uitest/src/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/NoApplicationClassTest.java
diff --git a/uitest/src/com/vaadin/tests/applicationservlet/SystemMessagesTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/SystemMessagesTest.java
index bbbb49b39c..bbbb49b39c 100644
--- a/uitest/src/com/vaadin/tests/applicationservlet/SystemMessagesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/SystemMessagesTest.java
diff --git a/uitest/src/com/vaadin/tests/applicationservlet/UIProviderInitParameterTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/UIProviderInitParameterTest.java
index 7f9a375440..7f9a375440 100644
--- a/uitest/src/com/vaadin/tests/applicationservlet/UIProviderInitParameterTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/UIProviderInitParameterTest.java
diff --git a/uitest/src/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptionsTest.java b/uitest/src/test/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptionsTest.java
index 69e4aaa06c..69e4aaa06c 100644
--- a/uitest/src/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptionsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptionsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/FileDownloaderUITest.java b/uitest/src/test/java/com/vaadin/tests/components/FileDownloaderUITest.java
index 73d1ba6f52..73d1ba6f52 100644
--- a/uitest/src/com/vaadin/tests/components/FileDownloaderUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/FileDownloaderUITest.java
diff --git a/uitest/src/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayoutTest.java
index bc12919ccd..bc12919ccd 100644
--- a/uitest/src/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayoutTest.java
diff --git a/uitest/src/com/vaadin/tests/components/OutOfSyncTest.java b/uitest/src/test/java/com/vaadin/tests/components/OutOfSyncTest.java
index c6bab3c9b9..c6bab3c9b9 100644
--- a/uitest/src/com/vaadin/tests/components/OutOfSyncTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/OutOfSyncTest.java
diff --git a/uitest/src/com/vaadin/tests/components/SaneErrorsTest.java b/uitest/src/test/java/com/vaadin/tests/components/SaneErrorsTest.java
index a43db58fd0..a43db58fd0 100644
--- a/uitest/src/com/vaadin/tests/components/SaneErrorsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/SaneErrorsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/TooltipPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/TooltipPositionTest.java
index 8e1df42f50..8e1df42f50 100644
--- a/uitest/src/com/vaadin/tests/components/TooltipPositionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/TooltipPositionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/UnknownComponentConnectorTest.java b/uitest/src/test/java/com/vaadin/tests/components/UnknownComponentConnectorTest.java
index 49539fcae1..49539fcae1 100644
--- a/uitest/src/com/vaadin/tests/components/UnknownComponentConnectorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/UnknownComponentConnectorTest.java
diff --git a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContentTest.java b/uitest/src/test/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContentTest.java
index 6cb8c476c9..6cb8c476c9 100644
--- a/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContentTest.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/ChangeHierarchyBeforeResponseTest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ChangeHierarchyBeforeResponseTest.java
index 485e218a68..485e218a68 100644
--- a/uitest/src/com/vaadin/tests/components/abstractcomponent/ChangeHierarchyBeforeResponseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ChangeHierarchyBeforeResponseTest.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/ContextClickUITest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ContextClickUITest.java
index 4b975dbecc..4b975dbecc 100644
--- a/uitest/src/com/vaadin/tests/components/abstractcomponent/ContextClickUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ContextClickUITest.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java
index 8500fbe18d..8500fbe18d 100644
--- a/uitest/src/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/ResponseWritingErrorHandlingTest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ResponseWritingErrorHandlingTest.java
index 7b939a5627..7b939a5627 100644
--- a/uitest/src/com/vaadin/tests/components/abstractcomponent/ResponseWritingErrorHandlingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/ResponseWritingErrorHandlingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java
index 649ee42986..649ee42986 100644
--- a/uitest/src/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/AbstractComponentStyleNameTest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractfield/AbstractComponentStyleNameTest.java
index 41ba5571ad..41ba5571ad 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/AbstractComponentStyleNameTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/abstractfield/AbstractComponentStyleNameTest.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemoveTest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemoveTest.java
index edae0a24c2..edae0a24c2 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemoveTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemoveTest.java
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/ShortcutWhenBodyFocusedTest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractfield/ShortcutWhenBodyFocusedTest.java
index 2d9c9a494b..2d9c9a494b 100644
--- a/uitest/src/com/vaadin/tests/components/abstractfield/ShortcutWhenBodyFocusedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/abstractfield/ShortcutWhenBodyFocusedTest.java
diff --git a/uitest/src/com/vaadin/tests/components/accordion/AccordionAddTabTest.java b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionAddTabTest.java
index 95b7a9c416..95b7a9c416 100644
--- a/uitest/src/com/vaadin/tests/components/accordion/AccordionAddTabTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionAddTabTest.java
diff --git a/uitest/src/com/vaadin/tests/components/accordion/AccordionClipsContentTest.java b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionClipsContentTest.java
index b6fa82aa41..b6fa82aa41 100644
--- a/uitest/src/com/vaadin/tests/components/accordion/AccordionClipsContentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionClipsContentTest.java
diff --git a/uitest/src/com/vaadin/tests/components/accordion/AccordionRemoveComponentTest.java b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionRemoveComponentTest.java
index 785acddcb7..785acddcb7 100644
--- a/uitest/src/com/vaadin/tests/components/accordion/AccordionRemoveComponentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionRemoveComponentTest.java
diff --git a/uitest/src/com/vaadin/tests/components/accordion/AccordionRemoveTabTest.java b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionRemoveTabTest.java
index 1047c070c8..1047c070c8 100644
--- a/uitest/src/com/vaadin/tests/components/accordion/AccordionRemoveTabTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionRemoveTabTest.java
diff --git a/uitest/src/com/vaadin/tests/components/accordion/AccordionTabIdsTest.java b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionTabIdsTest.java
index 17c7fe6804..17c7fe6804 100644
--- a/uitest/src/com/vaadin/tests/components/accordion/AccordionTabIdsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionTabIdsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbarsTest.java b/uitest/src/test/java/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbarsTest.java
index ade43735a7..ade43735a7 100644
--- a/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbarsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/browserframe/BrowserFrameDoubleScrollbarsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameIsVisibleTest.java b/uitest/src/test/java/com/vaadin/tests/components/browserframe/BrowserFrameIsVisibleTest.java
index 927b76d2c3..927b76d2c3 100644
--- a/uitest/src/com/vaadin/tests/components/browserframe/BrowserFrameIsVisibleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/browserframe/BrowserFrameIsVisibleTest.java
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/button/ButtonClickTest.java
index 4ea02b20d0..4ea02b20d0 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/button/ButtonClickTest.java
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonKeyboardClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/button/ButtonKeyboardClickTest.java
index 110d729a36..110d729a36 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonKeyboardClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/button/ButtonKeyboardClickTest.java
diff --git a/uitest/src/com/vaadin/tests/components/button/ButtonUndefinedWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/button/ButtonUndefinedWidthTest.java
index 850dd1229c..850dd1229c 100644
--- a/uitest/src/com/vaadin/tests/components/button/ButtonUndefinedWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/button/ButtonUndefinedWidthTest.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/BeanItemContainerLongEventTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/BeanItemContainerLongEventTest.java
index 740d451b0f..740d451b0f 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/BeanItemContainerLongEventTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/BeanItemContainerLongEventTest.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarActionEventSourceTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarActionEventSourceTest.java
index 161f927681..161f927681 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarActionEventSourceTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarActionEventSourceTest.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarBackwardForwardTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarBackwardForwardTest.java
index 98773f475b..98773f475b 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarBackwardForwardTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarBackwardForwardTest.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarDisabledTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarDisabledTest.java
index 8b8122dcf9..8b8122dcf9 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarDisabledTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarDisabledTest.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java
index 077ab7f7ec..077ab7f7ec 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarMonthViewDndEventTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEventTest.java
index 3248804eed..3248804eed 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarMonthViewDndEventTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEventTest.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarNotificationsTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarNotificationsTest.java
index 2431b2f4d0..2431b2f4d0 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarNotificationsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarNotificationsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarNotificationsTestIE.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarNotificationsTestIE.java
index 62223ccc25..62223ccc25 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarNotificationsTestIE.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarNotificationsTestIE.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java
index 142353f314..142353f314 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarRescheduleEventTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarRescheduleEventTest.java
index fb8cce7d53..fb8cce7d53 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarRescheduleEventTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarRescheduleEventTest.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEventsTest.java
index e3e5606089..e3e5606089 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEventsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEventsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfViewTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfViewTest.java
index 9db65c89c6..9db65c89c6 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfViewTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfViewTest.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarVisibleHoursTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarVisibleHoursTest.java
index 5306ee3909..5306ee3909 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarVisibleHoursTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarVisibleHoursTest.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarWeekSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarWeekSelectionTest.java
index 83f41994ae..83f41994ae 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarWeekSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarWeekSelectionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/DndCalendarTargetDetailsTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/DndCalendarTargetDetailsTest.java
index c90d541226..c90d541226 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/DndCalendarTargetDetailsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/DndCalendarTargetDetailsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/NullEventMoveHandlerTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/NullEventMoveHandlerTest.java
index 156100310c..156100310c 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/NullEventMoveHandlerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/NullEventMoveHandlerTest.java
diff --git a/uitest/src/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDayTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDayTest.java
index a41fb8360a..a41fb8360a 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDayTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDayTest.java
diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxImmediateTest.java b/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxImmediateTest.java
index 826b43b9cc..826b43b9cc 100644
--- a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxImmediateTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxImmediateTest.java
diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxNullValueTest.java b/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxNullValueTest.java
index 12ed650c19..12ed650c19 100644
--- a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxNullValueTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxNullValueTest.java
diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java b/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java
index 69a919497b..69a919497b 100644
--- a/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java
diff --git a/uitest/src/com/vaadin/tests/components/checkbox/CheckboxContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckboxContextClickTest.java
index 1903687527..1903687527 100644
--- a/uitest/src/com/vaadin/tests/components/checkbox/CheckboxContextClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckboxContextClickTest.java
diff --git a/uitest/src/com/vaadin/tests/components/colorpicker/ColorPickerInputFormatsTest.java b/uitest/src/test/java/com/vaadin/tests/components/colorpicker/ColorPickerInputFormatsTest.java
index 096b07546a..096b07546a 100644
--- a/uitest/src/com/vaadin/tests/components/colorpicker/ColorPickerInputFormatsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/colorpicker/ColorPickerInputFormatsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java
index 78b7120b4e..78b7120b4e 100644
--- a/uitest/src/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxBorderTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxBorderTest.java
index 4d40e455a6..4d40e455a6 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxBorderTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxBorderTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java
index 949fcdb882..949fcdb882 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java
index a5efb44ec8..a5efb44ec8 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java
index 921c1b40e4..921c1b40e4 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java
index ebf6ba4773..ebf6ba4773 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxIdenticalItemsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItemsTest.java
index 709d3d9a60..709d3d9a60 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxIdenticalItemsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItemsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java
index 1e6f7e4170..1e6f7e4170 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java
index 66173db554..66173db554 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java
index 15c87b65f0..15c87b65f0 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java
index 20c460e342..20c460e342 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java
index 407ab7aa04..407ab7aa04 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnterTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnterTest.java
index d3ba37682d..d3ba37682d 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnterTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnterTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java
index cb4cd54559..cb4cd54559 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java
index f48f2bbdeb..f48f2bbdeb 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java
index 0295f4ba41..0295f4ba41 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabledTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabledTest.java
index 8c09279b87..8c09279b87 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabledTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabledTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java
index a95301acc7..a95301acc7 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSelectingTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingTest.java
index 0fad2c309b..0fad2c309b 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSelectingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowedTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowedTest.java
index c0a67514bb..c0a67514bb 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowedTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java
index ce8e614e10..ce8e614e10 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSlowTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSlowTest.java
index e547e68fc1..e547e68fc1 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSlowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSlowTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java
index 7ed3268dd4..7ed3268dd4 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java
index 5e9e076cac..5e9e076cac 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java
index 318ffbe549..318ffbe549 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java
index 280328694c..280328694c 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java
index 5c8c971194..5c8c971194 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScrollTest.java
index e88dd2eb85..e88dd2eb85 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScrollTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java
index ec5bc088da..ec5bc088da 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java
index 034319ac70..034319ac70 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/CustomComboBoxElement.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/CustomComboBoxElement.java
index 697d5eb932..697d5eb932 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/CustomComboBoxElement.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/CustomComboBoxElement.java
diff --git a/uitest/src/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java
index d7f8e233ec..d7f8e233ec 100644
--- a/uitest/src/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java
diff --git a/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibilityTest.java b/uitest/src/test/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibilityTest.java
index 9f1fc6b03e..9f1fc6b03e 100644
--- a/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibilityTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibilityTest.java
diff --git a/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/customfield/CustomFieldSizeTest.java
index a3f8f06976..a3f8f06976 100644
--- a/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/customfield/CustomFieldSizeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlotTest.java b/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlotTest.java
index d47a100a93..d47a100a93 100644
--- a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlotTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlotTest.java
diff --git a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplateTest.java b/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplateTest.java
index 668d43f18f..668d43f18f 100644
--- a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplateTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithNullTemplateTest.java
diff --git a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplateTest.java b/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplateTest.java
index 695d9cceff..695d9cceff 100644
--- a/uitest/src/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplateTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutWithoutTemplateTest.java
diff --git a/uitest/src/com/vaadin/tests/components/customlayout/OverflowAutoFixTest.java b/uitest/src/test/java/com/vaadin/tests/components/customlayout/OverflowAutoFixTest.java
index d56e07f60b..d56e07f60b 100644
--- a/uitest/src/com/vaadin/tests/components/customlayout/OverflowAutoFixTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/customlayout/OverflowAutoFixTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/AriaDisabledTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/AriaDisabledTest.java
index f37042396b..f37042396b 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/AriaDisabledTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/AriaDisabledTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormatEEETest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/CustomDateFormatEEETest.java
index 98094515e8..98094515e8 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormatEEETest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/CustomDateFormatEEETest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldChangeResolutionTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldChangeResolutionTest.java
index e3c85224c0..e3c85224c0 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldChangeResolutionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldChangeResolutionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldCloseTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldCloseTest.java
index e6f7520813..e6f7520813 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldCloseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldCloseTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffsetTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffsetTest.java
index 4ee9597f68..4ee9597f68 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffsetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffsetTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldFastForwardTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldFastForwardTest.java
index 63d96e9bf9..63d96e9bf9 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldFastForwardTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldFastForwardTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldIsValidTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldIsValidTest.java
index 3ba63d0f12..3ba63d0f12 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldIsValidTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldIsValidTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldKeyboardInputTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInputTest.java
index 15f196a26b..15f196a26b 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldKeyboardInputTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInputTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetachTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetachTest.java
index ca3d3a8748..ca3d3a8748 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetachTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetachTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupClosingTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingTest.java
index 9fd6fe82e2..9fd6fe82e2 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupClosingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupPositionTest.java
index f896519aae..f896519aae 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupPositionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupPositionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java
index cfab13e205..cfab13e205 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldTestTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldTestTest.java
index 5f659d389b..5f659d389b 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldTestTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldTestTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParentTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParentTest.java
index 23f6d6f5a6..23f6d6f5a6 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParentTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DateRangeWithSqlDateTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateRangeWithSqlDateTest.java
index 2352011585..2352011585 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DateRangeWithSqlDateTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateRangeWithSqlDateTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPositionTest.java
index 61cc876a3f..61cc876a3f 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPositionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPositionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldPopupTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopupTest.java
index 4775441af2..4775441af2 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldPopupTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopupTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DisabledInlineDateFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledInlineDateFieldTest.java
index 2c50030461..2c50030461 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DisabledInlineDateFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledInlineDateFieldTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java
index 76486bf340..76486bf340 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DisabledParentLayoutTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/LocaleChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/LocaleChangeTest.java
index 38e4b7e0b8..38e4b7e0b8 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/LocaleChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/LocaleChangeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupClosingWithEscTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupClosingWithEscTest.java
index 1366d38705..1366d38705 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupClosingWithEscTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupClosingWithEscTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldConnectorTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldConnectorTest.java
index 5334327a83..5334327a83 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldConnectorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldConnectorTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java
index 410b0edac6..410b0edac6 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldInputPromptTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPromptTest.java
index 4e5fa744c7..4e5fa744c7 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldInputPromptTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPromptTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldStatesTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldStatesTest.java
index 8c5ba20ecc..8c5ba20ecc 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldStatesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldStatesTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java
index 95b8437b17..95b8437b17 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/datefield/ValoDateFieldPopupPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/ValoDateFieldPopupPositionTest.java
index 4009b9d991..4009b9d991 100644
--- a/uitest/src/com/vaadin/tests/components/datefield/ValoDateFieldPopupPositionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/ValoDateFieldPopupPositionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtainTest.java b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtainTest.java
index 7a2abe5efc..7a2abe5efc 100644
--- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtainTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtainTest.java
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidthTest.java
index 9cb7a63046..9cb7a63046 100644
--- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropRelativeWidthTest.java
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextAreaTest.java b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextAreaTest.java
index c60eead918..c60eead918 100644
--- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextAreaTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextAreaTest.java
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragStartModesTest.java b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragStartModesTest.java
index 4e60b43ea2..4e60b43ea2 100644
--- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragStartModesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/draganddropwrapper/DragStartModesTest.java
diff --git a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedAltTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedAltTextTest.java
index 23dcddd8d0..23dcddd8d0 100644
--- a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedAltTextTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedAltTextTest.java
diff --git a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinatesTest.java b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinatesTest.java
index 6bed0117f8..6bed0117f8 100644
--- a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinatesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinatesTest.java
diff --git a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedThemeResourceTest.java b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedThemeResourceTest.java
index f892775ea3..f892775ea3 100644
--- a/uitest/src/com/vaadin/tests/components/embedded/EmbeddedThemeResourceTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedThemeResourceTest.java
diff --git a/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisibleTest.java b/uitest/src/test/java/com/vaadin/tests/components/embedded/FlashIsVisibleTest.java
index 64d70df88f..64d70df88f 100644
--- a/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisibleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/embedded/FlashIsVisibleTest.java
diff --git a/uitest/src/com/vaadin/tests/components/flash/FlashIsVisibleTest.java b/uitest/src/test/java/com/vaadin/tests/components/flash/FlashIsVisibleTest.java
index 4a18d4d8a2..4a18d4d8a2 100644
--- a/uitest/src/com/vaadin/tests/components/flash/FlashIsVisibleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/flash/FlashIsVisibleTest.java
diff --git a/uitest/src/com/vaadin/tests/components/form/FormTooltipsTest.java b/uitest/src/test/java/com/vaadin/tests/components/form/FormTooltipsTest.java
index cb71fef3ef..cb71fef3ef 100644
--- a/uitest/src/com/vaadin/tests/components/form/FormTooltipsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/form/FormTooltipsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayoutTest.java
index 89e7c9a06e..89e7c9a06e 100644
--- a/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayoutTest.java
diff --git a/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java
index 3285503aeb..3285503aeb 100644
--- a/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayoutTest.java
index 95130e8a0c..95130e8a0c 100644
--- a/uitest/src/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayoutTest.java
diff --git a/uitest/src/com/vaadin/tests/components/formlayout/StylePrefixTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/StylePrefixTest.java
index c43dc0042e..c43dc0042e 100644
--- a/uitest/src/com/vaadin/tests/components/formlayout/StylePrefixTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/StylePrefixTest.java
diff --git a/uitest/src/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java
index 29476b9ae6..29476b9ae6 100644
--- a/uitest/src/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/AbstractGridColumnAutoWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/AbstractGridColumnAutoWidthTest.java
index cf3ff0c3ef..cf3ff0c3ef 100644
--- a/uitest/src/com/vaadin/tests/components/grid/AbstractGridColumnAutoWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/AbstractGridColumnAutoWidthTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/CustomRendererTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java
index d5e01a9de8..d5e01a9de8 100644
--- a/uitest/src/com/vaadin/tests/components/grid/CustomRendererTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInitTest.java
index 42327ebd80..42327ebd80 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInitTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInitTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridAddRowTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddRowTest.java
index 8c601db9aa..8c601db9aa 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridAddRowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddRowTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java
index cccb306369..cccb306369 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java
index c430821534..c430821534 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridClientDataChangeHandlerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientDataChangeHandlerTest.java
index 02ca206b5e..02ca206b5e 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridClientDataChangeHandlerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientDataChangeHandlerTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridClientRenderers.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java
index 4139bb0c5f..4139bb0c5f 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridClientRenderers.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridColspansTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java
index d99272d506..d99272d506 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridColspansTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java
index 64c56e174e..64c56e174e 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoWidthClientTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoWidthClientTest.java
index 999f72682e..999f72682e 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoWidthClientTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoWidthClientTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoWidthServerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoWidthServerTest.java
index 3a4e2bfc72..3a4e2bfc72 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoWidthServerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoWidthServerTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java
index 17bfcfc6c1..17bfcfc6c1 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java
index 3d88427ada..3d88427ada 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java
index 976e1e78fe..976e1e78fe 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridDataSourceResetTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java
index f7ea63e371..f7ea63e371 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridDataSourceResetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java
index df306ee1e6..df306ee1e6 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridDetailsDetachTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsDetachTest.java
index 7406daeacd..7406daeacd 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridDetailsDetachTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsDetachTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java
index 6ea72540b5..6ea72540b5 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridDetailsLocationTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLocationTest.java
index a395d7e721..a395d7e721 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridDetailsLocationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLocationTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridDetailsWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java
index 2def2d0279..2def2d0279 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridDetailsWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridDisabledSideBarTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDisabledSideBarTest.java
index 0f207b68f2..0f207b68f2 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridDisabledSideBarTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDisabledSideBarTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java
index f2e3a8e77e..f2e3a8e77e 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java
index 8a67d180c6..8a67d180c6 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridEditorConverterNotFoundTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorConverterNotFoundTest.java
index 468ea8da3a..468ea8da3a 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridEditorConverterNotFoundTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorConverterNotFoundTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java
index ae81eb9303..ae81eb9303 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java
index 75d71a3c40..75d71a3c40 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java
index 9b53766d96..9b53766d96 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridEditorUITest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorUITest.java
index 3f17d9a80c..3f17d9a80c 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridEditorUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorUITest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridExtensionCommunicationTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridExtensionCommunicationTest.java
index a6a1231fa0..a6a1231fa0 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridExtensionCommunicationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridExtensionCommunicationTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java
index d50879e65e..d50879e65e 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridHeaderFooterComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFooterComponentsTest.java
index e8d3abf42d..e8d3abf42d 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridHeaderFooterComponentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFooterComponentsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java
index 0e2a3d6ac6..0e2a3d6ac6 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java
index 6dffe16a40..6dffe16a40 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridInTabSheetTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInTabSheetTest.java
index f9f8d1309b..f9f8d1309b 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridInTabSheetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInTabSheetTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java
index 732cd4aa41..732cd4aa41 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridItemSetChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridItemSetChangeTest.java
index dca1d71cb5..dca1d71cb5 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridItemSetChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridItemSetChangeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java
index 9ec54471b0..9ec54471b0 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java
index 1818baa4c9..1818baa4c9 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java
index cf85f4eecd..cf85f4eecd 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridRendererChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridRendererChangeTest.java
index a8d7fb06be..a8d7fb06be 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridRendererChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridRendererChangeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridReplaceContainerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridReplaceContainerTest.java
index cf20ac87b5..cf20ac87b5 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridReplaceContainerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridReplaceContainerTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridResizeAndScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeAndScrollTest.java
index 52079c782c..52079c782c 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridResizeAndScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeAndScrollTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.java
index aee1db7a85..aee1db7a85 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridSelectAllCellTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllCellTest.java
index 423a9f419b..423a9f419b 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridSelectAllCellTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllCellTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridSingleColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSingleColumnTest.java
index a3fbb00cf2..a3fbb00cf2 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridSingleColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSingleColumnTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridSortIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSortIndicatorTest.java
index 2874ec32a6..2874ec32a6 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridSortIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSortIndicatorTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java
index f08ab7a8a4..f08ab7a8a4 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridSubPixelProblemWrappingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrappingTest.java
index 4368fda158..4368fda158 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridSubPixelProblemWrappingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrappingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridSwitchRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSwitchRenderersTest.java
index 5989ba607f..5989ba607f 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridSwitchRenderersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSwitchRenderersTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridThemeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeChangeTest.java
index 1e2b8f4335..1e2b8f4335 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridThemeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeChangeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridThemeUITest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeUITest.java
index 140e8a90d8..140e8a90d8 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridThemeUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeUITest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridWidgetRendererChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidgetRendererChangeTest.java
index 5098a0e7d8..5098a0e7d8 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridWidgetRendererChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidgetRendererChangeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java
index 6f39253fb0..6f39253fb0 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridWithBrokenRendererTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithBrokenRendererTest.java
index 011c8c92ce..011c8c92ce 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridWithBrokenRendererTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithBrokenRendererTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridWithLabelEditorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithLabelEditorTest.java
index 7917d0e279..7917d0e279 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridWithLabelEditorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithLabelEditorTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridWithoutRendererTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithoutRendererTest.java
index fc93e99188..fc93e99188 100644
--- a/uitest/src/com/vaadin/tests/components/grid/GridWithoutRendererTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithoutRendererTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java
index b4414a3f38..b4414a3f38 100644
--- a/uitest/src/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java
index 917245188a..917245188a 100644
--- a/uitest/src/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/NullHeadersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/NullHeadersTest.java
index 55f1238326..55f1238326 100644
--- a/uitest/src/com/vaadin/tests/components/grid/NullHeadersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/NullHeadersTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/NullRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/NullRenderersTest.java
index f100c03d4f..f100c03d4f 100644
--- a/uitest/src/com/vaadin/tests/components/grid/NullRenderersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/NullRenderersTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java
index efbc164e15..efbc164e15 100644
--- a/uitest/src/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/SelectDuringInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/SelectDuringInitTest.java
index 1ba223d71c..1ba223d71c 100644
--- a/uitest/src/com/vaadin/tests/components/grid/SelectDuringInitTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/SelectDuringInitTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java
index 32a896603b..32a896603b 100644
--- a/uitest/src/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/WidgetRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/WidgetRenderersTest.java
index 063d05b735..063d05b735 100644
--- a/uitest/src/com/vaadin/tests/components/grid/WidgetRenderersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/WidgetRenderersTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java
index 5367d32328..5367d32328 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/EscalatorBasicClientFeaturesTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java
index 0a1b1735fa..0a1b1735fa 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
index 640c4a448b..640c4a448b 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSourcesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSourcesTest.java
index c406f85c0c..c406f85c0c 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSourcesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridClientDataSourcesTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridClientHeightByRowOnInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridClientHeightByRowOnInitTest.java
index 86686225d0..86686225d0 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridClientHeightByRowOnInitTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridClientHeightByRowOnInitTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java
index 02e94ec6c4..02e94ec6c4 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnHidingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnReorderTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnReorderTest.java
index d779a5c81a..d779a5c81a 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridColumnReorderTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridColumnReorderTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java
index ae9a8fe381..ae9a8fe381 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridDescriptionGeneratorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDescriptionGeneratorTest.java
index ed712361a6..ed712361a6 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridDescriptionGeneratorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDescriptionGeneratorTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java
index 651cd3a763..651cd3a763 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicatorsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicatorsTest.java
index 5eb05c61ca..5eb05c61ca 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicatorsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicatorsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/DisabledGridClientTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/DisabledGridClientTest.java
index 8465906801..8465906801 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/DisabledGridClientTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/DisabledGridClientTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridCellStyleGeneratorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridCellStyleGeneratorTest.java
index 8188553e61..8188553e61 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridCellStyleGeneratorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridCellStyleGeneratorTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java
index 2f5d0e7291..2f5d0e7291 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientCompositeEditorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientCompositeEditorTest.java
index 29e6fed68c..29e6fed68c 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientCompositeEditorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientCompositeEditorTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientCompositeFooterTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientCompositeFooterTest.java
index 26ae7320b0..26ae7320b0 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientCompositeFooterTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientCompositeFooterTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientCompositeHeaderTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientCompositeHeaderTest.java
index c0ed833ab2..c0ed833ab2 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientCompositeHeaderTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientCompositeHeaderTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientCompositeKeyEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientCompositeKeyEventsTest.java
index fada87b15d..fada87b15d 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientCompositeKeyEventsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientCompositeKeyEventsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientCompositeSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientCompositeSelectionTest.java
index 7a79a114b8..7a79a114b8 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientCompositeSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientCompositeSelectionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientContextMenuEventTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientContextMenuEventTest.java
index b7242c87be..b7242c87be 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientContextMenuEventTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientContextMenuEventTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientKeyEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientKeyEventsTest.java
index 740eaf3f09..740eaf3f09 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientKeyEventsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientKeyEventsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientSelectionTest.java
index d1d7b21e11..d1d7b21e11 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientSelectionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientStructureTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientStructureTest.java
index 74cf368da9..74cf368da9 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridClientStructureTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientStructureTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java
index 01e7e52923..01e7e52923 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java
index 0dd137db48..0dd137db48 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridFooterTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridFooterTest.java
index 8b65ba315b..8b65ba315b 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridFooterTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridFooterTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridHeaderTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridHeaderTest.java
index 8cf7f7374f..8cf7f7374f 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridHeaderTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridHeaderTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridRowHandleRefreshTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridRowHandleRefreshTest.java
index c7a509da45..c7a509da45 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridRowHandleRefreshTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridRowHandleRefreshTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java
index 1b9d1a0728..1b9d1a0728 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridStaticSectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridStaticSectionTest.java
index ef7d15ff3d..ef7d15ff3d 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridStaticSectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridStaticSectionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridStylingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridStylingTest.java
index cbf27a69d9..cbf27a69d9 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridStylingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridStylingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/element/CustomGridElement.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/element/CustomGridElement.java
index e1934d4f2b..e1934d4f2b 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/element/CustomGridElement.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/element/CustomGridElement.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorBasicsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorBasicsTest.java
index 1d26477d34..1d26477d34 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorBasicsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorBasicsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColspanTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColspanTest.java
index d9b3debbe1..d9b3debbe1 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColspanTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColspanTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColumnFreezingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColumnFreezingTest.java
index e808001cf7..e808001cf7 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColumnFreezingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorColumnFreezingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRemoveAndAddRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRemoveAndAddRowsTest.java
index 19ba72b49d..19ba72b49d 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRemoveAndAddRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRemoveAndAddRowsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRowColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRowColumnTest.java
index e72e8fae70..e72e8fae70 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRowColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorRowColumnTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorScrollTest.java
index 41ad370b98..41ad370b98 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorScrollTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java
index 66c131255f..66c131255f 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorSpacerTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorUpdaterUiTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorUpdaterUiTest.java
index 85d3fc0bac..85d3fc0bac 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorUpdaterUiTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/escalator/EscalatorUpdaterUiTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/DisabledGridTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/DisabledGridTest.java
index cd6a7a7b69..cd6a7a7b69 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/DisabledGridTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/DisabledGridTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java
index 0c26ceb5c9..0c26ceb5c9 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridCellStyleGeneratorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellStyleGeneratorTest.java
index f013b76075..f013b76075 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridCellStyleGeneratorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellStyleGeneratorTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java
index 91b5d04ab6..91b5d04ab6 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnMaxWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnMaxWidthTest.java
index 7f19559aec..7f19559aec 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnMaxWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnMaxWidthTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnReorderTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnReorderTest.java
index 62be202277..62be202277 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnReorderTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnReorderTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java
index 7fdf7acbab..7fdf7acbab 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnVisibilityTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnVisibilityTest.java
index 6e0d7cc87a..6e0d7cc87a 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnVisibilityTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnVisibilityTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridDetailsServerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridDetailsServerTest.java
index dda9c03f94..dda9c03f94 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridDetailsServerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridDetailsServerTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorBufferedTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorBufferedTest.java
index 8340c40b4b..8340c40b4b 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorBufferedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorBufferedTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java
index 0cba2ce34b..0cba2ce34b 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java
index c4d1893875..c4d1893875 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridFocusTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridFocusTest.java
index ca9d78409c..ca9d78409c 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridFocusTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridFocusTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridItemClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridItemClickTest.java
index 57fc56c995..57fc56c995 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridItemClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridItemClickTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java
index 6724a7bb49..6724a7bb49 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridMultiSortingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridMultiSortingTest.java
index a3cf5872f0..a3cf5872f0 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridMultiSortingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridMultiSortingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridRowAddRemoveTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridRowAddRemoveTest.java
index f91f93c5d5..f91f93c5d5 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridRowAddRemoveTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridRowAddRemoveTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java
index 9313b40770..9313b40770 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java
index 44a632bc49..44a632bc49 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridSidebarThemeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSidebarThemeTest.java
index 238b470feb..238b470feb 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridSidebarThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSidebarThemeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java
index c23e5d1f11..c23e5d1f11 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridStaticSectionComponentTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStaticSectionComponentTest.java
index 2fbaa58cab..2fbaa58cab 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridStaticSectionComponentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStaticSectionComponentTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java
index 7c50ae5d6e..7c50ae5d6e 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java
index f4771b9067..f4771b9067 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/ComponentAlignmentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/ComponentAlignmentsTest.java
index cdc8dc77f1..cdc8dc77f1 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/ComponentAlignmentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/ComponentAlignmentsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutAlignmentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignmentsTest.java
index 0f8f717c60..0f8f717c60 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutAlignmentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignmentsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutBaseTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutBaseTest.java
index 8bbb5cfe1a..8bbb5cfe1a 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutBaseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutBaseTest.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignmentTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignmentTest.java
index 240ea4ce6f..240ea4ce6f 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignmentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignmentTest.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUITest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUITest.java
index 8c753b1f5c..8c753b1f5c 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUITest.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutExpandRatioTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExpandRatioTest.java
index f543068851..f543068851 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutExpandRatioTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExpandRatioTest.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacingTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacingTest.java
index 22c9c0d4e3..22c9c0d4e3 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutExtraSpacingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutFocusOrderAfterShowChildTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutFocusOrderAfterShowChildTest.java
index 1913fbfdf9..1913fbfdf9 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutFocusOrderAfterShowChildTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutFocusOrderAfterShowChildTest.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignmentTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignmentTest.java
index b60aea49f0..b60aea49f0 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignmentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutFractionalSizeAndAlignmentTest.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutHideMiddleCellsTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutHideMiddleCellsTest.java
index f62735051b..f62735051b 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutHideMiddleCellsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutHideMiddleCellsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutScrollPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutScrollPositionTest.java
index 961b08002b..961b08002b 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutScrollPositionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutScrollPositionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java
index 95152e1416..95152e1416 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java
diff --git a/uitest/src/com/vaadin/tests/components/gridlayout/UniformGridLayoutUITest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUITest.java
index 80f85b3b21..80f85b3b21 100644
--- a/uitest/src/com/vaadin/tests/components/gridlayout/UniformGridLayoutUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUITest.java
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentTest.java b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentTest.java
index ea610dccda..ea610dccda 100644
--- a/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentTest.java
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUITest.java b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUITest.java
index 3530eb1e16..3530eb1e16 100644
--- a/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptNoLayoutHandlingUITest.java
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java
index 4009365814..4009365814 100644
--- a/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptPreloadingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListenerTest.java b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListenerTest.java
index 92ebc3a335..92ebc3a335 100644
--- a/uitest/src/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListenerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/JavaScriptResizeListenerTest.java
diff --git a/uitest/src/com/vaadin/tests/components/label/LabelModesTest.java b/uitest/src/test/java/com/vaadin/tests/components/label/LabelModesTest.java
index 7314ce4093..7314ce4093 100644
--- a/uitest/src/com/vaadin/tests/components/label/LabelModesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/label/LabelModesTest.java
diff --git a/uitest/src/com/vaadin/tests/components/label/LabelTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/components/label/LabelTooltipTest.java
index 600cc4231a..600cc4231a 100644
--- a/uitest/src/com/vaadin/tests/components/label/LabelTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/label/LabelTooltipTest.java
diff --git a/uitest/src/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponentTest.java b/uitest/src/test/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponentTest.java
index 09d19034e6..09d19034e6 100644
--- a/uitest/src/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponentTest.java
diff --git a/uitest/src/com/vaadin/tests/components/link/LinkInsideDisabledContainerTest.java b/uitest/src/test/java/com/vaadin/tests/components/link/LinkInsideDisabledContainerTest.java
index 8d65101be3..8d65101be3 100644
--- a/uitest/src/com/vaadin/tests/components/link/LinkInsideDisabledContainerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/link/LinkInsideDisabledContainerTest.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboardTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboardTest.java
index 8737ba054e..8737ba054e 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboardTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboardTest.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java
index a4f8023ea2..a4f8023ea2 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValoTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValoTest.java
index b7ed88c9ca..b7ed88c9ca 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValoTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarSubmenusClosingValoTest.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdgeTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdgeTest.java
index a460290ee0..a460290ee0 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdgeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdgeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarsWithNestingTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarsWithNestingTest.java
index 4c3383c5d6..4c3383c5d6 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuBarsWithNestingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarsWithNestingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuItemStyleRemovedTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuItemStyleRemovedTest.java
index e25aa664cd..e25aa664cd 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuItemStyleRemovedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuItemStyleRemovedTest.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuTooltipTest.java
index 091f7be954..091f7be954 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/MenuTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuTooltipTest.java
diff --git a/uitest/src/com/vaadin/tests/components/menubar/SpaceMenuBarNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigationTest.java
index a32a611d9a..a32a611d9a 100644
--- a/uitest/src/com/vaadin/tests/components/menubar/SpaceMenuBarNavigationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/SpaceMenuBarNavigationTest.java
diff --git a/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/nativebutton/NativeButtonClickTest.java
index cab2acefff..cab2acefff 100644
--- a/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/nativebutton/NativeButtonClickTest.java
diff --git a/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonIconAndTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/nativebutton/NativeButtonIconAndTextTest.java
index 37987171d2..37987171d2 100644
--- a/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonIconAndTextTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/nativebutton/NativeButtonIconAndTextTest.java
diff --git a/uitest/src/com/vaadin/tests/components/nativeselect/NativeSelectsAndChromeKeyboardNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsAndChromeKeyboardNavigationTest.java
index 4e23db8eb7..4e23db8eb7 100644
--- a/uitest/src/com/vaadin/tests/components/nativeselect/NativeSelectsAndChromeKeyboardNavigationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsAndChromeKeyboardNavigationTest.java
diff --git a/uitest/src/com/vaadin/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java
index 194b1bb64b..194b1bb64b 100644
--- a/uitest/src/com/vaadin/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java
diff --git a/uitest/src/com/vaadin/tests/components/notification/MiddleNotificationPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/notification/MiddleNotificationPositionTest.java
index dc43b9d19a..dc43b9d19a 100644
--- a/uitest/src/com/vaadin/tests/components/notification/MiddleNotificationPositionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/notification/MiddleNotificationPositionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/notification/NotificationDelayTest.java b/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationDelayTest.java
index 903c3440cc..903c3440cc 100644
--- a/uitest/src/com/vaadin/tests/components/notification/NotificationDelayTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationDelayTest.java
diff --git a/uitest/src/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java b/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java
index 33ba8d1df0..33ba8d1df0 100644
--- a/uitest/src/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java
diff --git a/uitest/src/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroupTest.java b/uitest/src/test/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroupTest.java
index 090286b1ad..090286b1ad 100644
--- a/uitest/src/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroupTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroupTest.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/CaptionLeakTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/CaptionLeakTest.java
index 9bb53d8742..9bb53d8742 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/CaptionLeakTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/CaptionLeakTest.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java
index e784eb3b64..e784eb3b64 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsgTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsgTest.java
index ea78d9f30c..ea78d9f30c 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsgTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsgTest.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHoverTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHoverTest.java
index 1cddbc28c3..1cddbc28c3 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHoverTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/NestedLayoutCaptionHoverTest.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPassesTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPassesTest.java
index 1a2a9cbedf..1a2a9cbedf 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPassesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutInfiniteLayoutPassesTest.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/SpacingLeakTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/SpacingLeakTest.java
index 565c11c1f0..565c11c1f0 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/SpacingLeakTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/SpacingLeakTest.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicatorTest.java
index 815c00bfac..815c00bfac 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicatorTest.java
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChangesTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChangesTest.java
index 0890414fea..0890414fea 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChangesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChangesTest.java
diff --git a/uitest/src/com/vaadin/tests/components/page/PageTitleTest.java b/uitest/src/test/java/com/vaadin/tests/components/page/PageTitleTest.java
index bc2e6f7ca1..bc2e6f7ca1 100644
--- a/uitest/src/com/vaadin/tests/components/page/PageTitleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/page/PageTitleTest.java
diff --git a/uitest/src/com/vaadin/tests/components/panel/PanelChangeContentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/panel/PanelChangeContentsTest.java
index 039b054040..039b054040 100644
--- a/uitest/src/com/vaadin/tests/components/panel/PanelChangeContentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/panel/PanelChangeContentsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/panel/UndefinedSizeScrollbarsTest.java b/uitest/src/test/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbarsTest.java
index c055356624..c055356624 100644
--- a/uitest/src/com/vaadin/tests/components/panel/UndefinedSizeScrollbarsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbarsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/DisabledPopupViewTest.java b/uitest/src/test/java/com/vaadin/tests/components/popupview/DisabledPopupViewTest.java
index be9345d588..be9345d588 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/DisabledPopupViewTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/popupview/DisabledPopupViewTest.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragmentTest.java b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewAndFragmentTest.java
index 510cc7c883..510cc7c883 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragmentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewAndFragmentTest.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewCaptionTest.java b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewCaptionTest.java
index f9b1692b85..f9b1692b85 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewCaptionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewCaptionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpenTest.java b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpenTest.java
index aafd310b70..aafd310b70 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpenTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpenTest.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandlerTest.java b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandlerTest.java
index 6155820990..6155820990 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandlerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandlerTest.java
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewWithExtensionTest.java b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewWithExtensionTest.java
index 073fd321e5..073fd321e5 100644
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewWithExtensionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewWithExtensionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeerTest.java b/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeerTest.java
index f1056a640d..f1056a640d 100644
--- a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeerTest.java
diff --git a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressBarStaticRunoTest.java b/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRunoTest.java
index 751e048694..751e048694 100644
--- a/uitest/src/com/vaadin/tests/components/progressindicator/ProgressBarStaticRunoTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRunoTest.java
diff --git a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResizeTest.java
index 5c31ce4dc7..5c31ce4dc7 100644
--- a/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResizeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/select/EnumSelectTest.java b/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java
index c0429baa31..c0429baa31 100644
--- a/uitest/src/com/vaadin/tests/components/select/EnumSelectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java
diff --git a/uitest/src/com/vaadin/tests/components/select/SelectWithIntegersTest.java b/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java
index bbef30bf1d..bbef30bf1d 100644
--- a/uitest/src/com/vaadin/tests/components/select/SelectWithIntegersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java
diff --git a/uitest/src/com/vaadin/tests/components/slider/HiddenSliderHandleTest.java b/uitest/src/test/java/com/vaadin/tests/components/slider/HiddenSliderHandleTest.java
index 3717f7f754..3717f7f754 100644
--- a/uitest/src/com/vaadin/tests/components/slider/HiddenSliderHandleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/slider/HiddenSliderHandleTest.java
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderDisableTest.java b/uitest/src/test/java/com/vaadin/tests/components/slider/SliderDisableTest.java
index 12d26b8f8f..12d26b8f8f 100644
--- a/uitest/src/com/vaadin/tests/components/slider/SliderDisableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/slider/SliderDisableTest.java
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderFeedbackTest.java b/uitest/src/test/java/com/vaadin/tests/components/slider/SliderFeedbackTest.java
index 86bc351480..86bc351480 100644
--- a/uitest/src/com/vaadin/tests/components/slider/SliderFeedbackTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/slider/SliderFeedbackTest.java
diff --git a/uitest/src/com/vaadin/tests/components/slider/SliderResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/slider/SliderResizeTest.java
index 22df3e4211..22df3e4211 100644
--- a/uitest/src/com/vaadin/tests/components/slider/SliderResizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/slider/SliderResizeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/GridLayoutWithCheckboxTest.java b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/GridLayoutWithCheckboxTest.java
index fee46c155a..fee46c155a 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/GridLayoutWithCheckboxTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/GridLayoutWithCheckboxTest.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeightTest.java b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeightTest.java
index 0ceca66dd3..0ceca66dd3 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeightTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelHeightTest.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelDuplicateStyleNameTest.java b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelDuplicateStyleNameTest.java
index 8a142ac2e1..8a142ac2e1 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelDuplicateStyleNameTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelDuplicateStyleNameTest.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponentTest.java b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponentTest.java
index 1bf5212185..1bf5212185 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelMoveComponentTest.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelStyleLeakTest.java b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelStyleLeakTest.java
index 1ad9cdb461..1ad9cdb461 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelStyleLeakTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelStyleLeakTest.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximumTest.java b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximumTest.java
index b8592e1bd8..b8592e1bd8 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximumTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximumTest.java
diff --git a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPositionChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPositionChangeTest.java
index 43edb56f3a..43edb56f3a 100644
--- a/uitest/src/com/vaadin/tests/components/splitpanel/SplitPositionChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/splitpanel/SplitPositionChangeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/AddSelectionToRemovedRangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/AddSelectionToRemovedRangeTest.java
index 68b3748472..68b3748472 100644
--- a/uitest/src/com/vaadin/tests/components/table/AddSelectionToRemovedRangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/AddSelectionToRemovedRangeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java
index b33204cc44..b33204cc44 100644
--- a/uitest/src/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java
index 739851de2f..739851de2f 100644
--- a/uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java
index 4a5947c145..4a5947c145 100644
--- a/uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrderTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrderTest.java
index 970b832e0c..970b832e0c 100644
--- a/uitest/src/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrderTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrderTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ContainerSizeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java
index e13238e10d..e13238e10d 100644
--- a/uitest/src/com/vaadin/tests/components/table/ContainerSizeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ContextMenuSizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ContextMenuSizeTest.java
index e5e5163442..e5e5163442 100644
--- a/uitest/src/com/vaadin/tests/components/table/ContextMenuSizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ContextMenuSizeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/CtrlShiftMultiselectTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/CtrlShiftMultiselectTest.java
index add7db93f2..add7db93f2 100644
--- a/uitest/src/com/vaadin/tests/components/table/CtrlShiftMultiselectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/CtrlShiftMultiselectTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/CustomTableElement.java b/uitest/src/test/java/com/vaadin/tests/components/table/CustomTableElement.java
index f1df98fb38..f1df98fb38 100644
--- a/uitest/src/com/vaadin/tests/components/table/CustomTableElement.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/CustomTableElement.java
diff --git a/uitest/src/com/vaadin/tests/components/table/DisabledSortingTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java
index 73a5e68da9..73a5e68da9 100644
--- a/uitest/src/com/vaadin/tests/components/table/DisabledSortingTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/DndEmptyTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/DndEmptyTableTest.java
index 6fb0d446d3..6fb0d446d3 100644
--- a/uitest/src/com/vaadin/tests/components/table/DndEmptyTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/DndEmptyTableTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/DndTableTargetDetailsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/DndTableTargetDetailsTest.java
index 5ad99d3084..5ad99d3084 100644
--- a/uitest/src/com/vaadin/tests/components/table/DndTableTargetDetailsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/DndTableTargetDetailsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/EditableModeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java
index 56b30dcb7c..56b30dcb7c 100644
--- a/uitest/src/com/vaadin/tests/components/table/EditableModeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/EmptyTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/EmptyTableTest.java
index 2332815ed6..2332815ed6 100644
--- a/uitest/src/com/vaadin/tests/components/table/EmptyTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/EmptyTableTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceConditionTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceConditionTest.java
index 1602f1bae5..1602f1bae5 100644
--- a/uitest/src/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceConditionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceConditionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java
index 14a0718325..14a0718325 100644
--- a/uitest/src/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/FooterClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java
index 2e4df1c116..2e4df1c116 100644
--- a/uitest/src/com/vaadin/tests/components/table/FooterClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/FooterTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java
index 11a6838234..11a6838234 100644
--- a/uitest/src/com/vaadin/tests/components/table/FooterTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java
index 2ad069540d..2ad069540d 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
index 01fc173c9a..01fc173c9a 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java
index 26847a692d..26847a692d 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java
index f5f8bcce2a..f5f8bcce2a 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java
index c9307f0849..c9307f0849 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java
index 7a3813599d..7a3813599d 100644
--- a/uitest/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ItemClickEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java
index 4938ec4b81..4938ec4b81 100644
--- a/uitest/src/com/vaadin/tests/components/table/ItemClickEventsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java
index edeb358c08..edeb358c08 100644
--- a/uitest/src/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java
diff --git a/uitest/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java
index 25a3139489..25a3139489 100644
--- a/uitest/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/LeftColumnAlignmentTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/LeftColumnAlignmentTest.java
index 3d613fd726..3d613fd726 100644
--- a/uitest/src/com/vaadin/tests/components/table/LeftColumnAlignmentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/LeftColumnAlignmentTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/LongMultiselectTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java
index e9f3bbb355..e9f3bbb355 100644
--- a/uitest/src/com/vaadin/tests/components/table/LongMultiselectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/MemoryLeakTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java
index b254d27b58..b254d27b58 100644
--- a/uitest/src/com/vaadin/tests/components/table/MemoryLeakTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java b/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java
index 2b053a6d1c..2b053a6d1c 100644
--- a/uitest/src/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java
diff --git a/uitest/src/com/vaadin/tests/components/table/ReloadWidgetsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java
index c92e00ab29..c92e00ab29 100644
--- a/uitest/src/com/vaadin/tests/components/table/ReloadWidgetsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java
index 504957e773..504957e773 100644
--- a/uitest/src/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SelectAllRowsShiftFirstTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsShiftFirstTest.java
index 28cf9b0718..28cf9b0718 100644
--- a/uitest/src/com/vaadin/tests/components/table/SelectAllRowsShiftFirstTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsShiftFirstTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SelectAllRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java
index 175cbac9d5..175cbac9d5 100644
--- a/uitest/src/com/vaadin/tests/components/table/SelectAllRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SelectableEditableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SelectableEditableTest.java
index 8b5b54cfaa..8b5b54cfaa 100644
--- a/uitest/src/com/vaadin/tests/components/table/SelectableEditableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SelectableEditableTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java
index 8102f82834..8102f82834 100644
--- a/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnlyTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnlyTest.java
index ebf53e9a6d..ebf53e9a6d 100644
--- a/uitest/src/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnlyTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnlyTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SortLabelsInTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java
index 54b5cad9b2..54b5cad9b2 100644
--- a/uitest/src/com/vaadin/tests/components/table/SortLabelsInTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/SortableHeaderStylesTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java
index 060b3a661a..060b3a661a 100644
--- a/uitest/src/com/vaadin/tests/components/table/SortableHeaderStylesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableAfterRemovingExpandRatiosTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatiosTest.java
index 58628a9d56..58628a9d56 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableAfterRemovingExpandRatiosTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatiosTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableBlurFocusTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java
index e5d07abc22..e5d07abc22 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableBlurFocusTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableCacheMinimizingOnFetchRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableCacheMinimizingOnFetchRowsTest.java
index edb0f3851a..edb0f3851a 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableCacheMinimizingOnFetchRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableCacheMinimizingOnFetchRowsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableChildMeasurementHintTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableChildMeasurementHintTest.java
index 8202b06362..8202b06362 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableChildMeasurementHintTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableChildMeasurementHintTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java
index 4a9d17c02d..4a9d17c02d 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java
index e42f86a975..e42f86a975 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableColumnResizeContentsWidthIE8Test.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthIE8Test.java
index 3de2ceb200..3de2ceb200 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableColumnResizeContentsWidthIE8Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthIE8Test.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java
index 9072d13263..9072d13263 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java
index 9c49b3d0b6..9c49b3d0b6 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java
index 558098e2f1..558098e2f1 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableDragColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java
index bd2d2ad28b..bd2d2ad28b 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableDragColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java
index 82a66eba07..82a66eba07 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java
index 074958d671..074958d671 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java
index 555a38a91e..555a38a91e 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java
index ea730ea30e..ea730ea30e 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java
index 30bddc2666..30bddc2666 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableMoveFocusWithSelectionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableNavigationPageDownTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java
index 4ab42a5f94..4ab42a5f94 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableNavigationPageDownTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java
index 5fde9c385e..5fde9c385e 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCallsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCallsTest.java
index 968b742aa9..968b742aa9 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCallsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCallsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java
index 4ca3ed406b..4ca3ed406b 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableRequiredIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRequiredIndicatorTest.java
index b94ddaee45..b94ddaee45 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableRequiredIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRequiredIndicatorTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableRowHeight2Test.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java
index 7074225311..7074225311 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableRowHeight2Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java
index 0fad02b410..0fad02b410 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableScrollAfterAddRowTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollAfterAddRowTest.java
index d390b57823..d390b57823 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableScrollAfterAddRowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollAfterAddRowTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java
index b2fde31b93..b2fde31b93 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableScrollingWithSQLContainerTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainerTest.java
index 01f75f7875..01f75f7875 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableScrollingWithSQLContainerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainerTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java
index d914689f63..d914689f63 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java
index 1745c580c2..1745c580c2 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableSizeInTabsheetTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableSizeInTabsheetTest.java
index a984ed81e5..a984ed81e5 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableSizeInTabsheetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableSizeInTabsheetTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableSortingIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java
index 8453f5d67f..8453f5d67f 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableSortingIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java
index 57ebfb7040..57ebfb7040 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidthTest.java
index c89678d846..c89678d846 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidthTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableTooManyColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableTooManyColumnsTest.java
index 2244365e00..2244365e00 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableTooManyColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableTooManyColumnsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdateTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableVisibleColumnsUpdateTest.java
index 060b79f65f..060b79f65f 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdateTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableVisibleColumnsUpdateTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableWidthItemRemoveTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableWidthItemRemoveTest.java
index f96641be4c..f96641be4c 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableWidthItemRemoveTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableWidthItemRemoveTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java
index 1eb5cad821..1eb5cad821 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TableWithPollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java
index 14994f8b02..14994f8b02 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableWithPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TextFieldRelativeWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TextFieldRelativeWidthTest.java
index 520ffa1aec..520ffa1aec 100644
--- a/uitest/src/com/vaadin/tests/components/table/TextFieldRelativeWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TextFieldRelativeWidthTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/TextFieldValueGoesMissingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TextFieldValueGoesMissingTest.java
index 387882b6ca..387882b6ca 100644
--- a/uitest/src/com/vaadin/tests/components/table/TextFieldValueGoesMissingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TextFieldValueGoesMissingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZoomingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZoomingTest.java
index f0325ed77b..f0325ed77b 100644
--- a/uitest/src/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZoomingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZoomingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java
index fcd73f541d..fcd73f541d 100644
--- a/uitest/src/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java
index 6d0b78debd..6d0b78debd 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheetTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheetTest.java
index 99c47b1703..99c47b1703 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheetTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClippedTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClippedTest.java
index 4d72f3e6fb..4d72f3e6fb 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClippedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClippedTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/HtmlInTabCaptionTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/HtmlInTabCaptionTest.java
index 41b7037b09..41b7037b09 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/HtmlInTabCaptionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/HtmlInTabCaptionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemoveTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemoveTest.java
index bffbc3ecdf..bffbc3ecdf 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemoveTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/NewSelectionAfterTabRemoveTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/PreventTabChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/PreventTabChangeTest.java
index dd0d8fb44f..dd0d8fb44f 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/PreventTabChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/PreventTabChangeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabBarWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabBarWidthTest.java
index a30a155c01..a30a155c01 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabBarWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabBarWidthTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationTest.java
index 65307f9492..65307f9492 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServerTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServerTest.java
index 64aee8768b..64aee8768b 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSelectionRevertedByServerTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetCloseTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetCloseTest.java
index 5314038d72..5314038d72 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetCloseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetCloseTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltipTest.java
index 5462ed2532..5462ed2532 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetErrorTooltipTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetFocusedTabTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusedTabTest.java
index 52003bbac9..52003bbac9 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetFocusedTabTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusedTabTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetFocusingTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusingTest.java
index 62948bed06..62948bed06 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetFocusingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetFocusingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParentTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParentTest.java
index 5070fd069c..5070fd069c 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetInDisabledParentTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanelTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanelTest.java
index 8070133bde..8070133bde 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanelTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetInSplitPanelTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabCloseTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabCloseTest.java
index 8247b436d0..8247b436d0 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabCloseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSheetScrollOnTabCloseTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabSpaceNotScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSpaceNotScrollTest.java
index c35248c1f4..c35248c1f4 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabSpaceNotScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabSpaceNotScrollTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpaceTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpaceTest.java
index 990f545697..990f545697 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpaceTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabsheetNotEnoughHorizontalSpaceTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetScrollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabsheetScrollingTest.java
index 1da42bb1ce..1da42bb1ce 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetScrollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/TabsheetScrollingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/VetoTabChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/VetoTabChangeTest.java
index a30299f683..a30299f683 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/VetoTabChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/VetoTabChangeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java b/uitest/src/test/java/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java
index 6365d00735..6365d00735 100644
--- a/uitest/src/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/AutomaticImmediateTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/AutomaticImmediateTest.java
index 4d750d183f..4d750d183f 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/AutomaticImmediateTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/AutomaticImmediateTest.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/EnumTextFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/EnumTextFieldTest.java
index fe26fb7aad..fe26fb7aad 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/EnumTextFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/EnumTextFieldTest.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/InputPromptGetTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/InputPromptGetTextTest.java
index 3128ae3917..3128ae3917 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/InputPromptGetTextTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/InputPromptGetTextTest.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java
index 03f490c73c..03f490c73c 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java
index c6ed6c1a58..c6ed6c1a58 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldEmptyingPromptTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/TextFieldEmptyingPromptTest.java
index f4fa5d0dc5..f4fa5d0dc5 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldEmptyingPromptTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/TextFieldEmptyingPromptTest.java
diff --git a/uitest/src/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogsTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogsTest.java
index 66b0df5ff4..66b0df5ff4 100644
--- a/uitest/src/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/TextFieldTruncatesUnderscoresInModalDialogsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/DndTreeTargetDetailsTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/DndTreeTargetDetailsTest.java
index c1b77df5e9..c1b77df5e9 100644
--- a/uitest/src/com/vaadin/tests/components/tree/DndTreeTargetDetailsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/DndTreeTargetDetailsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/SelectItemAfterRemoveTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/SelectItemAfterRemoveTest.java
index b048e185ea..b048e185ea 100644
--- a/uitest/src/com/vaadin/tests/components/tree/SelectItemAfterRemoveTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/SelectItemAfterRemoveTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeContextMenuAndIconsTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeContextMenuAndIconsTest.java
index 81d906bec3..81d906bec3 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeContextMenuAndIconsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeContextMenuAndIconsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java
index 351eda6c90..351eda6c90 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeItemClickListeningTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemClickListeningTest.java
index 2567fdb16d..2567fdb16d 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeItemClickListeningTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemClickListeningTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeItemDoubleClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemDoubleClickTest.java
index 95a3f02d60..95a3f02d60 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeItemDoubleClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemDoubleClickTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediateTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediateTest.java
index 2fb35b1680..2fb35b1680 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediateTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediateTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNoneTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNoneTest.java
index 98f1896b82..98f1896b82 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNoneTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNoneTest.java
diff --git a/uitest/src/com/vaadin/tests/components/tree/TreeScrollingOnRightClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClickTest.java
index b8715ed505..b8715ed505 100644
--- a/uitest/src/com/vaadin/tests/components/tree/TreeScrollingOnRightClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClickTest.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java
index e4d97b9de1..e4d97b9de1 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/MinimalWidthColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/MinimalWidthColumnsTest.java
index 46c2f397b6..46c2f397b6 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/MinimalWidthColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/MinimalWidthColumnsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java
index f767e5fd52..f767e5fd52 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java
index 849d19cafa..849d19cafa 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java
index 0831232df7..0831232df7 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java
index d88c6ba7ca..d88c6ba7ca 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java
index 5a55df581c..5a55df581c 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableRowGeneratorTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowGeneratorTest.java
index 84a2f7bbb3..84a2f7bbb3 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableRowGeneratorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowGeneratorTest.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableRowHeaderModeTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderModeTest.java
index 0215c14aef..0215c14aef 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableRowHeaderModeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderModeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableRowIconsTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowIconsTest.java
index 2e299d62ea..2e299d62ea 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableRowIconsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableRowIconsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java
index a17559cc81..a17559cc81 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java
index 760d2f39ea..760d2f39ea 100644
--- a/uitest/src/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/ComponentIncludedInCustomWidgetsetTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/ComponentIncludedInCustomWidgetsetTest.java
index 4bab0e5237..4bab0e5237 100644
--- a/uitest/src/com/vaadin/tests/components/ui/ComponentIncludedInCustomWidgetsetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/ComponentIncludedInCustomWidgetsetTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetsetTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetsetTest.java
index 429bcc0afc..429bcc0afc 100644
--- a/uitest/src/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetsetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/ComponentMissingFromDefaultWidgetsetTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/CurrentUiRetainedTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/CurrentUiRetainedTest.java
index d4e1ecb5ce..d4e1ecb5ce 100644
--- a/uitest/src/com/vaadin/tests/components/ui/CurrentUiRetainedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/CurrentUiRetainedTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/DynamicViewportEmptyTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/DynamicViewportEmptyTest.java
index 55466130ad..55466130ad 100644
--- a/uitest/src/com/vaadin/tests/components/ui/DynamicViewportEmptyTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/DynamicViewportEmptyTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/DynamicViewportTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/DynamicViewportTest.java
index f1d9efdbd1..f1d9efdbd1 100644
--- a/uitest/src/com/vaadin/tests/components/ui/DynamicViewportTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/DynamicViewportTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/InitialFragmentEventTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/InitialFragmentEventTest.java
index f52797dd63..f52797dd63 100644
--- a/uitest/src/com/vaadin/tests/components/ui/InitialFragmentEventTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/InitialFragmentEventTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/InitiallyEmptyFragmentTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/InitiallyEmptyFragmentTest.java
index fc948ab3db..fc948ab3db 100644
--- a/uitest/src/com/vaadin/tests/components/ui/InitiallyEmptyFragmentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/InitiallyEmptyFragmentTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/InvalidViewportTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/InvalidViewportTest.java
index 9d0aac49f7..9d0aac49f7 100644
--- a/uitest/src/com/vaadin/tests/components/ui/InvalidViewportTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/InvalidViewportTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/PollListeningTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/PollListeningTest.java
index 5770570ed1..5770570ed1 100644
--- a/uitest/src/com/vaadin/tests/components/ui/PollListeningTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/PollListeningTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/RpcInvocationHandlerToStringTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/RpcInvocationHandlerToStringTest.java
index 10a297d47b..10a297d47b 100644
--- a/uitest/src/com/vaadin/tests/components/ui/RpcInvocationHandlerToStringTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/RpcInvocationHandlerToStringTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/StaticViewportTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/StaticViewportTest.java
index 61b3c944c9..61b3c944c9 100644
--- a/uitest/src/com/vaadin/tests/components/ui/StaticViewportTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/StaticViewportTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java
index 43422feb58..43422feb58 100644
--- a/uitest/src/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java
index 5de903e8d4..5de903e8d4 100644
--- a/uitest/src/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java
index b5440b8f76..b5440b8f76 100644
--- a/uitest/src/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIAccessExceptionHandlingTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessExceptionHandlingTest.java
index b49de55a56..b49de55a56 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIAccessExceptionHandlingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessExceptionHandlingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIAccessTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessTest.java
index 0e37aa36fb..0e37aa36fb 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIAccessTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIAutoGeneratedStyleNameTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIAutoGeneratedStyleNameTest.java
index 73e0a7f6b9..73e0a7f6b9 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIAutoGeneratedStyleNameTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIAutoGeneratedStyleNameTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIInitBrowserDetailsTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitBrowserDetailsTest.java
index 1e69662935..1e69662935 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIInitBrowserDetailsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitBrowserDetailsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIInitExceptionTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitExceptionTest.java
index d002642a74..d002642a74 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIInitExceptionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitExceptionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIPollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java
index c4a41d135a..c4a41d135a 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIRefreshTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIRefreshTest.java
index 7d701f4ae0..7d701f4ae0 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIRefreshTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIRefreshTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UISerializationTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UISerializationTest.java
index 649f48c9ce..649f48c9ce 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UISerializationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UISerializationTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UITabIndexTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UITabIndexTest.java
index 390907ee8a..390907ee8a 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UITabIndexTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UITabIndexTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabsTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIsInMultipleTabsTest.java
index e703deb634..e703deb634 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIsInMultipleTabsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UiDependenciesInHtmlTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UiDependenciesInHtmlTest.java
index 188a0aea3e..188a0aea3e 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UiDependenciesInHtmlTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UiDependenciesInHtmlTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java
index 661db179e7..661db179e7 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UnnecessaryPaddingInResponsiveUITest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/UriFragmentTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UriFragmentTest.java
index e7fbf4f7ec..e7fbf4f7ec 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UriFragmentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UriFragmentTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/VaadinFinderLocatorUISearchTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/VaadinFinderLocatorUISearchTest.java
index 37766dd060..37766dd060 100644
--- a/uitest/src/com/vaadin/tests/components/ui/VaadinFinderLocatorUISearchTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/VaadinFinderLocatorUISearchTest.java
diff --git a/uitest/src/com/vaadin/tests/components/ui/WindowAndUIShortcutsTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/WindowAndUIShortcutsTest.java
index 93324f0792..93324f0792 100644
--- a/uitest/src/com/vaadin/tests/components/ui/WindowAndUIShortcutsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/WindowAndUIShortcutsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/BaseThemeTest.java b/uitest/src/test/java/com/vaadin/tests/components/uitest/BaseThemeTest.java
index 6a7174bf99..6a7174bf99 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/BaseThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/uitest/BaseThemeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/ChameleonThemeTest.java b/uitest/src/test/java/com/vaadin/tests/components/uitest/ChameleonThemeTest.java
index 8c4349ad5f..8c4349ad5f 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/ChameleonThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/uitest/ChameleonThemeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/LiferayThemeTest.java b/uitest/src/test/java/com/vaadin/tests/components/uitest/LiferayThemeTest.java
index 47c4c1baae..47c4c1baae 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/LiferayThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/uitest/LiferayThemeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/ReindeerThemeTest.java b/uitest/src/test/java/com/vaadin/tests/components/uitest/ReindeerThemeTest.java
index cdeb4b0606..cdeb4b0606 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/ReindeerThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/uitest/ReindeerThemeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/RunoThemeTest.java b/uitest/src/test/java/com/vaadin/tests/components/uitest/RunoThemeTest.java
index 073ab27566..073ab27566 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/RunoThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/uitest/RunoThemeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/ThemeTest.java b/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java
index 86847fc28e..86847fc28e 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/ThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/uitest/UIScrollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/uitest/UIScrollingTest.java
index cf6a6ac821..cf6a6ac821 100644
--- a/uitest/src/com/vaadin/tests/components/uitest/UIScrollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/uitest/UIScrollingTest.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/DisabledUploadButtonTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/DisabledUploadButtonTest.java
index cc97b4d7d1..cc97b4d7d1 100644
--- a/uitest/src/com/vaadin/tests/components/upload/DisabledUploadButtonTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/DisabledUploadButtonTest.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/TestFileUploadTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/TestFileUploadTest.java
index f1d5432344..f1d5432344 100644
--- a/uitest/src/com/vaadin/tests/components/upload/TestFileUploadTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/TestFileUploadTest.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java
index a0d6d471fb..a0d6d471fb 100644
--- a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java
index c22e416a25..c22e416a25 100644
--- a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java
index 0ab4fbbc7e..0ab4fbbc7e 100644
--- a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthTest.java
index b2a29c92e3..b2a29c92e3 100644
--- a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthTest.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthValoTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthValoTest.java
index 9d8fe6ba9e..9d8fe6ba9e 100644
--- a/uitest/src/com/vaadin/tests/components/upload/UploadImmediateButtonWidthValoTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthValoTest.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/UploadNoSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadNoSelectionTest.java
index 30dbefc06b..30dbefc06b 100644
--- a/uitest/src/com/vaadin/tests/components/upload/UploadNoSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadNoSelectionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/upload/UploadTitleWithTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadTitleWithTooltipTest.java
index 54ccf993ff..54ccf993ff 100644
--- a/uitest/src/com/vaadin/tests/components/upload/UploadTitleWithTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadTitleWithTooltipTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/BackspaceKeyWithModalOpenedTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpenedTest.java
index e18b5b043a..e18b5b043a 100644
--- a/uitest/src/com/vaadin/tests/components/window/BackspaceKeyWithModalOpenedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/BackspaceKeyWithModalOpenedTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/BottomComponentScrollsUpTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/BottomComponentScrollsUpTest.java
index 3d0da2677b..3d0da2677b 100644
--- a/uitest/src/com/vaadin/tests/components/window/BottomComponentScrollsUpTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/BottomComponentScrollsUpTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/CloseModalSubWindowTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/CloseModalSubWindowTest.java
index aec0a7c9df..aec0a7c9df 100644
--- a/uitest/src/com/vaadin/tests/components/window/CloseModalSubWindowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/CloseModalSubWindowTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/CloseSubWindowTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/CloseSubWindowTest.java
index 48ac923082..48ac923082 100644
--- a/uitest/src/com/vaadin/tests/components/window/CloseSubWindowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/CloseSubWindowTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java
index a80938ba32..a80938ba32 100644
--- a/uitest/src/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/ExtraWindowShownTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/ExtraWindowShownTest.java
index abbc7ddac0..abbc7ddac0 100644
--- a/uitest/src/com/vaadin/tests/components/window/ExtraWindowShownTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/ExtraWindowShownTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/ExtraWindowShownWaiAriaTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/ExtraWindowShownWaiAriaTest.java
index 4ec1dc5c98..4ec1dc5c98 100644
--- a/uitest/src/com/vaadin/tests/components/window/ExtraWindowShownWaiAriaTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/ExtraWindowShownWaiAriaTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/GridInWindowTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/GridInWindowTest.java
index 301a7c60e4..301a7c60e4 100644
--- a/uitest/src/com/vaadin/tests/components/window/GridInWindowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/GridInWindowTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/MaximizedWindowOrderTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/MaximizedWindowOrderTest.java
index 5063c84658..5063c84658 100644
--- a/uitest/src/com/vaadin/tests/components/window/MaximizedWindowOrderTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/MaximizedWindowOrderTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/ModalWindowFocusTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/ModalWindowFocusTest.java
index 75b6eaa15c..75b6eaa15c 100644
--- a/uitest/src/com/vaadin/tests/components/window/ModalWindowFocusTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/ModalWindowFocusTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/MoveToTopTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/MoveToTopTest.java
index 1700100ae7..1700100ae7 100644
--- a/uitest/src/com/vaadin/tests/components/window/MoveToTopTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/MoveToTopTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java
index 5dba1c3285..5dba1c3285 100644
--- a/uitest/src/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/RepaintWindowContentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/RepaintWindowContentsTest.java
index d097aa183c..d097aa183c 100644
--- a/uitest/src/com/vaadin/tests/components/window/RepaintWindowContentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/RepaintWindowContentsTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpenedTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpenedTest.java
index 9a3ccb3b31..9a3ccb3b31 100644
--- a/uitest/src/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpenedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/ScrollingBodyElementWithModalOpenedTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/SubWindowWithUndefinedHeightTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeightTest.java
index ec86f62a7c..ec86f62a7c 100644
--- a/uitest/src/com/vaadin/tests/components/window/SubWindowWithUndefinedHeightTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeightTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/SubWindowsTextSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/SubWindowsTextSelectionTest.java
index e0cc240d6d..e0cc240d6d 100644
--- a/uitest/src/com/vaadin/tests/components/window/SubWindowsTextSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/SubWindowsTextSelectionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/TestTooSmallSubwindowSizeTest.java
index cb7c0bd504..cb7c0bd504 100644
--- a/uitest/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/TestTooSmallSubwindowSizeTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/UncloseableWindowCloseShortcutTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/UncloseableWindowCloseShortcutTest.java
index 4574e7b3eb..4574e7b3eb 100644
--- a/uitest/src/com/vaadin/tests/components/window/UncloseableWindowCloseShortcutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/UncloseableWindowCloseShortcutTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContentTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContentTest.java
index 057a43f495..057a43f495 100644
--- a/uitest/src/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContentTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowBGColorChameleonIE8Test.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowBGColorChameleonIE8Test.java
index 4e9bffe3e8..4e9bffe3e8 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowBGColorChameleonIE8Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowBGColorChameleonIE8Test.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowCaptionTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowCaptionTest.java
index f580d7c501..f580d7c501 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowCaptionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowCaptionTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowInUiWithNoContentTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowInUiWithNoContentTest.java
index ab247be25b..ab247be25b 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowInUiWithNoContentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowInUiWithNoContentTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowMoveListenerTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowMoveListenerTest.java
index 8d74e3a259..8d74e3a259 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowMoveListenerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowMoveListenerTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowShadowTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowShadowTest.java
index 3cc310eeb4..3cc310eeb4 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowShadowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowShadowTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandlerTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandlerTest.java
index 755a4242ed..755a4242ed 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandlerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandlerTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowWithIconTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowWithIconTest.java
index 25c7f57238..25c7f57238 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowWithIconTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowWithIconTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowWithInvalidCloseListenerTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowWithInvalidCloseListenerTest.java
index b77eced9cc..b77eced9cc 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowWithInvalidCloseListenerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowWithInvalidCloseListenerTest.java
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowZIndexTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowZIndexTest.java
index dc2dfca4f0..dc2dfca4f0 100644
--- a/uitest/src/com/vaadin/tests/components/window/WindowZIndexTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowZIndexTest.java
diff --git a/uitest/src/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java b/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java
index 172d83e645..172d83e645 100644
--- a/uitest/src/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java
diff --git a/uitest/src/com/vaadin/tests/contextclick/AbstractContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/AbstractContextClickTest.java
index 7544caaf0a..7544caaf0a 100644
--- a/uitest/src/com/vaadin/tests/contextclick/AbstractContextClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/AbstractContextClickTest.java
diff --git a/uitest/src/com/vaadin/tests/contextclick/GridContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java
index 6ee7a89178..6ee7a89178 100644
--- a/uitest/src/com/vaadin/tests/contextclick/GridContextClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java
diff --git a/uitest/src/com/vaadin/tests/contextclick/ListenerAddAndRemoveTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/ListenerAddAndRemoveTest.java
index dd1d3ebd53..dd1d3ebd53 100644
--- a/uitest/src/com/vaadin/tests/contextclick/ListenerAddAndRemoveTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/ListenerAddAndRemoveTest.java
diff --git a/uitest/src/com/vaadin/tests/contextclick/TableContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTest.java
index bfd8862440..bfd8862440 100644
--- a/uitest/src/com/vaadin/tests/contextclick/TableContextClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTest.java
diff --git a/uitest/src/com/vaadin/tests/contextclick/TableContextClickTestBase.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java
index e3f4647c33..e3f4647c33 100644
--- a/uitest/src/com/vaadin/tests/contextclick/TableContextClickTestBase.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java
diff --git a/uitest/src/com/vaadin/tests/contextclick/TreeContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java
index 180349af63..180349af63 100644
--- a/uitest/src/com/vaadin/tests/contextclick/TreeContextClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java
diff --git a/uitest/src/com/vaadin/tests/contextclick/TreeTableContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TreeTableContextClickTest.java
index f91750ce91..f91750ce91 100644
--- a/uitest/src/com/vaadin/tests/contextclick/TreeTableContextClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TreeTableContextClickTest.java
diff --git a/uitest/src/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java b/uitest/src/test/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java
index 886e96700a..886e96700a 100644
--- a/uitest/src/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java
diff --git a/uitest/src/com/vaadin/tests/customelements/CustomProgressBarElement.java b/uitest/src/test/java/com/vaadin/tests/customelements/CustomProgressBarElement.java
index a669d32f2e..a669d32f2e 100644
--- a/uitest/src/com/vaadin/tests/customelements/CustomProgressBarElement.java
+++ b/uitest/src/test/java/com/vaadin/tests/customelements/CustomProgressBarElement.java
diff --git a/uitest/src/com/vaadin/tests/dd/DDInterruptTest.java b/uitest/src/test/java/com/vaadin/tests/dd/DDInterruptTest.java
index e078bc4665..e078bc4665 100644
--- a/uitest/src/com/vaadin/tests/dd/DDInterruptTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/dd/DDInterruptTest.java
diff --git a/uitest/src/com/vaadin/tests/dd/DnDOnSubtreeTest.java b/uitest/src/test/java/com/vaadin/tests/dd/DnDOnSubtreeTest.java
index 2bceb905c4..2bceb905c4 100644
--- a/uitest/src/com/vaadin/tests/dd/DnDOnSubtreeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/dd/DnDOnSubtreeTest.java
diff --git a/uitest/src/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayoutsTest.java b/uitest/src/test/java/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayoutsTest.java
index d4f027a2c8..d4f027a2c8 100644
--- a/uitest/src/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayoutsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/debug/HierarchyAfterAnalyzeLayoutsTest.java
diff --git a/uitest/src/com/vaadin/tests/debug/PreserveCustomDebugSectionOpenTest.java b/uitest/src/test/java/com/vaadin/tests/debug/PreserveCustomDebugSectionOpenTest.java
index 01b73ded92..01b73ded92 100644
--- a/uitest/src/com/vaadin/tests/debug/PreserveCustomDebugSectionOpenTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/debug/PreserveCustomDebugSectionOpenTest.java
diff --git a/uitest/src/com/vaadin/tests/debug/ProfilerZeroOverheadTest.java b/uitest/src/test/java/com/vaadin/tests/debug/ProfilerZeroOverheadTest.java
index 659823e49a..659823e49a 100644
--- a/uitest/src/com/vaadin/tests/debug/ProfilerZeroOverheadTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/debug/ProfilerZeroOverheadTest.java
diff --git a/uitest/src/com/vaadin/tests/debug/PushVersionInfoTest.java b/uitest/src/test/java/com/vaadin/tests/debug/PushVersionInfoTest.java
index d0eee99009..d0eee99009 100644
--- a/uitest/src/com/vaadin/tests/debug/PushVersionInfoTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/debug/PushVersionInfoTest.java
diff --git a/uitest/src/com/vaadin/tests/extensions/IframeIsOpenedInNonIOSTest.java b/uitest/src/test/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOSTest.java
index e5614b60a4..e5614b60a4 100644
--- a/uitest/src/com/vaadin/tests/extensions/IframeIsOpenedInNonIOSTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOSTest.java
diff --git a/uitest/src/com/vaadin/tests/extensions/ResponsiveLayoutUpdateTest.java b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveLayoutUpdateTest.java
index cd0a92d339..cd0a92d339 100644
--- a/uitest/src/com/vaadin/tests/extensions/ResponsiveLayoutUpdateTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveLayoutUpdateTest.java
diff --git a/uitest/src/com/vaadin/tests/extensions/ResponsiveUITest.java b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveUITest.java
index f7cbd9477c..f7cbd9477c 100644
--- a/uitest/src/com/vaadin/tests/extensions/ResponsiveUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveUITest.java
diff --git a/uitest/src/com/vaadin/tests/extensions/ResponsiveWidthAndHeightTest.java b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeightTest.java
index 8086457c24..8086457c24 100644
--- a/uitest/src/com/vaadin/tests/extensions/ResponsiveWidthAndHeightTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWidthAndHeightTest.java
diff --git a/uitest/src/com/vaadin/tests/extensions/ResponsiveWithCrossDomainStylesTest.java b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWithCrossDomainStylesTest.java
index 4089618635..4089618635 100644
--- a/uitest/src/com/vaadin/tests/extensions/ResponsiveWithCrossDomainStylesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/extensions/ResponsiveWithCrossDomainStylesTest.java
diff --git a/uitest/src/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java
index 0d0b388541..0d0b388541 100644
--- a/uitest/src/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/extensions/SetThemeAndResponsiveLayoutTest.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java
index df250357d8..df250357d8 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java
index 12bccdd065..12bccdd065 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java
index 86441b09f9..86441b09f9 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java
index 2562412480..2562412480 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/BooleanTextFieldTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BooleanTextFieldTest.java
index 7a74deb2e0..7a74deb2e0 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/BooleanTextFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BooleanTextFieldTest.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/CommitHandlerFailuresTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/CommitHandlerFailuresTest.java
index 545c9c2e71..545c9c2e71 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/CommitHandlerFailuresTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/CommitHandlerFailuresTest.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionErrorTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionErrorTest.java
index f5c751cd49..f5c751cd49 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionErrorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionErrorTest.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/DateFormTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java
index 32d8bcb603..32d8bcb603 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/DateFormTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/FieldGroupDiscardTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/FieldGroupDiscardTest.java
index 7d8beb2106..7d8beb2106 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/FieldGroupDiscardTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/FieldGroupDiscardTest.java
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java
index 14527cff04..14527cff04 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java
diff --git a/uitest/src/com/vaadin/tests/fields/TabIndexesTest.java b/uitest/src/test/java/com/vaadin/tests/fields/TabIndexesTest.java
index 6bd456c7e2..6bd456c7e2 100644
--- a/uitest/src/com/vaadin/tests/fields/TabIndexesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fields/TabIndexesTest.java
diff --git a/uitest/src/com/vaadin/tests/fonticon/FontIconsTest.java b/uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java
index 4cfcd8fa59..4cfcd8fa59 100644
--- a/uitest/src/com/vaadin/tests/fonticon/FontIconsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java
diff --git a/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/AbstractIntegrationTest.java
index f035ef35f6..f035ef35f6 100644
--- a/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/AbstractIntegrationTest.java
diff --git a/uitest/src/com/vaadin/tests/integration/AbstractServletIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
index eb1b714776..eb1b714776 100644
--- a/uitest/src/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
diff --git a/uitest/src/com/vaadin/tests/integration/JSPIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java
index 13503966ec..13503966ec 100644
--- a/uitest/src/com/vaadin/tests/integration/JSPIntegrationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/JSPIntegrationTest.java
diff --git a/uitest/src/com/vaadin/tests/integration/LongPollingProxyServerTest.java b/uitest/src/test/java/com/vaadin/tests/integration/LongPollingProxyServerTest.java
index 16c599641b..16c599641b 100644
--- a/uitest/src/com/vaadin/tests/integration/LongPollingProxyServerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/LongPollingProxyServerTest.java
diff --git a/uitest/src/com/vaadin/tests/integration/ParameterizedTB3Runner.java b/uitest/src/test/java/com/vaadin/tests/integration/ParameterizedTB3Runner.java
index b051fb51db..b051fb51db 100644
--- a/uitest/src/com/vaadin/tests/integration/ParameterizedTB3Runner.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/ParameterizedTB3Runner.java
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationDefaultPushUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUITest.java
index 2afc33cf82..2afc33cf82 100644
--- a/uitest/src/com/vaadin/tests/integration/ServletIntegrationDefaultPushUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUITest.java
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationJSR356WebsocketUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationJSR356WebsocketUITest.java
index f118d38158..f118d38158 100644
--- a/uitest/src/com/vaadin/tests/integration/ServletIntegrationJSR356WebsocketUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationJSR356WebsocketUITest.java
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationLongPollingUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUITest.java
index 92307dbbaf..92307dbbaf 100644
--- a/uitest/src/com/vaadin/tests/integration/ServletIntegrationLongPollingUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUITest.java
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java
index 1f42b10e66..1f42b10e66 100644
--- a/uitest/src/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationUITest.java
index bebe01578a..bebe01578a 100644
--- a/uitest/src/com/vaadin/tests/integration/ServletIntegrationUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationUITest.java
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java
index d4fc3aef17..d4fc3aef17 100644
--- a/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java
diff --git a/uitest/src/com/vaadin/tests/integration/WebSpherePortalIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/WebSpherePortalIntegrationTest.java
index c8207efe9d..c8207efe9d 100644
--- a/uitest/src/com/vaadin/tests/integration/WebSpherePortalIntegrationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/WebSpherePortalIntegrationTest.java
diff --git a/uitest/src/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdateTest.java b/uitest/src/test/java/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdateTest.java
index 8c71d460bb..8c71d460bb 100644
--- a/uitest/src/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdateTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdateTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/CssLayoutAbsoluteUrlTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/CssLayoutAbsoluteUrlTest.java
index 1821acdbfa..1821acdbfa 100644
--- a/uitest/src/com/vaadin/tests/layouts/CssLayoutAbsoluteUrlTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/CssLayoutAbsoluteUrlTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/HorizontalLayoutAndCaretPositionTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/HorizontalLayoutAndCaretPositionTest.java
index df42e292e3..df42e292e3 100644
--- a/uitest/src/com/vaadin/tests/layouts/HorizontalLayoutAndCaretPositionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/HorizontalLayoutAndCaretPositionTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeakTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeakTest.java
index 33adb622c0..33adb622c0 100644
--- a/uitest/src/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeakTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeakTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayoutTest.java
index 340c627dd4..340c627dd4 100644
--- a/uitest/src/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayoutTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListenersTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/TestLayoutClickListenersTest.java
index ea47ab4620..ea47ab4620 100644
--- a/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListenersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/TestLayoutClickListenersTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/customlayout/DefaultLocationInCustomLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/customlayout/DefaultLocationInCustomLayoutTest.java
index f4ac7419f7..f4ac7419f7 100644
--- a/uitest/src/com/vaadin/tests/layouts/customlayout/DefaultLocationInCustomLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/customlayout/DefaultLocationInCustomLayoutTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponentTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponentTest.java
index 0fab64989a..0fab64989a 100644
--- a/uitest/src/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponentTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java
index ba3d0f06f1..ba3d0f06f1 100644
--- a/uitest/src/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumnsTest.java
index f2b86fb69b..f2b86fb69b 100644
--- a/uitest/src/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridSpanEmptyColumnsTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMoveTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMoveTest.java
index 786e47cef1..786e47cef1 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMoveTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMoveTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAlignmentTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseAlignmentTest.java
index 9dd90a4031..9dd90a4031 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseAlignmentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseAlignmentTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseCaptionTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseCaptionTest.java
index ed20657e2a..ed20657e2a 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseCaptionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseCaptionTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseComponentSizingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseComponentSizingTest.java
index 252cfcd359..252cfcd359 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseComponentSizingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseComponentSizingTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseIconTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseIconTest.java
index 9322672eae..9322672eae 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseIconTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseIconTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutExpandTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutExpandTest.java
index 036b053fb5..036b053fb5 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutExpandTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutExpandTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutMarginSpacingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutMarginSpacingTest.java
index 46edfec986..46edfec986 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutMarginSpacingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutMarginSpacingTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutRegErrorTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutRegErrorTest.java
index 61d6f8a362..61d6f8a362 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutRegErrorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutRegErrorTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutSizingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutSizingTest.java
index e97353c989..e97353c989 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/BaseLayoutSizingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutSizingTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMoveTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMoveTest.java
index f83a6ccf67..f83a6ccf67 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMoveTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMoveTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAlignmentTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAlignmentTest.java
index cdc040930b..cdc040930b 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridAlignmentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAlignmentTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridCaptionTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridCaptionTest.java
index ab8046ebf3..ab8046ebf3 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridCaptionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridCaptionTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridComponentSizingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridComponentSizingTest.java
index 6572bd2a50..6572bd2a50 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridComponentSizingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridComponentSizingTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridIconTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIconTest.java
index 25a0faa88e..25a0faa88e 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridIconTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIconTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpandTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpandTest.java
index 2a49af52a9..2a49af52a9 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpandTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpandTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacingTest.java
index 516f3b088b..516f3b088b 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacingTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegErrorTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegErrorTest.java
index e377a7b0c4..e377a7b0c4 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegErrorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegErrorTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizingTest.java
index c8a48cd70c..c8a48cd70c 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizingTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMoveTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMoveTest.java
index 367664069d..367664069d 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMoveTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMoveTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HAlignmentTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HAlignmentTest.java
index 055ad8e607..055ad8e607 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HAlignmentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HAlignmentTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HCaptionTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HCaptionTest.java
index c10da9eefe..c10da9eefe 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HCaptionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HCaptionTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HComponentSizingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HComponentSizingTest.java
index 86aa330901..86aa330901 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HComponentSizingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HComponentSizingTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HIconTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HIconTest.java
index e01e1d1726..e01e1d1726 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HIconTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HIconTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutExpandTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutExpandTest.java
index f24abba9d2..f24abba9d2 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutExpandTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutExpandTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutMarginSpacingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutMarginSpacingTest.java
index 1abae12ce6..1abae12ce6 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutMarginSpacingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutMarginSpacingTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegErrorTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegErrorTest.java
index 673c08d4fa..673c08d4fa 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegErrorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegErrorTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutSizingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutSizingTest.java
index 5f4d52a5d5..5f4d52a5d5 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutSizingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutSizingTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VAddReplaceMoveTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VAddReplaceMoveTest.java
index 70f7237c96..70f7237c96 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VAddReplaceMoveTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VAddReplaceMoveTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VAlignmentTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VAlignmentTest.java
index f49787754c..f49787754c 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VAlignmentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VAlignmentTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VCaptionTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VCaptionTest.java
index 942736b286..942736b286 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VCaptionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VCaptionTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizingTest.java
index bef10a6a58..bef10a6a58 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizingTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VIconTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VIconTest.java
index 221bf2e2db..221bf2e2db 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VIconTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VIconTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpandTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpandTest.java
index 152e3f0b86..152e3f0b86 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpandTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpandTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutMarginSpacingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutMarginSpacingTest.java
index 89ffdf792f..89ffdf792f 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutMarginSpacingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutMarginSpacingTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java
index 7f803781fb..7f803781fb 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizingTest.java
index 519f8113f8..519f8113f8 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizingTest.java
diff --git a/uitest/src/com/vaadin/tests/navigator/NavigatorListenerModifiesListenersTest.java b/uitest/src/test/java/com/vaadin/tests/navigator/NavigatorListenerModifiesListenersTest.java
index d11ab790a8..d11ab790a8 100644
--- a/uitest/src/com/vaadin/tests/navigator/NavigatorListenerModifiesListenersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/navigator/NavigatorListenerModifiesListenersTest.java
diff --git a/uitest/src/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonActionTest.java b/uitest/src/test/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonActionTest.java
index 84abdca24b..84abdca24b 100644
--- a/uitest/src/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonActionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/navigator/NavigatorViewBlocksBackButtonActionTest.java
diff --git a/uitest/src/com/vaadin/tests/push/BarInUIDLTest.java b/uitest/src/test/java/com/vaadin/tests/push/BarInUIDLTest.java
index 7bd1de5803..7bd1de5803 100644
--- a/uitest/src/com/vaadin/tests/push/BarInUIDLTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/BarInUIDLTest.java
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushLongPollingTest.java b/uitest/src/test/java/com/vaadin/tests/push/BasicPushLongPollingTest.java
index a060d5a57a..a060d5a57a 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushLongPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/BasicPushLongPollingTest.java
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushStreamingTest.java b/uitest/src/test/java/com/vaadin/tests/push/BasicPushStreamingTest.java
index ceb0b28c76..ceb0b28c76 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushStreamingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/BasicPushStreamingTest.java
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushTest.java b/uitest/src/test/java/com/vaadin/tests/push/BasicPushTest.java
index 157e3f74ae..157e3f74ae 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/BasicPushTest.java
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushWebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketTest.java
index cd779a7318..cd779a7318 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushWebsocketTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketTest.java
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushWebsocketXhrTest.java b/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketXhrTest.java
index 430246d66a..430246d66a 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushWebsocketXhrTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketXhrTest.java
diff --git a/uitest/src/com/vaadin/tests/push/EnableDisablePushTest.java b/uitest/src/test/java/com/vaadin/tests/push/EnableDisablePushTest.java
index 654108f8f9..654108f8f9 100644
--- a/uitest/src/com/vaadin/tests/push/EnableDisablePushTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/EnableDisablePushTest.java
diff --git a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeLongPollingTest.java b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeLongPollingTest.java
index 13f601da7a..13f601da7a 100644
--- a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeLongPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeLongPollingTest.java
diff --git a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeStreamingTest.java b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeStreamingTest.java
index 4af6179e81..4af6179e81 100644
--- a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeStreamingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeStreamingTest.java
diff --git a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeTest.java b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeTest.java
index 5dc15f8fc6..5dc15f8fc6 100644
--- a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeTest.java
diff --git a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java
index 54775d572d..54775d572d 100644
--- a/uitest/src/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java
diff --git a/uitest/src/com/vaadin/tests/push/IdlePushChannelLongPollingTest.java b/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelLongPollingTest.java
index 143960f1b2..143960f1b2 100644
--- a/uitest/src/com/vaadin/tests/push/IdlePushChannelLongPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelLongPollingTest.java
diff --git a/uitest/src/com/vaadin/tests/push/IdlePushChannelStreamingTest.java b/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelStreamingTest.java
index c5a909385f..c5a909385f 100644
--- a/uitest/src/com/vaadin/tests/push/IdlePushChannelStreamingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelStreamingTest.java
diff --git a/uitest/src/com/vaadin/tests/push/IdlePushChannelTest.java b/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelTest.java
index 344f551f00..344f551f00 100644
--- a/uitest/src/com/vaadin/tests/push/IdlePushChannelTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelTest.java
diff --git a/uitest/src/com/vaadin/tests/push/IdlePushChannelWebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelWebsocketTest.java
index 7559d22264..7559d22264 100644
--- a/uitest/src/com/vaadin/tests/push/IdlePushChannelWebsocketTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelWebsocketTest.java
diff --git a/uitest/src/com/vaadin/tests/push/ManualLongPollingPushUITest.java b/uitest/src/test/java/com/vaadin/tests/push/ManualLongPollingPushUITest.java
index 096204ff75..096204ff75 100644
--- a/uitest/src/com/vaadin/tests/push/ManualLongPollingPushUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/ManualLongPollingPushUITest.java
diff --git a/uitest/src/com/vaadin/tests/push/PushConfigurationLongPollingTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationLongPollingTest.java
index 1d5ead7d98..1d5ead7d98 100644
--- a/uitest/src/com/vaadin/tests/push/PushConfigurationLongPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationLongPollingTest.java
diff --git a/uitest/src/com/vaadin/tests/push/PushConfigurationStreamingTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationStreamingTest.java
index 202db8d6b7..202db8d6b7 100644
--- a/uitest/src/com/vaadin/tests/push/PushConfigurationStreamingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationStreamingTest.java
diff --git a/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java
index 14ef9e1144..14ef9e1144 100644
--- a/uitest/src/com/vaadin/tests/push/PushConfigurationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java
diff --git a/uitest/src/com/vaadin/tests/push/PushConfigurationWebSocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationWebSocketTest.java
index 501d946fcc..501d946fcc 100644
--- a/uitest/src/com/vaadin/tests/push/PushConfigurationWebSocketTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationWebSocketTest.java
diff --git a/uitest/src/com/vaadin/tests/push/PushErrorHandlingTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushErrorHandlingTest.java
index 2683868db5..2683868db5 100644
--- a/uitest/src/com/vaadin/tests/push/PushErrorHandlingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushErrorHandlingTest.java
diff --git a/uitest/src/com/vaadin/tests/push/PushFromInitTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushFromInitTest.java
index fe7ebebef1..fe7ebebef1 100644
--- a/uitest/src/com/vaadin/tests/push/PushFromInitTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushFromInitTest.java
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeDataLongPollingTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushLargeDataLongPollingTest.java
index 23255aadea..23255aadea 100644
--- a/uitest/src/com/vaadin/tests/push/PushLargeDataLongPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushLargeDataLongPollingTest.java
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeDataStreamingTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushLargeDataStreamingTest.java
index 0c00cf116f..0c00cf116f 100644
--- a/uitest/src/com/vaadin/tests/push/PushLargeDataStreamingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushLargeDataStreamingTest.java
diff --git a/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushLargeDataWebsocketTest.java
index da4999799d..da4999799d 100644
--- a/uitest/src/com/vaadin/tests/push/PushLargeDataWebsocketTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushLargeDataWebsocketTest.java
diff --git a/uitest/src/com/vaadin/tests/push/PushWithPreserveOnRefreshTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushWithPreserveOnRefreshTest.java
index 3c532b2e55..3c532b2e55 100644
--- a/uitest/src/com/vaadin/tests/push/PushWithPreserveOnRefreshTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushWithPreserveOnRefreshTest.java
diff --git a/uitest/src/com/vaadin/tests/push/PushWithRequireJSTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushWithRequireJSTest.java
index 16bc753272..16bc753272 100644
--- a/uitest/src/com/vaadin/tests/push/PushWithRequireJSTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushWithRequireJSTest.java
diff --git a/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java b/uitest/src/test/java/com/vaadin/tests/push/ReconnectLongPollingTest.java
index 22d020b631..22d020b631 100644
--- a/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/ReconnectLongPollingTest.java
diff --git a/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java b/uitest/src/test/java/com/vaadin/tests/push/ReconnectStreamingTest.java
index 4a669e723c..4a669e723c 100755
--- a/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/ReconnectStreamingTest.java
diff --git a/uitest/src/com/vaadin/tests/push/ReconnectTest.java b/uitest/src/test/java/com/vaadin/tests/push/ReconnectTest.java
index 6a632f2667..6a632f2667 100644
--- a/uitest/src/com/vaadin/tests/push/ReconnectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/ReconnectTest.java
diff --git a/uitest/src/com/vaadin/tests/push/ReconnectWebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/ReconnectWebsocketTest.java
index bad00eba47..bad00eba47 100644
--- a/uitest/src/com/vaadin/tests/push/ReconnectWebsocketTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/ReconnectWebsocketTest.java
diff --git a/uitest/src/com/vaadin/tests/push/RefreshCloseConnectionTest.java b/uitest/src/test/java/com/vaadin/tests/push/RefreshCloseConnectionTest.java
index 47773b87b6..47773b87b6 100644
--- a/uitest/src/com/vaadin/tests/push/RefreshCloseConnectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/RefreshCloseConnectionTest.java
diff --git a/uitest/src/com/vaadin/tests/push/SendMultibyteCharactersLongPollingTest.java b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersLongPollingTest.java
index c00f95a950..c00f95a950 100644
--- a/uitest/src/com/vaadin/tests/push/SendMultibyteCharactersLongPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersLongPollingTest.java
diff --git a/uitest/src/com/vaadin/tests/push/SendMultibyteCharactersStreamingTest.java b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersStreamingTest.java
index bc1debb9da..bc1debb9da 100644
--- a/uitest/src/com/vaadin/tests/push/SendMultibyteCharactersStreamingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersStreamingTest.java
diff --git a/uitest/src/com/vaadin/tests/push/SendMultibyteCharactersTest.java b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersTest.java
index 95c03d9959..95c03d9959 100644
--- a/uitest/src/com/vaadin/tests/push/SendMultibyteCharactersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersTest.java
diff --git a/uitest/src/com/vaadin/tests/push/SendMultibyteCharactersWebSocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersWebSocketTest.java
index f9ae472b99..f9ae472b99 100644
--- a/uitest/src/com/vaadin/tests/push/SendMultibyteCharactersWebSocketTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersWebSocketTest.java
diff --git a/uitest/src/com/vaadin/tests/push/TogglePushTest.java b/uitest/src/test/java/com/vaadin/tests/push/TogglePushTest.java
index d93802125c..d93802125c 100644
--- a/uitest/src/com/vaadin/tests/push/TogglePushTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/TogglePushTest.java
diff --git a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUITest.java b/uitest/src/test/java/com/vaadin/tests/push/TrackMessageSizeUITest.java
index 35d0f0ad5f..35d0f0ad5f 100644
--- a/uitest/src/com/vaadin/tests/push/TrackMessageSizeUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/TrackMessageSizeUITest.java
diff --git a/uitest/src/com/vaadin/tests/requesthandlers/AppResource404Test.java b/uitest/src/test/java/com/vaadin/tests/requesthandlers/AppResource404Test.java
index f762573a09..f762573a09 100644
--- a/uitest/src/com/vaadin/tests/requesthandlers/AppResource404Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/requesthandlers/AppResource404Test.java
diff --git a/uitest/src/com/vaadin/tests/requesthandlers/CommunicationErrorTest.java b/uitest/src/test/java/com/vaadin/tests/requesthandlers/CommunicationErrorTest.java
index f295ec5ba3..f295ec5ba3 100644
--- a/uitest/src/com/vaadin/tests/requesthandlers/CommunicationErrorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/requesthandlers/CommunicationErrorTest.java
diff --git a/uitest/src/com/vaadin/tests/requesthandlers/UnsupportedBrowserHandlerUserAgents.java b/uitest/src/test/java/com/vaadin/tests/requesthandlers/UnsupportedBrowserHandlerUserAgents.java
index 1f2c4d37f2..1f2c4d37f2 100644
--- a/uitest/src/com/vaadin/tests/requesthandlers/UnsupportedBrowserHandlerUserAgents.java
+++ b/uitest/src/test/java/com/vaadin/tests/requesthandlers/UnsupportedBrowserHandlerUserAgents.java
diff --git a/uitest/src/com/vaadin/tests/resources/SpecialCharsInThemeResources.java b/uitest/src/test/java/com/vaadin/tests/resources/SpecialCharsInThemeResources.java
index e584ec73cc..e584ec73cc 100644
--- a/uitest/src/com/vaadin/tests/resources/SpecialCharsInThemeResources.java
+++ b/uitest/src/test/java/com/vaadin/tests/resources/SpecialCharsInThemeResources.java
diff --git a/uitest/src/com/vaadin/tests/serialization/EncodeResultDisplayTest.java b/uitest/src/test/java/com/vaadin/tests/serialization/EncodeResultDisplayTest.java
index 662a033745..662a033745 100644
--- a/uitest/src/com/vaadin/tests/serialization/EncodeResultDisplayTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/serialization/EncodeResultDisplayTest.java
diff --git a/uitest/src/com/vaadin/tests/serialization/GenericWidgetHandlingTest.java b/uitest/src/test/java/com/vaadin/tests/serialization/GenericWidgetHandlingTest.java
index 9c21ec1de4..9c21ec1de4 100644
--- a/uitest/src/com/vaadin/tests/serialization/GenericWidgetHandlingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/serialization/GenericWidgetHandlingTest.java
diff --git a/uitest/src/com/vaadin/tests/serialization/LegacySerializerUITest.java b/uitest/src/test/java/com/vaadin/tests/serialization/LegacySerializerUITest.java
index f3a5561e40..f3a5561e40 100644
--- a/uitest/src/com/vaadin/tests/serialization/LegacySerializerUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/serialization/LegacySerializerUITest.java
diff --git a/uitest/src/com/vaadin/tests/serialization/NoLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/serialization/NoLayoutTest.java
index bb312e3f3f..bb312e3f3f 100644
--- a/uitest/src/com/vaadin/tests/serialization/NoLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/serialization/NoLayoutTest.java
diff --git a/uitest/src/com/vaadin/tests/serialization/SerializerTestTest.java b/uitest/src/test/java/com/vaadin/tests/serialization/SerializerTestTest.java
index b2eb0e6b01..b2eb0e6b01 100644
--- a/uitest/src/com/vaadin/tests/serialization/SerializerTestTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/serialization/SerializerTestTest.java
diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java
index a9fea9408b..a9fea9408b 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java
diff --git a/uitest/src/com/vaadin/tests/tb3/AffectedTB3TestLocator.java b/uitest/src/test/java/com/vaadin/tests/tb3/AffectedTB3TestLocator.java
index 9dfae77ca5..9dfae77ca5 100644
--- a/uitest/src/com/vaadin/tests/tb3/AffectedTB3TestLocator.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/AffectedTB3TestLocator.java
diff --git a/uitest/src/com/vaadin/tests/tb3/AffectedTB3Tests.java b/uitest/src/test/java/com/vaadin/tests/tb3/AffectedTB3Tests.java
index 128214de1e..128214de1e 100644
--- a/uitest/src/com/vaadin/tests/tb3/AffectedTB3Tests.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/AffectedTB3Tests.java
diff --git a/uitest/src/com/vaadin/tests/tb3/AllTB3Tests.java b/uitest/src/test/java/com/vaadin/tests/tb3/AllTB3Tests.java
index 338855ba1c..338855ba1c 100644
--- a/uitest/src/com/vaadin/tests/tb3/AllTB3Tests.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/AllTB3Tests.java
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/BrowserStackBrowserFactory.java b/uitest/src/test/java/com/vaadin/tests/tb3/BrowserStackBrowserFactory.java
new file mode 100644
index 0000000000..326bcfdb3f
--- /dev/null
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/BrowserStackBrowserFactory.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.tb3;
+
+import java.util.logging.Logger;
+
+import org.openqa.selenium.Platform;
+import org.openqa.selenium.ie.InternetExplorerDriver;
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+import com.vaadin.shared.Version;
+import com.vaadin.testbench.parallel.Browser;
+import com.vaadin.testbench.parallel.DefaultBrowserFactory;
+
+/**
+ * Browser factory for the cloud test provider BrowserStack.
+ */
+public class BrowserStackBrowserFactory extends DefaultBrowserFactory {
+
+    @Override
+    public DesiredCapabilities create(Browser browser, String version,
+            Platform platform) {
+        DesiredCapabilities caps;
+
+        switch (browser) {
+        case CHROME:
+            caps = DesiredCapabilities.chrome();
+            caps.setVersion(version);
+            break;
+        case PHANTOMJS:
+            throw new IllegalArgumentException(
+                    "PhantomJS is not supported by BrowserStack");
+        case SAFARI:
+            caps = DesiredCapabilities.safari();
+            caps.setVersion(version);
+            break;
+        case IE8:
+            caps = DesiredCapabilities.internetExplorer();
+            caps.setVersion("8");
+            caps.setCapability("browser", "IE");
+            caps.setCapability("browser_version", "8.0");
+            caps.setCapability(InternetExplorerDriver.IE_ENSURE_CLEAN_SESSION,
+                    true);
+            break;
+        case IE9:
+            caps = DesiredCapabilities.internetExplorer();
+            caps.setVersion("9");
+            caps.setCapability("browser", "IE");
+            caps.setCapability("browser_version", "9.0");
+            caps.setCapability(InternetExplorerDriver.IE_ENSURE_CLEAN_SESSION,
+                    true);
+            break;
+        case IE10:
+            caps = DesiredCapabilities.internetExplorer();
+            caps.setVersion("10");
+            caps.setCapability("browser", "IE");
+            caps.setCapability("browser_version", "10.0");
+            caps.setCapability(InternetExplorerDriver.IE_ENSURE_CLEAN_SESSION,
+                    true);
+            break;
+        case IE11:
+            caps = DesiredCapabilities.internetExplorer();
+            caps.setVersion("11");
+            caps.setCapability("browser", "IE");
+            caps.setCapability("browser_version", "11.0");
+            // There are 2 capabilities ie.ensureCleanSession and
+            // ensureCleanSession in Selenium
+            // IE 11 uses ie.ensureCleanSession
+            caps.setCapability("ie.ensureCleanSession", true);
+            caps.setCapability(InternetExplorerDriver.IE_ENSURE_CLEAN_SESSION,
+                    true);
+            break;
+        case FIREFOX:
+            caps = DesiredCapabilities.firefox();
+            caps.setVersion(version);
+            break;
+        default:
+            caps = DesiredCapabilities.firefox();
+            caps.setVersion(version);
+            caps.setPlatform(platform);
+        }
+
+        // BrowserStack specific parts
+
+        // for now, run all tests on Windows 7
+        caps.setCapability("os", "Windows");
+        caps.setCapability("os_version", "7");
+        caps.setPlatform(Platform.WINDOWS);
+
+        // enable logging on BrowserStack
+        caps.setCapability("browserstack.debug", "true");
+
+        // tunnel
+        caps.setCapability("browserstack.local", "true");
+        // optionally, could also set browserstack.localIdentifier if we have a
+        // tunnel name
+
+        // build and project for easy identification in BrowserStack UI
+        caps.setCapability("project", "vaadin");
+        caps.setCapability("build", Version.getFullVersion());
+
+        // accept self-signed certificates
+        caps.setCapability("acceptSslCerts", "true");
+
+        caps.setCapability("resolution", "1680x1050");
+
+        getLogger().info("Using BrowserStack capabilities " + caps);
+
+        return caps;
+    }
+
+    private static final Logger getLogger() {
+        return Logger.getLogger(BrowserStackBrowserFactory.class.getName());
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/tb3/ChangedTB3TestLocator.java b/uitest/src/test/java/com/vaadin/tests/tb3/ChangedTB3TestLocator.java
index a6f2e5191a..a6f2e5191a 100644
--- a/uitest/src/com/vaadin/tests/tb3/ChangedTB3TestLocator.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/ChangedTB3TestLocator.java
diff --git a/uitest/src/com/vaadin/tests/tb3/ChangedTB3Tests.java b/uitest/src/test/java/com/vaadin/tests/tb3/ChangedTB3Tests.java
index 3c7030b1e9..3c7030b1e9 100644
--- a/uitest/src/com/vaadin/tests/tb3/ChangedTB3Tests.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/ChangedTB3Tests.java
diff --git a/uitest/src/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java b/uitest/src/test/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java
index 00d7788f8b..00d7788f8b 100644
--- a/uitest/src/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java
diff --git a/uitest/src/com/vaadin/tests/tb3/DndActionsTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/DndActionsTest.java
index 71d6b6fab4..71d6b6fab4 100644
--- a/uitest/src/com/vaadin/tests/tb3/DndActionsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/DndActionsTest.java
diff --git a/uitest/src/com/vaadin/tests/tb3/ExcludeFromSuite.java b/uitest/src/test/java/com/vaadin/tests/tb3/ExcludeFromSuite.java
index dd061646be..dd061646be 100644
--- a/uitest/src/com/vaadin/tests/tb3/ExcludeFromSuite.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/ExcludeFromSuite.java
diff --git a/uitest/src/com/vaadin/tests/tb3/IncludeIfProperty.java b/uitest/src/test/java/com/vaadin/tests/tb3/IncludeIfProperty.java
index 789422c0c6..789422c0c6 100644
--- a/uitest/src/com/vaadin/tests/tb3/IncludeIfProperty.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/IncludeIfProperty.java
diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java
index 9bb146b8e4..9bb146b8e4 100644
--- a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java
diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java
index 460006b7f8..460006b7f8 100755
--- a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java
diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserThemeTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTest.java
index 9a02b29bc2..9a02b29bc2 100644
--- a/uitest/src/com/vaadin/tests/tb3/MultiBrowserThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTest.java
diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserThemeTestWithProxy.java b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTestWithProxy.java
index 26ed8288d1..26ed8288d1 100644
--- a/uitest/src/com/vaadin/tests/tb3/MultiBrowserThemeTestWithProxy.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserThemeTestWithProxy.java
diff --git a/uitest/src/com/vaadin/tests/tb3/ParallelScheduler.java b/uitest/src/test/java/com/vaadin/tests/tb3/ParallelScheduler.java
index ef9ee382d0..ef9ee382d0 100644
--- a/uitest/src/com/vaadin/tests/tb3/ParallelScheduler.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/ParallelScheduler.java
diff --git a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java b/uitest/src/test/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java
index 227ef4a84f..85104c784b 100644
--- a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java
@@ -57,7 +57,7 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
     private static final String DEPLOYMENT_PROPERTY = "com.vaadin.testbench.deployment.url";
     private static final String HUB_URL = "com.vaadin.testbench.hub.url";
     private static final Properties properties = new Properties();
-    private static final File propertiesFile = new File("work",
+    private static final File propertiesFile = new File("../work",
             "eclipse-run-selected-test.properties");
     private static final String FIREFOX_PATH = "firefox.path";
     private static final String PHANTOMJS_PATH = "phantomjs.binary.path";
diff --git a/uitest/src/com/vaadin/tests/tb3/RetryOnFail.java b/uitest/src/test/java/com/vaadin/tests/tb3/RetryOnFail.java
index 7a1656a0d2..7a1656a0d2 100644
--- a/uitest/src/com/vaadin/tests/tb3/RetryOnFail.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/RetryOnFail.java
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/SauceLabsBrowserFactory.java b/uitest/src/test/java/com/vaadin/tests/tb3/SauceLabsBrowserFactory.java
new file mode 100644
index 0000000000..59ef94c5ad
--- /dev/null
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/SauceLabsBrowserFactory.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.tb3;
+
+import org.openqa.selenium.Platform;
+import org.openqa.selenium.ie.InternetExplorerDriver;
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+import com.vaadin.shared.Version;
+import com.vaadin.testbench.parallel.Browser;
+import com.vaadin.testbench.parallel.DefaultBrowserFactory;
+
+public class SauceLabsBrowserFactory extends DefaultBrowserFactory {
+
+    @Override
+    public DesiredCapabilities create(Browser browser) {
+        String version = "";
+        // need to pick a version to request, but for these two auto-updating
+        // browsers there is a special value "latest" (and "latest-1",
+        // "latest-2")
+        if (Browser.FIREFOX.equals(browser) || Browser.CHROME.equals(browser)) {
+            version = "latest";
+        }
+        return create(browser, version, Platform.ANY);
+    }
+
+    @Override
+    public DesiredCapabilities create(Browser browser, String version,
+            Platform platform) {
+        DesiredCapabilities caps;
+
+        switch (browser) {
+        case CHROME:
+            caps = DesiredCapabilities.chrome();
+            caps.setVersion(version);
+            break;
+        case PHANTOMJS:
+            throw new IllegalArgumentException(
+                    "PhantomJS is not supported by SauceLabs");
+        case SAFARI:
+            caps = DesiredCapabilities.safari();
+            caps.setVersion(version);
+            break;
+        case IE8:
+            caps = DesiredCapabilities.internetExplorer();
+            caps.setVersion("8.0");
+            caps.setCapability(InternetExplorerDriver.IE_ENSURE_CLEAN_SESSION,
+                    true);
+            break;
+        case IE9:
+            caps = DesiredCapabilities.internetExplorer();
+            caps.setVersion("9.0");
+            caps.setCapability(InternetExplorerDriver.IE_ENSURE_CLEAN_SESSION,
+                    true);
+            break;
+        case IE10:
+            caps = DesiredCapabilities.internetExplorer();
+            caps.setVersion("10.0");
+            caps.setCapability(InternetExplorerDriver.IE_ENSURE_CLEAN_SESSION,
+                    true);
+            break;
+        case IE11:
+            caps = DesiredCapabilities.internetExplorer();
+            caps.setVersion("11.0");
+            // There are 2 capabilities ie.ensureCleanSession and
+            // ensureCleanSession in Selenium
+            // IE 11 uses ie.ensureCleanSession
+            caps.setCapability("ie.ensureCleanSession", true);
+            caps.setCapability(InternetExplorerDriver.IE_ENSURE_CLEAN_SESSION,
+                    true);
+            break;
+        case FIREFOX:
+            caps = DesiredCapabilities.firefox();
+            caps.setVersion(version);
+            break;
+        default:
+            caps = DesiredCapabilities.firefox();
+            caps.setVersion(version);
+            caps.setPlatform(platform);
+        }
+
+        if (!Browser.PHANTOMJS.equals(browser)) {
+            caps.setCapability("platform", "Windows 7");
+        }
+
+        // accept self-signed certificates
+        caps.setCapability("acceptSslCerts", "true");
+
+        // SauceLabs specific parts
+
+        caps.setCapability("screenResolution", "1680x1050");
+
+        // build and project for easy identification in SauceLabs UI
+        caps.setCapability("build", Version.getFullVersion());
+
+        return caps;
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java b/uitest/src/test/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java
index 1c24720075..1c24720075 100644
--- a/uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java
diff --git a/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java b/uitest/src/test/java/com/vaadin/tests/tb3/ServletIntegrationTests.java
index b06044446e..b06044446e 100644
--- a/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/ServletIntegrationTests.java
diff --git a/uitest/src/com/vaadin/tests/tb3/SingleBrowserTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTest.java
index b5389d3eec..b5389d3eec 100644
--- a/uitest/src/com/vaadin/tests/tb3/SingleBrowserTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTest.java
diff --git a/uitest/src/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java b/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java
index 7447a3c056..7447a3c056 100644
--- a/uitest/src/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java
diff --git a/uitest/src/com/vaadin/tests/tb3/TB3Runner.java b/uitest/src/test/java/com/vaadin/tests/tb3/TB3Runner.java
index 4917e398cf..4917e398cf 100644
--- a/uitest/src/com/vaadin/tests/tb3/TB3Runner.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/TB3Runner.java
diff --git a/uitest/src/com/vaadin/tests/tb3/TB3TestLocator.java b/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestLocator.java
index eb0861757e..eb0861757e 100644
--- a/uitest/src/com/vaadin/tests/tb3/TB3TestLocator.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestLocator.java
diff --git a/uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java b/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestSuite.java
index c68d59a4eb..c68d59a4eb 100644
--- a/uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestSuite.java
diff --git a/uitest/src/com/vaadin/tests/tb3/TooltipTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/TooltipTest.java
index 86ea44287a..86ea44287a 100644
--- a/uitest/src/com/vaadin/tests/tb3/TooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/TooltipTest.java
diff --git a/uitest/src/com/vaadin/tests/tb3/VaadinBrowserFactory.java b/uitest/src/test/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java
index 294fe440d0..2389811ff0 100644
--- a/uitest/src/com/vaadin/tests/tb3/VaadinBrowserFactory.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2000-2014 Vaadin Ltd.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,17 +15,46 @@
  */
 package com.vaadin.tests.tb3;
 
+import java.util.logging.Logger;
+
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.ie.InternetExplorerDriver;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.testbench.parallel.DefaultBrowserFactory;
+import com.vaadin.testbench.parallel.TestBenchBrowserFactory;
 
 public class VaadinBrowserFactory extends DefaultBrowserFactory {
 
+    TestBenchBrowserFactory delegate = null;
+
     @Override
     public DesiredCapabilities create(Browser browser) {
+        String browserFactoryClass = System.getProperty("browser.factory");
+        if (browserFactoryClass != null
+                && !browserFactoryClass.trim().isEmpty()) {
+            if (delegate == null) {
+                getLogger()
+                        .info("Using browser factory " + browserFactoryClass);
+                try {
+                    delegate = (TestBenchBrowserFactory) getClass()
+                            .getClassLoader().loadClass(browserFactoryClass)
+                            .newInstance();
+                } catch (Exception e) {
+                    getLogger().warning(
+                            "Failed to instantiate browser factory "
+                                    + browserFactoryClass);
+                    throw new RuntimeException(e);
+                }
+            }
+            return delegate.create(browser);
+        }
+
+        return doCreate(browser);
+    }
+
+    public DesiredCapabilities doCreate(Browser browser) {
         switch (browser) {
         case IE8:
             return createIE(browser, "8");
@@ -59,4 +88,8 @@ public class VaadinBrowserFactory extends DefaultBrowserFactory {
         capabilities.setVersion(version);
         return capabilities;
     }
+
+    private static final Logger getLogger() {
+        return Logger.getLogger(VaadinBrowserFactory.class.getName());
+    }
 }
diff --git a/uitest/src/com/vaadin/tests/tb3/WebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/WebsocketTest.java
index ee8cab22fd..ee8cab22fd 100644
--- a/uitest/src/com/vaadin/tests/tb3/WebsocketTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/WebsocketTest.java
diff --git a/uitest/src/com/vaadin/tests/tb3/newelements/CalendarElement.java b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/CalendarElement.java
index 40475afd3c..40475afd3c 100644
--- a/uitest/src/com/vaadin/tests/tb3/newelements/CalendarElement.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/CalendarElement.java
diff --git a/uitest/src/com/vaadin/tests/tb3/newelements/ComboBoxElement.java b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/ComboBoxElement.java
index 6a0f164b13..6a0f164b13 100644
--- a/uitest/src/com/vaadin/tests/tb3/newelements/ComboBoxElement.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/ComboBoxElement.java
diff --git a/uitest/src/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java
index 8f8dd82d9f..8f8dd82d9f 100644
--- a/uitest/src/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java
diff --git a/uitest/src/com/vaadin/tests/tb3/newelements/WindowElement.java b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/WindowElement.java
index 784d203ab0..784d203ab0 100644
--- a/uitest/src/com/vaadin/tests/tb3/newelements/WindowElement.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/WindowElement.java
diff --git a/uitest/src/com/vaadin/tests/themes/FaviconTest.java b/uitest/src/test/java/com/vaadin/tests/themes/FaviconTest.java
index 3ba86fd3e4..3ba86fd3e4 100644
--- a/uitest/src/com/vaadin/tests/themes/FaviconTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/FaviconTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java
index 1814aa99df..1814aa99df 100644
--- a/uitest/src/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/ThemeChangeFaviconTest.java b/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeFaviconTest.java
index cb5e9d07c7..cb5e9d07c7 100644
--- a/uitest/src/com/vaadin/tests/themes/ThemeChangeFaviconTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeFaviconTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/ThemeChangeOnTheFlyTest.java b/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeOnTheFlyTest.java
index caf264abf1..caf264abf1 100644
--- a/uitest/src/com/vaadin/tests/themes/ThemeChangeOnTheFlyTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/ThemeChangeOnTheFlyTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java b/uitest/src/test/java/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java
index 3a5ddf5f3b..3a5ddf5f3b 100644
--- a/uitest/src/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/chameleon/ChameleonNotificationTest.java b/uitest/src/test/java/com/vaadin/tests/themes/chameleon/ChameleonNotificationTest.java
index 46c7382726..46c7382726 100644
--- a/uitest/src/com/vaadin/tests/themes/chameleon/ChameleonNotificationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/chameleon/ChameleonNotificationTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/AlignTopIconInButtonTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/AlignTopIconInButtonTest.java
index 02ef886721..02ef886721 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/AlignTopIconInButtonTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/AlignTopIconInButtonTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ContrastFontColorTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ContrastFontColorTest.java
index 38d93ab633..38d93ab633 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ContrastFontColorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ContrastFontColorTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/FormLayoutInsideTableTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/FormLayoutInsideTableTest.java
index 2a1664fbcf..2a1664fbcf 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/FormLayoutInsideTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/FormLayoutInsideTableTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/GridDisabledTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/GridDisabledTest.java
index 27c3bfa91d..27c3bfa91d 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/GridDisabledTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/GridDisabledTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ImmediateUploadTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ImmediateUploadTest.java
index 137b845e52..137b845e52 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ImmediateUploadTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ImmediateUploadTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ModalWindowTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ModalWindowTest.java
index 0b21d4f34c..0b21d4f34c 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ModalWindowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ModalWindowTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/NonDraggableWindowTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/NonDraggableWindowTest.java
index f5a1bd903e..f5a1bd903e 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/NonDraggableWindowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/NonDraggableWindowTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/NotificationStyleTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/NotificationStyleTest.java
index 5f9542b6f3..5f9542b6f3 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/NotificationStyleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/NotificationStyleTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ResponsiveStylesTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ResponsiveStylesTest.java
index 8f01de350e..8f01de350e 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ResponsiveStylesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ResponsiveStylesTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/TableSortIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/TableSortIndicatorTest.java
index 42f0b2aeae..42f0b2aeae 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/TableSortIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/TableSortIndicatorTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/TableWithEmptyCaptionTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/TableWithEmptyCaptionTest.java
index 04de8b498c..04de8b498c 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/TableWithEmptyCaptionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/TableWithEmptyCaptionTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/TextFieldBevelTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/TextFieldBevelTest.java
index efe194d28a..efe194d28a 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/TextFieldBevelTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/TextFieldBevelTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java
index 7651b641de..7651b641de 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java
index 3c28b1f9eb..3c28b1f9eb 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java
diff --git a/uitest/src/com/vaadin/tests/themes/valo/WindowTitleOverflowTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/WindowTitleOverflowTest.java
index 825d26f86d..825d26f86d 100644
--- a/uitest/src/com/vaadin/tests/themes/valo/WindowTitleOverflowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/WindowTitleOverflowTest.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/AdjacentElementsWithTooltipsTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/AdjacentElementsWithTooltipsTest.java
index af7a303629..af7a303629 100644
--- a/uitest/src/com/vaadin/tests/tooltip/AdjacentElementsWithTooltipsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/AdjacentElementsWithTooltipsTest.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/ButtonTooltipsTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/ButtonTooltipsTest.java
index 08436b1332..08436b1332 100644
--- a/uitest/src/com/vaadin/tests/tooltip/ButtonTooltipsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/ButtonTooltipsTest.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/DragAndDropWrapperTooltipsTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/DragAndDropWrapperTooltipsTest.java
index d913c8cc12..d913c8cc12 100644
--- a/uitest/src/com/vaadin/tests/tooltip/DragAndDropWrapperTooltipsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/DragAndDropWrapperTooltipsTest.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/LongTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/LongTooltipTest.java
index 191ce6ffec..191ce6ffec 100644
--- a/uitest/src/com/vaadin/tests/tooltip/LongTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/LongTooltipTest.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/MenuBarTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/MenuBarTooltipTest.java
index 9b2f7d13d6..9b2f7d13d6 100644
--- a/uitest/src/com/vaadin/tests/tooltip/MenuBarTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/MenuBarTooltipTest.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/SliderTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/SliderTooltipTest.java
index 743b7c2ab5..743b7c2ab5 100644
--- a/uitest/src/com/vaadin/tests/tooltip/SliderTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/SliderTooltipTest.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/StationaryTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/StationaryTooltipTest.java
index 6b751e7a6b..6b751e7a6b 100644
--- a/uitest/src/com/vaadin/tests/tooltip/StationaryTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/StationaryTooltipTest.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/TooltipAndJavascriptTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipAndJavascriptTest.java
index cc9309ac2c..cc9309ac2c 100644
--- a/uitest/src/com/vaadin/tests/tooltip/TooltipAndJavascriptTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipAndJavascriptTest.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/TooltipConfigurationTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipConfigurationTest.java
index 8f84444400..8f84444400 100644
--- a/uitest/src/com/vaadin/tests/tooltip/TooltipConfigurationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipConfigurationTest.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/TooltipInWindowTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipInWindowTest.java
index 1c50bf5486..1c50bf5486 100644
--- a/uitest/src/com/vaadin/tests/tooltip/TooltipInWindowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipInWindowTest.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/TooltipWidthUpdatingTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipWidthUpdatingTest.java
index 150d0e070e..150d0e070e 100644
--- a/uitest/src/com/vaadin/tests/tooltip/TooltipWidthUpdatingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/TooltipWidthUpdatingTest.java
diff --git a/uitest/src/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java
index 9603b1df36..9603b1df36 100644
--- a/uitest/src/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java
diff --git a/uitest/src/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdateTest.java b/uitest/src/test/java/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdateTest.java
index 01ea890cec..01ea890cec 100644
--- a/uitest/src/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdateTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/urifragments/FragmentHandlingAndAsynchUIUpdateTest.java
diff --git a/uitest/src/com/vaadin/tests/urifragments/SettingNullFragmentTest.java b/uitest/src/test/java/com/vaadin/tests/urifragments/SettingNullFragmentTest.java
index 4fed0b2602..4fed0b2602 100644
--- a/uitest/src/com/vaadin/tests/urifragments/SettingNullFragmentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/urifragments/SettingNullFragmentTest.java
diff --git a/uitest/src/com/vaadin/tests/util/WidgetUtilTest.java b/uitest/src/test/java/com/vaadin/tests/util/WidgetUtilTest.java
index 2af015b406..2af015b406 100644
--- a/uitest/src/com/vaadin/tests/util/WidgetUtilTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/util/WidgetUtilTest.java
diff --git a/uitest/src/com/vaadin/tests/validation/ValidationOfRequiredEmptyFieldsTest.java b/uitest/src/test/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFieldsTest.java
index ab77ba6b26..ab77ba6b26 100644
--- a/uitest/src/com/vaadin/tests/validation/ValidationOfRequiredEmptyFieldsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFieldsTest.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/ClientRpcClassTest.java b/uitest/src/test/java/com/vaadin/tests/widgetset/server/ClientRpcClassTest.java
index 7ff8291494..7ff8291494 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/ClientRpcClassTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/widgetset/server/ClientRpcClassTest.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/OverriddenDecendantsTest.java b/uitest/src/test/java/com/vaadin/tests/widgetset/server/OverriddenDecendantsTest.java
index aa29284010..aa29284010 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/OverriddenDecendantsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/widgetset/server/OverriddenDecendantsTest.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUITest.java b/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUITest.java
index 614eaa063e..614eaa063e 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/AbstractCsrfTokenUITest.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabledTest.java b/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabledTest.java
index 504425fead..504425fead 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabledTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenDisabledTest.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabledTest.java b/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabledTest.java
index 1d51f1c372..1d51f1c372 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabledTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/widgetset/server/csrf/ui/CsrfTokenEnabledTest.java
diff --git a/uitest/src/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcTest.java b/uitest/src/test/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcTest.java
index 76d884d2c7..76d884d2c7 100644
--- a/uitest/src/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/widgetset/server/gwtrpc/GwtRpcTest.java
diff --git a/uitest/tb3test.xml b/uitest/tb3test.xml
index d3458a412b..09dff71945 100644
--- a/uitest/tb3test.xml
+++ b/uitest/tb3test.xml
@@ -16,8 +16,9 @@
     <ivy:resolve file="${tb3test.dir}/ivy.xml" conf="build, build-provided" />
     <ivy:cachepath pathid="classpath.tb3.lib" conf="build, build-provided" />
     <path id="classpath.tb3">
+        <path location="${tb3test.dir}/target/test-classes" />
         <path refid="classpath.tb3.lib" />
-        <path location="${tb3test.dir}/result/classes" />
+        <path location="${tb3test.dir}/target/classes" />
     </path>
 
     <target name="run-all-tb3-tests" unless="tests.tb3.skip"
diff --git a/widgets/build.xml b/widgets/build.xml
deleted file mode 100644
index 2b1f30f7cb..0000000000
--- a/widgets/build.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="vaadin-widgets" basedir="." default="publish-local"
-    xmlns:ivy="antlib:org.apache.ivy.ant">
-    <description>
-        Widgets package for using Vaadin widgets with GWT 2.7+
-    </description>
-    <include file="../common.xml" as="common" />
-    <include file="../build.xml" as="vaadin" />
-    <include file="../gwt-files.xml" as="gwtfiles" />
-
-    <!-- global properties -->
-    <property name="module.name" value="vaadin-widgets" />
-    <property name="module.symbolic" value="com.vaadin.widgets" />
-    <property name="result.dir" value="result" />
-    <property name="result.src" value="${result.dir}/src" />
-    <property name="result.deps" value="${result.dir}/deps" />
-
-    <path id="classpath.compile.custom">
-        <fileset file="${gwt.user.jar}" />
-        <fileset file="${gwt.dev.jar}" />
-    </path>
-    <path id="classpath.test.custom" />
-
-    <union id="jar.includes">
-
-    </union>
-
-    <target name="dependencies">
-        <antcall target="common.dependencies" />
-    </target>
-
-    <target name="copysrc" depends="dependencies">
-        <delete dir="${result.deps}" />
-
-        <ivy:resolve transitive="false" type="jar"
-            conf="build-provided" />
-        <ivy:cachepath pathid="vaadin.jars" />
-        <unjar dest="${result.deps}">
-            <path refid="vaadin.jars" />
-        </unjar>
-
-        <copy todir="${result.src}">
-            <fileset dir="src" />
-            <fileset dir="${result.deps}">
-                <include name="com/vaadin/*.gwt.xml" />
-                <include name="com/vaadin/client/BrowserInfo.java" />
-                <include name="com/vaadin/client/AnimationUtil.java" />
-                <include name="com/vaadin/client/ComputedStyle.java" />
-                <include name="com/vaadin/client/DeferredWorker.java" />
-                <include name="com/vaadin/client/Profiler.java" />
-                <include name="com/vaadin/client/StyleConstants.java" />
-                <include name="com/vaadin/client/WidgetUtil.java" />
-                <include name="com/vaadin/client/ui/FocusUtil.java" />
-                <include name="com/vaadin/client/data/**/*.java" />
-                <include name="com/vaadin/client/widget/**/*.java" />
-                <include name="com/vaadin/client/Focusable.java" />
-                <include name="com/vaadin/client/widgets/*.java" />
-                <include name="com/vaadin/client/renderers/*.java" />
-                <include name="com/vaadin/client/ui/SubPartAware.java" />
-                <include name="com/vaadin/client/ui/VProgressBar.java" />
-                <include name="com/vaadin/client/ui/dd/DragAndDropHandler.java" />
-                <include name="com/vaadin/client/ui/dd/DragHandle.java" />
-                <include name="com/vaadin/client/VSchedulerImpl.java" />
-
-                <include name="com/vaadin/shared/ui/grid/*.java" />
-                <include name="com/vaadin/shared/ui/grid/**/*.java" />
-                <include name="com/vaadin/shared/util/SharedUtil.java" />
-                <include name="com/vaadin/shared/VBrowserDetails.java" />
-                <include name="com/vaadin/shared/data/sort/SortDirection.java" />
-
-                <include name="com/vaadin/sass/linker/*.java" />
-
-                <exclude name="com/vaadin/shared/**/*Rpc.java" />
-                <exclude name="com/vaadin/shared/**/*State.java" />
-            </fileset>
-        </copy>
-
-        <mkdir dir="${result.src}/com/vaadin/themes/public" />
-        <copy todir="${result.src}/com/vaadin/themes/public/valo">
-            <fileset dir="${result.deps}/VAADIN/themes/valo" />
-        </copy>
-        <copy todir="${result.src}/com/vaadin/themes/public/base">
-            <fileset dir="${result.deps}/VAADIN/themes/base" />
-        </copy>
-    </target>
-    <target name="compile" description="Compiles the module"
-        depends="dependencies,copysrc">
-        <property name="classes" location="${result.dir}/classes" />
-        <mkdir dir="${classes}" />
-
-        <javac destdir="${classes}" source="${vaadin.java.version}"
-            target="${vaadin.java.version}" debug="true" encoding="UTF-8"
-            includeantruntime="false">
-            <src path="${result.src}" />
-            <classpath refid="classpath.compile.custom" />
-            <classpath refid="vaadin.jars" />
-        </javac>
-    </target>
-
-    <target name="jar" depends="compile">
-        <property name="jar.file"
-            location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" />
-        <antcall target="common.jar">
-            <param name="src" value="${result.src}" />
-            <reference refid="jar.includes" torefid="extra.jar.includes" />
-        </antcall>
-    </target>
-
-    <target name="publish-local" depends="jar">
-        <antcall target="common.sources.jar">
-            <param name="src" value="${result.src}" />
-            <reference torefid="extra.jar.includes" refid="jar.includes" />
-        </antcall>
-        <antcall target="common.javadoc.jar">
-            <param name="src" value="${result.src}" />
-        </antcall>
-
-        <antcall target="common.publish-local" />
-    </target>
-
-    <target name="clean">
-        <antcall target="common.clean" />
-    </target>
-
-    <target name="checkstyle">
-        <antcall target="common.checkstyle">
-            <param name="cs.src" location="src" />
-        </antcall>
-    </target>
-
-    <target name="test" depends="checkstyle">
-        <!-- <antcall target="common.test.run" /> -->
-    </target>
-
-</project>
diff --git a/widgets/ivy.xml b/widgets/ivy.xml
deleted file mode 100644
index 68aefe22b0..0000000000
--- a/widgets/ivy.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
-    xmlns:m="http://ant.apache.org/ivy/maven">
-
-    <info organisation="com.vaadin" module="vaadin-widgets"
-        revision="${vaadin.version}" />
-
-    <configurations>
-        <conf name="build" />
-        <conf name="build-provided" />
-        <conf name="ide" visibility="private" />
-        <conf name="test" />
-    </configurations>
-    <publications>
-        <artifact type="jar" ext="jar" />
-        <artifact type="source" ext="jar" m:classifier="sources" />
-        <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
-        <artifact type="pom" ext="pom" />
-    </publications>
-    <dependencies defaultconf="build" defaultconfmapping="build->default">
-        <!-- API DEPENDENCIES -->
-
-        <!-- LIBRARY DEPENDENCIES (compile time) -->
-        <!-- Project modules -->
-        <dependency org="com.vaadin" name="vaadin-shared"
-            rev="${vaadin.version}" conf="build-provided,test->build">
-            <exclude type="pom" conf="test" />
-        </dependency>
-        <dependency org="com.vaadin" name="vaadin-client"
-            rev="${vaadin.version}" conf="build-provided,test->build">
-            <exclude type="pom" conf="test" />
-        </dependency>
-        <dependency org="com.vaadin" name="vaadin-client-compiler"
-            rev="${vaadin.version}" conf="build-provided,test->build">
-            <exclude type="pom" conf="test" />
-        </dependency>
-        <dependency org="com.vaadin" name="vaadin-themes"
-            rev="${vaadin.version}" conf="build-provided,test->build">
-            <exclude type="pom" conf="test" />
-        </dependency>
-        <dependency org="com.vaadin" name="vaadin-sass-compiler"
-            rev="${vaadin.sass.version}" conf="build-provided->default" />
-
-    </dependencies>
-
-</ivy-module>
diff --git a/widgets/pom.xml b/widgets/pom.xml
new file mode 100644
index 0000000000..5fa0f7120b
--- /dev/null
+++ b/widgets/pom.xml
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-root</artifactId>
+        <version>7.7.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>vaadin-widgets</artifactId>
+    <name>vaadin-widgets</name>
+    <packaging>jar</packaging>
+
+	<url>https://vaadin.com/</url>
+    <description>Vaadin widgets</description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>vaadin-client</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>vaadin-shared</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>vaadin-client-compiler</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>vaadin-themes</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>vaadin-buildhelpers</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+
+    </dependencies>
+
+    <build>
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
+                        <!-- Export package is handled in exec plugin -->
+                        <Export-Package></Export-Package>
+                        <Import-Package></Import-Package>
+                    </instructions>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>bundle-manifest</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>manifest</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-dependencies</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>com.vaadin</groupId>
+                                    <artifactId>vaadin-client</artifactId>
+                                    <includes>
+                                        com/vaadin/*.gwt.xml,
+                                        com/vaadin/client/BrowserInfo*,
+                                        com/vaadin/client/AnimationUtil*,
+                                        com/vaadin/client/ComputedStyle*,
+                                        com/vaadin/client/DeferredWorker*,
+                                        com/vaadin/client/Profiler*,
+                                        com/vaadin/client/StyleConstants*,
+                                        com/vaadin/client/WidgetUtil*,
+                                        com/vaadin/client/ui/FocusUtil*,
+                                        com/vaadin/client/data/**,
+                                        com/vaadin/client/widget/**,
+                                        com/vaadin/client/Focusable*,
+                                        com/vaadin/client/widgets/**,
+                                        com/vaadin/client/renderers/**,
+                                        com/vaadin/client/ui/SubPartAware*,
+                                        com/vaadin/client/ui/VProgressBar*,
+                                        com/vaadin/client/ui/dd/DragAndDropHandler*,
+                                        com/vaadin/client/ui/dd/DragHandle*,
+                                        com/vaadin/client/VSchedulerImpl*
+                                    </includes>
+                                </artifactItem>
+
+                                <artifactItem>
+                                    <groupId>com.vaadin</groupId>
+                                    <artifactId>vaadin-shared</artifactId>
+                                    <includes>
+                                        com/vaadin/shared/ui/grid/*.*,
+                                        com/vaadin/shared/ui/grid/**/*.*,
+                                        com/vaadin/shared/util/SharedUtil*,
+                                        com/vaadin/shared/VBrowserDetails*,
+                                        com/vaadin/shared/data/sort/SortDirection*
+                                    </includes>
+                                    <excludes>
+                                        com/vaadin/shared/**/*Rpc.*,
+                                        com/vaadin/shared/**/*Rpc$*.*,
+                                        com/vaadin/shared/**/*State.*,
+                                        com/vaadin/shared/**/*State$*.*
+                                    </excludes>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.vaadin</groupId>
+                                    <artifactId>vaadin-client-compiler</artifactId>
+                                    <includes>
+                                        com/vaadin/sass/linker/*.*
+                                    </includes>
+                                </artifactItem>
+
+                                <artifactItem>
+                                    <groupId>com.vaadin</groupId>
+                                    <artifactId>vaadin-themes</artifactId>
+                                    <includes>
+                                        /VAADIN/themes/valo/**,
+                                        /VAADIN/themes/base/**
+                                    </includes>
+                                    <outputDirectory>${project.build.directory}/themes</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <!-- Copy .java files to package -->
+                    <execution>
+                        <id>copy-sources</id>
+                        <!-- here the phase you need -->
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/java</directory>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-themes</id>
+                        <!-- here the phase you need -->
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.outputDirectory}/com/vaadin/themes/public</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${project.build.directory}/themes/VAADIN/themes</directory>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>checkstyle</goal>
+                        </goals>
+                        <phase>process-sources</phase>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-export-package</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <classpathScope>compile</classpathScope>
+                            <executable>${java.home}/bin/java</executable>
+                            <arguments>
+                                <argument>-Dvaadin.version=${project.version}</argument>
+                                <argument>-DincludeNumberPackages=1</argument>
+
+                                <argument>-classpath</argument>
+                                <classpath/>
+
+                                <argument>com.vaadin.buildhelpers.GeneratePackageExports</argument>
+
+                                <argument>${project.build.directory}/${project.build.finalName}.${project.packaging}
+                                </argument>
+                                <argument>com/vaadin</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        <index>false</index>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/widgets/src/com/vaadin/themes/valoutil/BodyStyleName.java b/widgets/src/main/java/com/vaadin/themes/valoutil/BodyStyleName.java
index 73a01b6fd2..73a01b6fd2 100644
--- a/widgets/src/com/vaadin/themes/valoutil/BodyStyleName.java
+++ b/widgets/src/main/java/com/vaadin/themes/valoutil/BodyStyleName.java
diff --git a/widgets/src/com/vaadin/themes/Valo.gwt.xml b/widgets/src/main/resources/com/vaadin/themes/Valo.gwt.xml
index d9e0f6ab73..d9e0f6ab73 100644
--- a/widgets/src/com/vaadin/themes/Valo.gwt.xml
+++ b/widgets/src/main/resources/com/vaadin/themes/Valo.gwt.xml