963 files changed, 778 insertions, 203 deletions

diff --git a/.classpath b/.classpath
index 70997e763b..ae0241e601 100644
--- a/.classpath
+++ b/.classpath
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="server/tests/src"/>
+	<classpathentry kind="src" path="server/src/test/java"/>
 	<classpathentry kind="src" path="client/tests/src"/>
 	<classpathentry kind="src" path="shared/src/test/java"/>
 	<classpathentry kind="src" path="client/src"/>
-	<classpathentry kind="src" path="server/src"/>
+	<classpathentry kind="src" path="server/src/main/java"/>
 	<classpathentry kind="src" path="client-compiler/src"/>
 	<classpathentry kind="src" path="client-compiler/tests/src"/>
 	<classpathentry kind="src" path="uitest/src"/>
diff --git a/.gitignore b/.gitignore
index 8cb8b213ca..d412437ad7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,6 +86,7 @@ scripts/*.pyc
 result
 push/target/
 shared/target/
+server/target/
 
 .sass-cache
 phantomjsdriver.log
diff --git a/client-compiled/ivy.xml b/client-compiled/ivy.xml
index 2f1dcfd22f..748ce9bd56 100644
--- a/client-compiled/ivy.xml
+++ b/client-compiled/ivy.xml
@@ -22,7 +22,7 @@
     </publications>
     <dependencies>
         <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" conf="compile-module-> build" />
+            rev="${vaadin.version}" conf="compile-module-> default" />
         <dependency org="com.vaadin" name="vaadin-client"
             rev="${vaadin.version}" conf="compile-module-> build" />
         <dependency org="com.vaadin" name="vaadin-client-compiler"
diff --git a/client-compiler/ivy.xml b/client-compiler/ivy.xml
index f0f479a5b3..45031b55f9 100644
--- a/client-compiler/ivy.xml
+++ b/client-compiler/ivy.xml
@@ -23,7 +23,7 @@
         <dependency org="com.vaadin" name="vaadin-shared"
             rev="${vaadin.version}" conf="build -> default" />
         <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" conf="build" />
+            rev="${vaadin.version}" conf="build -> default" />
         <dependency org="com.vaadin" name="vaadin-client"
             rev="${vaadin.version}" conf="build,test" />
         <dependency org="com.vaadin" name="vaadin-sass-compiler"
diff --git a/client/ivy.xml b/client/ivy.xml
index 961050826c..7d0c88a965 100644
--- a/client/ivy.xml
+++ b/client/ivy.xml
@@ -29,7 +29,7 @@
             <exclude type="pom" conf="test" />
         </dependency>
         <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" conf="build,test->build">
+            rev="${vaadin.version}" conf="build,test->default">
             <exclude type="pom" conf="test" />
         </dependency>
 
diff --git a/ivysettings.xml b/ivysettings.xml
index d8c870b068..5502a5c3a5 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -40,7 +40,7 @@
         <module organisation="com.vaadin" name="vaadin-shared"
             resolver="local-maven" />
         <module organisation="com.vaadin" name="vaadin-server"
-            resolver="build-temp" />
+            resolver="local-maven" />
         <module organisation="com.vaadin" name="vaadin-client"
             resolver="build-temp" />
         <module organisation="com.vaadin" name="vaadin-client-compiler"
diff --git a/liferay/ivy.xml b/liferay/ivy.xml
index bb9b019d2f..9a26f80b4e 100644
--- a/liferay/ivy.xml
+++ b/liferay/ivy.xml
@@ -24,7 +24,7 @@
         <dependency org="com.vaadin" name="vaadin-push"
             rev="${vaadin.version}" conf="deps -> default" transitive="false" />
         <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" conf="deps -> build" transitive="false" />
+            rev="${vaadin.version}" conf="deps -> default" transitive="false" />
     </dependencies>
 
 </ivy-module>
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
index c384829a16..05af3528c0 100644
--- a/server/ivy.xml
+++ b/server/ivy.xml
@@ -8,87 +8,68 @@
         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" />
+            rev="6.0.2" conf="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" />
+            rev="3.0.1" conf="ide -> default" />
 
         <!--Portlet API version 2.0 (JSR-286) -->
         <dependency org="javax.portlet" name="portlet-api"
-            rev="2.0" conf="build-provided,ide,test -> default" />
+            rev="2.0" conf="ide -> 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" />
+            rev="1.7.7" conf="ide -> default" />
 
         <!-- Bean Validation API -->
         <dependency org="javax.validation" name="validation-api"
-            rev="1.0.0.GA" conf="build-provided,ide,test -> default" />
+            rev="1.0.0.GA" conf="ide -> 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->default">
-            <exclude type="pom" conf="test" />
-        </dependency>
-        <dependency org="com.vaadin" name="vaadin-push" rev="${vaadin.version}"
-            conf="build-provided,test->compile">
-            <exclude type="pom" conf="test" />
+                    rev="${vaadin.sass.version}" conf="ide ->default">
+            <exclude type="pom" conf="ide" />
         </dependency>
 
         <!-- Jsoup for BootstrapHandler -->
         <dependency org="org.jsoup" name="jsoup" rev="1.8.3"
-            conf="build,ide,test -> default" />
+            conf="ide -> default" />
 
         <!-- TESTING DEPENDENCIES -->
 
         <!-- Test frameworks & related -->
         <dependency org="junit" name="junit" rev="4.11"
-            conf="test,ide -> default" />
+            conf="ide -> default" />
         <dependency org="org.mockito" name="mockito-all" rev="1.9.5"
-            conf="test,ide->default" />
+            conf="ide ->default" />
         <dependency org="org.hamcrest" name="hamcrest-all" rev="1.3"
-                    conf="test,ide->default" />
+                    conf="ide ->default" />
         <dependency org="org.easymock" name="easymock" rev="3.0"
-            conf="test,ide-> default" transitive="true" />
+            conf="ide -> default" transitive="true" />
         <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6"
-            conf="test,ide -> default" />
+            conf="ide -> default" />
         <dependency org="commons-io" name="commons-io" rev="${commons-io.version}"
-            conf="test->default" />
+            conf="ide->default" />
         <dependency org="commons-lang" name="commons-lang"
-            rev="2.6" conf="test,ide->default" />
+            rev="2.6" conf="ide ->default" />
         <!-- Bean Validation implementation -->
         <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1"
-            conf="test -> default" />
+            conf="ide -> default" />
         <dependency org="org.hibernate" name="hibernate-validator"
-            rev="4.2.0.Final" conf="test -> default" />
+            rev="4.2.0.Final" conf="ide -> default" />
 
         <!-- For manual testing with PostgreSQL (see SQLTestConstants) -->
         <!-- <dependency org="postgresql" name="postgresql" rev="9.1-901.jdbc3" 
-            conf="test,ide->default" /> -->
+            conf="ide" /> -->
 
         <!-- remove cssparser override once sass-compiler is updated -->
         <override org="net.sourceforge.cssparser" module="cssparser"
diff --git a/server/pom.xml b/server/pom.xml
new file mode 100644
index 0000000000..0c986a5b18
--- /dev/null
+++ b/server/pom.xml
@@ -0,0 +1,324 @@
+<?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-server</artifactId>
+	<name>vaadin-server</name>
+	<packaging>jar</packaging>
+	<version>7.7.0-SNAPSHOT</version>
+
+	<properties>
+		<maven.compiler.source>1.6</maven.compiler.source>
+		<maven.compiler.target>1.6</maven.compiler.target>
+		<!-- Used version numbers for dependencies -->
+		<vaadin.sass.version>0.9.13</vaadin.sass.version>
+		<commons-io.version>2.4</commons-io.version>
+		<guava.version>16.0.1.vaadin1</guava.version>
+		<!-- TODO: Move to Parent -->
+		<vaadin.gwt.version>2.7.0.vaadin3</vaadin.gwt.version>
+	</properties>
+
+	<organization>
+		<name>Vaadin Ltd</name>
+	</organization>
+	<url>https://vaadin.com/</url>
+	<description>Vaadin shared</description>
+
+	<dependencies>
+		<!-- API DEPENDENCIES -->
+
+		<!-- Liferay Portal Service -->
+		<dependency>
+			<groupId>com.liferay.portal</groupId>
+			<artifactId>portal-service</artifactId>
+			<version>6.0.2</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!--Servlet API version 3.0 -->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.0.1</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!--Portlet API version 2.0 (JSR-286) -->
+		<dependency>
+			<groupId>javax.portlet</groupId>
+			<artifactId>portlet-api</artifactId>
+			<version>2.0</version>
+			<scope>provided</scope>
+		</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>
+
+		<!-- Bean Validation API -->
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>1.0.0.GA</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>1.8.3</version>
+		</dependency>
+
+		<!-- TESTING DEPENDENCIES -->
+
+		<!-- Test frameworks & related -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.11</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>
+				<version>2.10</version>
+				<executions>
+					<execution>
+						<id>unpack-dependencies</id>
+						<phase>prepare-package</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>
+							<outputDirectory>${project.build.directory}/classes</outputDirectory>
+							<overWriteReleases>false</overWriteReleases>
+							<overWriteSnapshots>true</overWriteSnapshots>
+						</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.directory}/classes</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>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.8</version>
+				<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="2.4.0",
+							javax.servlet.http;version="2.4.0",
+							javax.validation;version="1.0.0.GA";resolution:=optional,
+							org.jsoup;version="1.8.3",
+							org.jsoup.parser;version="1.8.3",
+							org.jsoup.nodes;version="1.8.3",
+							org.jsoup.helper;version="1.8.3",
+							org.jsoup.safety;version="1.8.3",
+							org.jsoup.select;version="1.8.3",
+							javax.portlet;version="[2.0,3)";resolution:=optional,
+							javax.portlet.filter;version="[2.0,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>
+				<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>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.19.1</version>
+			</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 7f4ef3ffe5..7f4ef3ffe5 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 b6a28c1560..b6a28c1560 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 61c47389ad..61c47389ad 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 38a3d75f17..38a3d75f17 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 00af38ecc1..00af38ecc1 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 c6ef6a7194..c6ef6a7194 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 b851baf674..b851baf674 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 b26e048431..b26e048431 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 d3d834cad7..d3d834cad7 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 043f95fd7b..043f95fd7b 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 593b1f544f..593b1f544f 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 dda3d81453..dda3d81453 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 b117cb4b4d..b117cb4b4d 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 063f4f5346..063f4f5346 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 f810a63a38..f810a63a38 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 e0dbcb004b..e0dbcb004b 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 9babf7e876..9babf7e876 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 90b3b56ef6..90b3b56ef6 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 f6f711d658..f6f711d658 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 4074672675..4074672675 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 8517962e91..8517962e91 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 b5cd384f53..b5cd384f53 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 cee2ebe381..cee2ebe381 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/main/resources/VAADIN/vaadinBootstrap.js b/server/src/main/resources/VAADIN/vaadinBootstrap.js
new file mode 100644
index 0000000000..89514dbcc2
--- /dev/null
+++ b/server/src/main/resources/VAADIN/vaadinBootstrap.js
@@ -0,0 +1,359 @@
+(function() {
+	var apps = {};
+	var themesLoaded = {};
+	var widgetsets = {};
+	
+	
+    var log;
+    if (typeof console === "undefined" || !window.location.search.match(/[&?]debug(&|$)/)) {
+    	//If no console.log present, just use a no-op
+    	log = function() {};
+    } else if (typeof console.log === "function") {
+    	//If it's a function, use it with apply
+		log = function() {
+			console.log.apply(console, arguments);
+		};
+    } else {
+    	//In IE, its a native function for which apply is not defined, but it works without a proper 'this' reference
+    	log = console.log;
+    }
+	
+	var loadTheme = function(url, version) {
+		if(!themesLoaded[url]) {
+			log("loadTheme", url, version);
+			
+			var href = url + '/styles.css';
+			if (version) {
+				href += '?v=' + version;
+			}
+			
+			var stylesheet = document.createElement('link');
+			stylesheet.setAttribute('rel', 'stylesheet');
+			stylesheet.setAttribute('type', 'text/css');
+			stylesheet.setAttribute('href', href);
+			document.getElementsByTagName('head')[0].appendChild(stylesheet);
+			themesLoaded[url] = true;
+		}		
+	};
+		
+	var isWidgetsetLoaded = function(widgetset) {
+		var className = widgetset.replace(/\./g, "_");
+		return (typeof window[className]) != "undefined";
+	};
+	
+	var loadWidgetset = function(url, widgetset) {
+		if (widgetsets[widgetset]) {
+			return;
+		}
+		log("load widgetset", url, widgetset);
+		setTimeout(function() {
+			if (!isWidgetsetLoaded(widgetset)) {
+				alert("Failed to load the widgetset: " + url);
+			}
+		}, 15000);
+	
+		var scriptTag = document.createElement('script');
+		scriptTag.setAttribute('type', 'text/javascript');
+		scriptTag.setAttribute('src', url);
+		document.getElementsByTagName('head')[0].appendChild(scriptTag);
+		
+		widgetsets[widgetset] = {
+			pendingApps: []
+		};
+	};
+
+	var isInitializedInDom = function(appId) {
+		var appDiv = document.getElementById(appId);
+		if (!appDiv) {
+			return false;
+		}
+		for ( var i = 0; i < appDiv.childElementCount; i++) {
+			var className = appDiv.childNodes[i].className;
+			// If the app div contains a child with the class
+			// "v-app-loading" we have only received the HTML 
+			// but not yet started the widget set
+			// (UIConnector removes the v-app-loading div).
+			if (className && className.indexOf("v-app-loading") != -1) {
+				return false;
+			}
+		}
+		return true;
+	};
+
+	window.vaadin = window.vaadin || {
+		initApplication: function(appId, config) {
+			var testbenchId = appId.replace(/-\d+$/, '');
+			
+			if (apps[appId]) {
+				if (window.vaadin && window.vaadin.clients && window.vaadin.clients[testbenchId] && window.vaadin.clients[testbenchId].initializing) {
+					throw "Application " + appId + " is already being initialized";
+				}
+				if (isInitializedInDom(appId)) {
+					throw "Application " + appId + " already initialized";
+				}
+			}
+
+			log("init application", appId, config);
+			
+			window.vaadin.clients[testbenchId] = {
+					isActive: function() {
+						return true;
+					},
+					initializing: true
+			};
+			
+			var getConfig = function(name) {
+				var value = config[name];
+				return value;
+			};
+			
+			var fetchRootConfig = function(callback) {
+				log('Fetching root config');
+				var url = getConfig('browserDetailsUrl');
+				if (!url) {
+					// No special url defined, use the same URL that loaded this page (without the fragment)
+					url = window.location.href.replace(/#.*/,'');
+				}
+				// Timestamp to avoid caching
+				url += ((/\?/).test(url) ? "&" : "?") + "v-" + (new Date()).getTime();		
+				
+				var params = "v-browserDetails=1";
+				var rootId = getConfig("v-rootId");
+				if (rootId !== undefined) {
+					params += "&v-rootId=" + rootId;
+				}
+
+				// Tell the UI what theme it is configured to use
+				var theme = getConfig('theme');
+				if (theme !== undefined) {
+					params += '&theme=' + encodeURIComponent(theme);
+				}
+				
+				params += "&v-appId=" + appId;
+				
+				var extraParams = getConfig('extraParams')
+				if (extraParams !== undefined) {
+					params += extraParams;
+				}
+				
+				params += '&' + vaadin.getBrowserDetailsParameters(appId, getConfig('sendUrlsAsParameters')); 
+				
+				var r;
+				try {
+					r = new XMLHttpRequest();
+				} catch (e) {
+					r = new ActiveXObject("MSXML2.XMLHTTP.3.0");
+				}
+				r.open('POST', url, true);
+				r.onreadystatechange = function (aEvt) {  
+					if (r.readyState == 4) {
+						// Save responseStatus so as Offline Applications know what happened
+						// when loading root configuration from server, and depending on the
+						// error status display an error message or the offline UI.
+						config.rootResponseStatus = r.status;
+						config.rootResponseText = r.responseText;
+
+						var text = r.responseText;
+						if (r.status == 200){
+							log("Got root config response", text);
+							var updatedConfig = JSON.parse(text);
+							
+							// Copy new properties to the config object
+							for (var property in updatedConfig) {
+								if (updatedConfig.hasOwnProperty(property)) {
+									config[property] = updatedConfig[property];
+								}
+							}
+							
+							// Try bootstrapping again, this time without fetching missing info
+							bootstrapApp(false);
+						} else {
+							log('Error', r.statusText, text);
+							
+							//Let TB waitForVaadin work again
+							delete window.vaadin.clients[testbenchId];
+							
+							// Show the error in the app's div
+							var appDiv = document.getElementById(appId);
+							appDiv.innerHTML = text;
+							appDiv.style['overflow'] = 'auto';
+						}
+
+						// Run the fetchRootConfig callback if present.
+						callback && callback(r);
+					}  
+				};
+				// send parameters as POST data
+				r.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+				r.send(params);
+				
+				log('sending request to ', url);
+			};			
+			
+			//Export public data
+			var app = {
+				getConfig: getConfig,
+				// Used when the app was started in offline, so as it is possible
+				// to defer root configuration loading until network is available.
+				fetchRootConfig: fetchRootConfig
+			};
+			apps[appId] = app;
+			
+			if (!window.name) {
+				window.name =  appId + '-' + Math.random();
+			}
+			
+			var bootstrapApp = function(mayDefer) {
+				var vaadinDir = getConfig('vaadinDir');
+				
+				var versionInfo = getConfig('versionInfo');
+				
+				var themeUri = vaadinDir + 'themes/' + getConfig('theme');
+				loadTheme(themeUri, versionInfo && versionInfo['vaadinVersion']);
+				
+				var widgetset = getConfig('widgetset');
+				var widgetsetUrl = getConfig('widgetsetUrl');
+				if (!widgetsetUrl) {
+					widgetsetUrl = vaadinDir + 'widgetsets/' + widgetset + "/" + widgetset + ".nocache.js?" + new Date().getTime();
+				}
+				loadWidgetset(widgetsetUrl, widgetset);
+				
+				if (getConfig('uidl') === undefined) {
+					if (mayDefer) {
+						fetchRootConfig();
+					} else {
+						throw "May not defer bootstrap any more";
+					}
+				} else {
+					if (widgetsets[widgetset].callback) {
+						log("Starting from bootstrap", appId);
+						widgetsets[widgetset].callback(appId);
+					}  else {
+						log("Setting pending startup", appId);
+						widgetsets[widgetset].pendingApps.push(appId);
+					}
+				}
+			};
+			bootstrapApp(true);
+
+			if (getConfig("debug")) {
+				// TODO debug state is now global for the entire page, but should somehow only be set for the current application  
+				window.vaadin.debug = true;
+			}
+			
+			return app;
+		},
+		clients: {},
+		getAppIds: function() {
+			var ids = [ ];
+			for (var id in apps) {
+				if (apps.hasOwnProperty(id)) {
+					ids.push(id);
+				}
+			}
+			return ids;
+		},
+		getApp: function(appId) {
+			return apps[appId];
+		},
+		loadTheme: loadTheme,
+		registerWidgetset: function(widgetset, callback) {
+			log("Widgetset registered", widgetset);
+			var ws = widgetsets[widgetset];
+			if (ws && ws.pendingApps) {
+				ws.callback = callback;
+				for(var i = 0; i < ws.pendingApps.length; i++) {
+					var appId = ws.pendingApps[i];
+					log("Starting from register widgetset", appId);
+					callback(appId);
+				}
+				ws.pendingApps = null;
+			}
+		},
+		getBrowserDetailsParameters: function(parentElementId, sendUrlsAsParameters) {
+			// Screen height and width
+			var params = 'v-sh=' + window.screen.height;
+			params += '&v-sw=' + window.screen.width;
+			
+			// Window height and width
+			var cw = 0;
+			var ch = 0;
+			if(typeof(window.innerWidth) == 'number') {
+				// Modern browsers
+				cw = window.innerWidth;
+				ch = window.innerHeight;
+			} else {
+				// IE 8
+				cw = document.documentElement.clientWidth;
+				ch = document.documentElement.clientHeight;
+			}
+			params += '&v-cw=' + cw + '&v-ch=' + ch;
+			
+
+			var d = new Date();
+			
+			params += '&v-curdate=' + d.getTime();
+			
+			var tzo1 = d.getTimezoneOffset(); // current offset
+			var dstDiff = 0;
+			var rtzo = tzo1;
+			
+			for (var m=12;m>0;m--) {
+				d.setUTCMonth(m);
+				var tzo2 = d.getTimezoneOffset();
+				if (tzo1 != tzo2) {
+					dstDiff =  (tzo1 > tzo2 ? tzo1-tzo2 : tzo2-tzo1); // offset w/o DST
+					rtzo = (tzo1 > tzo2 ? tzo1 : tzo2); // offset w/o DST
+					break;
+				}
+			}
+
+			// Time zone offset
+			params += '&v-tzo=' + tzo1;
+			
+			// DST difference
+			params += '&v-dstd=' + dstDiff;
+			
+			// Raw time zone offset
+			params += '&v-rtzo=' + rtzo;
+			
+			// DST in effect?
+			params += '&v-dston=' + (tzo1 != rtzo);
+			
+			var pe = document.getElementById(parentElementId);
+			if (pe) {
+				params += '&v-vw=' + pe.offsetWidth;
+				params += '&v-vh=' + pe.offsetHeight;
+			}
+			
+			// Location
+			if (sendUrlsAsParameters !== false) {
+				params += '&v-loc=' + encodeURIComponent(location.href);
+			}
+
+			// Window name
+			if (window.name) {
+				params += '&v-wn=' + encodeURIComponent(window.name);
+			}
+			
+			// Detect touch device support
+			var supportsTouch = false;
+			try {
+				document.createEvent("TouchEvent");
+				supportsTouch = true;
+			} catch (e) {
+				// Chrome and IE10 touch detection
+				supportsTouch = 'ontouchstart' in window
+						|| navigator.msMaxTouchPoints;
+			}
+
+			if (supportsTouch) {
+				params += "&v-td=1";
+			}
+   	        
+	        return params;
+		}
+	};
+	
+	log('Vaadin bootstrap loaded');
+})();
diff --git a/server/src/com/vaadin/annotations/package.html b/server/src/main/resources/com/vaadin/annotations/package.html
index d789e9b5df..d789e9b5df 100644
--- a/server/src/com/vaadin/annotations/package.html
+++ b/server/src/main/resources/com/vaadin/annotations/package.html
diff --git a/server/src/com/vaadin/data/package.html b/server/src/main/resources/com/vaadin/data/package.html
index a14ea1ac88..a14ea1ac88 100644
--- a/server/src/com/vaadin/data/package.html
+++ b/server/src/main/resources/com/vaadin/data/package.html
diff --git a/server/src/com/vaadin/data/util/package.html b/server/src/main/resources/com/vaadin/data/util/package.html
index 07e3acde9e..07e3acde9e 100644
--- a/server/src/com/vaadin/data/util/package.html
+++ b/server/src/main/resources/com/vaadin/data/util/package.html
diff --git a/server/src/com/vaadin/data/validator/package.html b/server/src/main/resources/com/vaadin/data/validator/package.html
index c991bfc82a..c991bfc82a 100644
--- a/server/src/com/vaadin/data/validator/package.html
+++ b/server/src/main/resources/com/vaadin/data/validator/package.html
diff --git a/server/src/com/vaadin/event/package.html b/server/src/main/resources/com/vaadin/event/package.html
index 2e7e17b892..2e7e17b892 100644
--- a/server/src/com/vaadin/event/package.html
+++ b/server/src/main/resources/com/vaadin/event/package.html
diff --git a/server/src/com/vaadin/package.html b/server/src/main/resources/com/vaadin/package.html
index 097fd94aca..097fd94aca 100644
--- a/server/src/com/vaadin/package.html
+++ b/server/src/main/resources/com/vaadin/package.html
diff --git a/server/src/com/vaadin/server/package.html b/server/src/main/resources/com/vaadin/server/package.html
index 83514a0de5..83514a0de5 100644
--- a/server/src/com/vaadin/server/package.html
+++ b/server/src/main/resources/com/vaadin/server/package.html
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/src/com/vaadin/ui/package.html b/server/src/main/resources/com/vaadin/ui/package.html
index 6b19a28fe7..6b19a28fe7 100644
--- a/server/src/com/vaadin/ui/package.html
+++ b/server/src/main/resources/com/vaadin/ui/package.html
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/FieldGroupTests.java
index dce9f656b9..dce9f656b9 100644
--- a/server/tests/src/com/vaadin/data/fieldgroup/FieldGroupTests.java
+++ b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTests.java
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 52acc5ab76..52acc5ab76 100644
--- a/server/tests/src/com/vaadin/data/util/AbstractContainerTestBase.java
+++ b/server/src/test/java/com/vaadin/data/util/AbstractContainerTestBase.java
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..9cede77162 100644
--- a/server/tests/src/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java
+++ b/server/src/test/java/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java
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..3d755f4397 100644
--- a/server/tests/src/com/vaadin/data/util/BeanContainerTest.java
+++ b/server/src/test/java/com/vaadin/data/util/BeanContainerTest.java
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..3c30b41d39 100644
--- a/server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java
+++ b/server/src/test/java/com/vaadin/data/util/BeanItemContainerTest.java
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..89c56b1779 100644
--- a/server/tests/src/com/vaadin/data/util/BeanItemTest.java
+++ b/server/src/test/java/com/vaadin/data/util/BeanItemTest.java
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..8e554d5030 100644
--- a/server/tests/src/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java
+++ b/server/src/test/java/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java
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..422e9756f8 100644
--- a/server/tests/src/com/vaadin/data/util/ContainerOrderedWrapperTest.java
+++ b/server/src/test/java/com/vaadin/data/util/ContainerOrderedWrapperTest.java
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..dd713dd7b0 100644
--- a/server/tests/src/com/vaadin/data/util/ContainerSortingTest.java
+++ b/server/src/test/java/com/vaadin/data/util/ContainerSortingTest.java
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..90ec893f4d 100644
--- a/server/tests/src/com/vaadin/data/util/GeneratedPropertyContainerBasicTest.java
+++ b/server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerBasicTest.java
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..7ecf59c309 100644
--- a/server/tests/src/com/vaadin/data/util/HierarchicalContainerOrderedWrapperTest.java
+++ b/server/src/test/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapperTest.java
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..0b71b3dff9 100644
--- a/server/tests/src/com/vaadin/data/util/HierarchicalContainerTest.java
+++ b/server/src/test/java/com/vaadin/data/util/HierarchicalContainerTest.java
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..5828ac88cc 100644
--- a/server/tests/src/com/vaadin/data/util/IndexedContainerTest.java
+++ b/server/src/test/java/com/vaadin/data/util/IndexedContainerTest.java
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..6535ba1870 100644
--- a/server/tests/src/com/vaadin/data/util/NestedMethodPropertyTest.java
+++ b/server/src/test/java/com/vaadin/data/util/NestedMethodPropertyTest.java
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..99ca58ba42 100644
--- a/server/tests/src/com/vaadin/data/util/ObjectPropertyTest.java
+++ b/server/src/test/java/com/vaadin/data/util/ObjectPropertyTest.java
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..042f260be8 100644
--- a/server/tests/src/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java
+++ b/server/src/test/java/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java
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..9d662b2599 100644
--- a/server/tests/src/com/vaadin/data/util/PropertyDescriptorTest.java
+++ b/server/src/test/java/com/vaadin/data/util/PropertyDescriptorTest.java
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..ff83db4437 100644
--- a/server/tests/src/com/vaadin/data/util/PropertySetItemTest.java
+++ b/server/src/test/java/com/vaadin/data/util/PropertySetItemTest.java
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..1f42f4e935 100644
--- a/server/tests/src/com/vaadin/data/util/filter/AndOrFilterTest.java
+++ b/server/src/test/java/com/vaadin/data/util/filter/AndOrFilterTest.java
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..fc5ffb9b56 100644
--- a/server/tests/src/com/vaadin/data/util/filter/CompareFilterTest.java
+++ b/server/src/test/java/com/vaadin/data/util/filter/CompareFilterTest.java
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..953bf3cd65 100644
--- a/server/tests/src/com/vaadin/data/util/filter/IsNullFilterTest.java
+++ b/server/src/test/java/com/vaadin/data/util/filter/IsNullFilterTest.java
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..9ba5168ac9 100644
--- a/server/tests/src/com/vaadin/data/util/filter/LikeFilterTest.java
+++ b/server/src/test/java/com/vaadin/data/util/filter/LikeFilterTest.java
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..310b749ce2 100644
--- a/server/tests/src/com/vaadin/data/util/filter/NotFilterTest.java
+++ b/server/src/test/java/com/vaadin/data/util/filter/NotFilterTest.java
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..fcaff6f2c3 100644
--- a/server/tests/src/com/vaadin/data/util/filter/SimpleStringFilterTest.java
+++ b/server/src/test/java/com/vaadin/data/util/filter/SimpleStringFilterTest.java
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..d2c7ad85ed 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/AllTests.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/AllTests.java
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/TicketTests.java
index e180e3f3e7..e180e3f3e7 100644
--- a/server/tests/src/com/vaadin/data/util/sqlcontainer/TicketTests.java
+++ b/server/src/test/java/com/vaadin/data/util/sqlcontainer/TicketTests.java
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..6c57445564 100644
--- a/server/tests/src/com/vaadin/server/JSONSerializerTest.java
+++ b/server/src/test/java/com/vaadin/server/JSONSerializerTest.java
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..3f940ae0a7 100644
--- a/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
+++ b/server/src/test/java/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.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/VaadinPortletRequestTests.java
index bf2b809529..bf2b809529 100644
--- a/server/tests/src/com/vaadin/server/VaadinPortletRequestTests.java
+++ b/server/src/test/java/com/vaadin/server/VaadinPortletRequestTests.java
diff --git a/server/tests/src/com/vaadin/server/VaadinPortletServiceTests.java b/server/src/test/java/com/vaadin/server/VaadinPortletServiceTests.java
index 38f3b85043..38f3b85043 100644
--- a/server/tests/src/com/vaadin/server/VaadinPortletServiceTests.java
+++ b/server/src/test/java/com/vaadin/server/VaadinPortletServiceTests.java
diff --git a/server/tests/src/com/vaadin/server/VaadinPortletTests.java b/server/src/test/java/com/vaadin/server/VaadinPortletTests.java
index f92aa0dcaa..f92aa0dcaa 100644
--- a/server/tests/src/com/vaadin/server/VaadinPortletTests.java
+++ b/server/src/test/java/com/vaadin/server/VaadinPortletTests.java
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..f9e12ce75f 100644
--- a/server/tests/src/com/vaadin/server/communication/AtmospherePushConnectionTest.java
+++ b/server/src/test/java/com/vaadin/server/communication/AtmospherePushConnectionTest.java
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..a61c0c9986 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/ConverterFactoryTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/ConverterFactoryTest.java
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..d767430cc1 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/DateToLongConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java
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..46dca6d13e 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java
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..06d407c9f4 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java
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..057017790d 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java
diff --git a/server/tests/src/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java
index 6e81af97a3..6e81af97a3 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java
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..3859d03cc3 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToByteConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToByteConverterTest.java
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..16008d89c2 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToDateConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToDateConverterTest.java
diff --git a/server/tests/src/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java
index 7054587009..7054587009 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java
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..86319e641c 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToFloatConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToFloatConverterTest.java
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..0076f2c9d1 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java
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..989dbcbbf5 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToLongConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToLongConverterTest.java
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..ab255bce80 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/StringToShortConverterTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToShortConverterTest.java
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..36f120151b 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java
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..92fabbb02a 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java
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..03f35fe1bb 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java
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..8199419b67 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/CompositeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java
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..7bb3e20160 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/DateRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/DateRangeValidatorTest.java
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..b096937bd2 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java
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..19fe9e6580 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/EmailValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/EmailValidatorTest.java
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..c5a07be43f 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java
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..5e64d0107e 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java
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..440e9c3fd2 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/LongRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/LongRangeValidatorTest.java
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..1e08ea7e2c 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/NullValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/NullValidatorTest.java
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..2a62d23059 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/RegexpValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/RegexpValidatorTest.java
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..69d22eb91e 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java
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..5f12367f09 100644
--- a/server/tests/src/com/vaadin/tests/data/validator/StringLengthValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/data/validator/StringLengthValidatorTest.java
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..e2a91000c1 100644
--- a/server/tests/src/com/vaadin/tests/design/DesignFormatterTest.java
+++ b/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.java
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/InvalidTagNames.java
index 9f405f4e56..9f405f4e56 100644
--- a/server/tests/src/com/vaadin/tests/design/InvalidTagNames.java
+++ b/server/src/test/java/com/vaadin/tests/design/InvalidTagNames.java
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..91036c03ed 100644
--- a/server/tests/src/com/vaadin/tests/server/AbstractContainerListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/AbstractContainerListenersTest.java
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..fd38b52a37 100644
--- a/server/tests/src/com/vaadin/tests/server/AbstractPropertyListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java
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..087a7fb0f5 100644
--- a/server/tests/src/com/vaadin/tests/server/AssertionsEnabledTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/AssertionsEnabledTest.java
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..90a0283cda 100644
--- a/server/tests/src/com/vaadin/tests/server/AtmosphereVersionTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/AtmosphereVersionTest.java
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..c22e289bc4 100644
--- a/server/tests/src/com/vaadin/tests/server/ClassesSerializableTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/ClassesSerializableTest.java
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..1ec19724d8 100644
--- a/server/tests/src/com/vaadin/tests/server/ClientMethodSerializationTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/ClientMethodSerializationTest.java
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..67f39d301d 100644
--- a/server/tests/src/com/vaadin/tests/server/EventRouterTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/EventRouterTest.java
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..3c68e86afa 100644
--- a/server/tests/src/com/vaadin/tests/server/FileTypeResolverTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/FileTypeResolverTest.java
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..594f5627dd 100644
--- a/server/tests/src/com/vaadin/tests/server/IndexedContainerListenersTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/IndexedContainerListenersTest.java
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..d632e65c9f 100644
--- a/server/tests/src/com/vaadin/tests/server/KeyMapperTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/KeyMapperTest.java
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..36007fae17 100644
--- a/server/tests/src/com/vaadin/tests/server/MimeTypesTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/MimeTypesTest.java
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..6563556a4e 100644
--- a/server/tests/src/com/vaadin/tests/server/PropertyFormatterTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java
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..4de30e579e 100644
--- a/server/tests/src/com/vaadin/tests/server/SerializationTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/SerializationTest.java
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..04e621d5d2 100644
--- a/server/tests/src/com/vaadin/tests/server/SimpleMultiPartInputStreamTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/SimpleMultiPartInputStreamTest.java
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..b430c7cf84 100644
--- a/server/tests/src/com/vaadin/tests/server/StreamVariableMappingTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/StreamVariableMappingTest.java
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..4e8f987def 100644
--- a/server/tests/src/com/vaadin/tests/server/component/AbstractListenerMethodsTestBase.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/AbstractListenerMethodsTestBase.java
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..2083d1f473 100644
--- a/server/tests/src/com/vaadin/tests/server/component/ComponentSizeParseTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/ComponentSizeParseTest.java
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/FieldDefaultValues.java
index 16bbd7008f..16bbd7008f 100644
--- a/server/tests/src/com/vaadin/tests/server/component/FieldDefaultValues.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValues.java
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..ad80007882 100644
--- a/server/tests/src/com/vaadin/tests/server/component/FinalMethodTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/FinalMethodTest.java
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..5cf3b9700e 100644
--- a/server/tests/src/com/vaadin/tests/server/component/ReadEmptyDesignTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/ReadEmptyDesignTest.java
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..da4d8a92d4 100644
--- a/server/tests/src/com/vaadin/tests/server/component/StateGetDoesNotMarkDirtyTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/StateGetDoesNotMarkDirtyTest.java
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..a535de2b24 100644
--- a/server/tests/src/com/vaadin/tests/server/component/WriteEmptyDesignTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/WriteEmptyDesignTest.java
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..eac7ff4d8a 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
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..18eb79aadc 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
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..3a2150b700 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
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..02aa6afe07 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
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..94ff10926f 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
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..def3ceb643 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
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..68e198c37a 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
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..ee806cb5f7 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
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/OptionGroupDeclarativeTests.java
index 509e46c278..509e46c278 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTests.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTests.java
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/OptionGroupTests.java
index c4a3d73652..c4a3d73652 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractselect/OptionGroupTests.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupTests.java
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..2334542676 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
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..0896b5d649 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
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..4478048b12 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
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..8a066497cd 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
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..f5467b2d18 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
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..6d774366a9 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
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..ae72f9c743 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
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/GridChildren.java
index 7af1cfef69..7af1cfef69 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/GridChildren.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridChildren.java
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/GridColumns.java
index 83e9f21756..83e9f21756 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/GridColumns.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridColumns.java
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/GridSelection.java
index dc641965ba..dc641965ba 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/GridSelection.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridSelection.java
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 0e4293481e..0e4293481e 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..4287d58d9c 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
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..68007bd870 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
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..c2dc175c75 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
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..3b3dfb94d8 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
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..9a2a5f1f50 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
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..f9d373e864 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
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..ceb4c865d2 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
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..fce514954a 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
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..7fd5bc67f6 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
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/TableSelectable.java
index 1af99a08eb..1af99a08eb 100644
--- a/server/tests/src/com/vaadin/tests/server/component/table/TableSelectable.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/table/TableSelectable.java
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..3f3c52d6c0 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
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..83c45f94db 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
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..8f2bec455b 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
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..b2a51aad8b 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
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..c327fe8c5f 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
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..449f418596 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
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..a886b74f57 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
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..4a34094da1 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
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..470f04c15c 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
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..13d4c6bfe6 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
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..87a1af301c 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
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..f19821f92e 100644
--- a/server/tests/src/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTestBase.java
+++ b/server/src/test/java/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTestBase.java
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..91a302a274 100644
--- a/server/tests/src/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java
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..f55798007f 100644
--- a/server/tests/src/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java
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..637947fc9b 100644
--- a/server/tests/src/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java
+++ b/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java
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..f3cc337657 100644
--- a/server/tests/src/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java
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..d8b366ffbc 100644
--- a/server/tests/src/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java
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..3467d1d80c 100644
--- a/server/tests/src/com/vaadin/tests/server/components/GridLayoutLastRowRemovalTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/components/GridLayoutLastRowRemovalTest.java
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..cfceb6f7d7 100644
--- a/server/tests/src/com/vaadin/tests/server/components/TextFieldValueChangeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java
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..26fe238342 100644
--- a/server/tests/src/com/vaadin/tests/server/components/WindowTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/components/WindowTest.java
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..bc067ddb88 100644
--- a/server/tests/src/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java
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..0de804fa0b 100644
--- a/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/navigator/NavigatorTest.java
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..6b7582525e 100644
--- a/server/tests/src/com/vaadin/tests/server/validation/BeanValidationTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java
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..e3320b8699 100644
--- a/server/tests/src/com/vaadin/tests/server/validation/RangeValidatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/validation/RangeValidatorTest.java
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..abdc6c1a5c 100644
--- a/server/tests/src/com/vaadin/tests/util/UniqueSerializableTest.java
+++ b/server/src/test/java/com/vaadin/tests/util/UniqueSerializableTest.java
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/DateFieldTests.java
index 6a75b4630c..6a75b4630c 100644
--- a/server/tests/src/com/vaadin/ui/DateFieldTests.java
+++ b/server/src/test/java/com/vaadin/ui/DateFieldTests.java
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/tests/src/com/vaadin/tests/styles.scss b/server/src/test/resources/com/vaadin/tests/styles.scss
index d574243969..d574243969 100644
--- a/server/tests/src/com/vaadin/tests/styles.scss
+++ b/server/src/test/resources/com/vaadin/tests/styles.scss
diff --git a/uitest/build.xml b/uitest/build.xml
index 0344af0866..3823c937c1 100644
--- a/uitest/build.xml
+++ b/uitest/build.xml
@@ -36,7 +36,7 @@
         <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" />
+        <property name="server.test.sources" location="${result.dir}/../../server/src/test/java" />
         <mkdir dir="${classes}" />
 
         <!-- TODO: Get rid of this -->
diff --git a/uitest/ivy.xml b/uitest/ivy.xml
index 4939c31d1f..0f2141e00b 100644
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@ -36,7 +36,7 @@
         <!-- 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>