diff --git a/.classpath b/.classpath index 70997e763b6..ae0241e6017 100644 --- a/.classpath +++ b/.classpath @@ -1,10 +1,10 @@ - + - + diff --git a/.gitignore b/.gitignore index 8cb8b213cad..d412437ad76 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 2f1dcfd22fa..748ce9bd568 100644 --- a/client-compiled/ivy.xml +++ b/client-compiled/ivy.xml @@ -22,7 +22,7 @@ + rev="${vaadin.version}" conf="compile-module-> default" /> + rev="${vaadin.version}" conf="build -> default" /> + rev="${vaadin.version}" conf="build,test->default"> diff --git a/ivysettings.xml b/ivysettings.xml index d8c870b068a..5502a5c3a55 100644 --- a/ivysettings.xml +++ b/ivysettings.xml @@ -40,7 +40,7 @@ + resolver="local-maven" /> + rev="${vaadin.version}" conf="deps -> default" transitive="false" /> diff --git a/server/build.xml b/server/build.xml deleted file mode 100644 index 95c0b0add4c..00000000000 --- a/server/build.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - Compiles build helpers used when building other - modules. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/ivy.xml b/server/ivy.xml index c384829a163..05af3528c0a 100644 --- a/server/ivy.xml +++ b/server/ivy.xml @@ -8,87 +8,68 @@ revision="${vaadin.version}" /> - - - - - - - - - + + rev="6.0.2" conf="ide -> default" /> + rev="3.0.1" conf="ide -> default" /> + rev="2.0" conf="ide -> default" /> + rev="1.7.7" conf="ide -> default" /> + rev="1.0.0.GA" conf="ide -> default" /> - - - - - - - - - - + rev="${vaadin.sass.version}" conf="ide ->default"> + + conf="ide -> default" /> + conf="ide -> default" /> + conf="ide ->default" /> + conf="ide ->default" /> + conf="ide -> default" transitive="true" /> + conf="ide -> default" /> + conf="ide->default" /> + rev="2.6" conf="ide ->default" /> + conf="ide -> default" /> + rev="4.2.0.Final" conf="ide -> default" /> + conf="ide" /> --> + + 4.0.0 + + com.vaadin + vaadin-parent + 1.0.0 + + com.vaadin + vaadin-server + vaadin-server + jar + 7.7.0-SNAPSHOT + + + 1.6 + 1.6 + + 0.9.13 + 2.4 + 16.0.1.vaadin1 + + 2.7.0.vaadin3 + + + + Vaadin Ltd + + https://vaadin.com/ + Vaadin shared + + + + + + + com.liferay.portal + portal-service + 6.0.2 + provided + + + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + + + javax.portlet + portlet-api + 2.0 + provided + + + + + com.google.appengine + appengine-api-1.0-sdk + 1.7.7 + provided + + + + + javax.validation + validation-api + 1.0.0.GA + provided + + + + + com.vaadin + vaadin-sass-compiler + ${vaadin.sass.version} + + + + + + com.vaadin + vaadin-shared + ${project.version} + + + com.vaadin + vaadin-push + ${project.version} + provided + + + + + org.jsoup + jsoup + 1.8.3 + + + + + + + junit + junit + 4.11 + test + + + org.mockito + mockito-all + 1.9.5 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.easymock + easymock + 3.0 + test + + + org.hsqldb + hsqldb + 2.2.6 + test + + + commons-io + commons-io + ${commons-io.version} + test + + + commons-lang + commons-lang + 2.6 + test + + + + org.slf4j + slf4j-log4j12 + 1.6.1 + test + + + org.hibernate + hibernate-validator + 4.2.0.Final + test + + + + + + + + com.vaadin.external.gwt + gwt-user + ${vaadin.gwt.version} + provided + + + com.vaadin.external.gwt + gwt-elemental + ${vaadin.gwt.version} + provided + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + unpack-dependencies + prepare-package + + unpack + + + + + com.vaadin.external.gwt + gwt-user + + + com/google/gwt/*/server/** + ${project.build.directory}/classes + false + true + + + + + + + + maven-resources-plugin + + + + copy-sources + + prepare-package + + copy-resources + + + ${project.build.directory}/classes + + + src/main/resources + false + + + src/main/java + false + + + + + + + + + maven-antrun-plugin + 1.8 + + + compressbootstrap + prepare-package + + run + + + + + + + + + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + JavaSE-1.6 + com.vaadin.*;version="${project.version}",com.google.*;version="${project.version}" + 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 + 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" + + + + + bundle-manifest + prepare-package + + manifest + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.6 + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + false + + true + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.19.1 + + + + + diff --git a/server/src/com/vaadin/annotations/AutoGenerated.java b/server/src/main/java/com/vaadin/annotations/AutoGenerated.java similarity index 100% rename from server/src/com/vaadin/annotations/AutoGenerated.java rename to 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 similarity index 100% rename from server/src/com/vaadin/annotations/DesignRoot.java rename to 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 similarity index 100% rename from server/src/com/vaadin/annotations/JavaScript.java rename to 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 similarity index 100% rename from server/src/com/vaadin/annotations/PreserveOnRefresh.java rename to 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 similarity index 100% rename from server/src/com/vaadin/annotations/Push.java rename to 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 similarity index 100% rename from server/src/com/vaadin/annotations/StyleSheet.java rename to 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 similarity index 100% rename from server/src/com/vaadin/annotations/Theme.java rename to 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 similarity index 100% rename from server/src/com/vaadin/annotations/Title.java rename to 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 similarity index 100% rename from server/src/com/vaadin/annotations/VaadinServletConfiguration.java rename to 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 similarity index 100% rename from server/src/com/vaadin/annotations/Viewport.java rename to 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 similarity index 100% rename from server/src/com/vaadin/annotations/ViewportGeneratorClass.java rename to 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 similarity index 100% rename from server/src/com/vaadin/annotations/Widgetset.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/Buffered.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/BufferedValidatable.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/Collapsible.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/Container.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/ContainerHelpers.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/Item.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/Property.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/Validatable.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/Validator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/fieldgroup/BeanFieldGroup.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/fieldgroup/Caption.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/fieldgroup/FieldGroup.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/fieldgroup/PropertyId.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/sort/Sort.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/sort/SortOrder.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/AbstractBeanContainer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/AbstractContainer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/AbstractInMemoryContainer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/AbstractProperty.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/BeanContainer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/BeanItem.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/BeanItemContainer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/BeanUtil.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/ContainerOrderedWrapper.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/DefaultItemSorter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/FilesystemContainer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/GeneratedPropertyContainer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/HierarchicalContainer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/IndexedContainer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/ItemSorter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/LegacyPropertyHelper.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/ListSet.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/MethodProperty.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/MethodPropertyDescriptor.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/NestedMethodProperty.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/NestedPropertyDescriptor.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/ObjectProperty.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/PropertyFormatter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/PropertyValueGenerator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/PropertysetItem.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/TextFileProperty.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/TransactionalPropertyWrapper.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/VaadinPropertyDescriptor.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/converter/AbstractStringToNumberConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/converter/Converter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/converter/ConverterFactory.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/converter/ConverterUtil.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/converter/DateToLongConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/converter/DateToSqlDateConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/converter/DefaultConverterFactory.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/converter/ReverseConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/converter/StringToBigDecimalConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/converter/StringToBigIntegerConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/converter/StringToBooleanConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/converter/StringToByteConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/converter/StringToCollectionConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/converter/StringToDateConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/converter/StringToDoubleConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/converter/StringToEnumConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/converter/StringToFloatConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/converter/StringToIntegerConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/converter/StringToLongConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/converter/StringToShortConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/filter/AbstractJunctionFilter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/filter/And.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/filter/Between.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/filter/Compare.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/filter/IsNull.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/filter/Like.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/filter/Not.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/filter/Or.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/filter/SimpleStringFilter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/filter/UnsupportedFilterException.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/CacheMap.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/Reference.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/RowId.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/RowItem.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/SQLUtil.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/OrderBy.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/AbstractStringValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/AbstractValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/BeanValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/BigDecimalRangeValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/BigIntegerRangeValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/ByteRangeValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/CompositeValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/DateRangeValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/DoubleRangeValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/DoubleValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/EmailValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/FloatRangeValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/IntegerRangeValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/IntegerValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/LongRangeValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/NullValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/RangeValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/RegexpValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/ShortRangeValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/StringLengthValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/Action.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/ActionManager.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/ConnectorActionManager.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/ConnectorEvent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/ConnectorEventListener.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/ContextClickEvent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/DataBoundTransferable.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/EventRouter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/FieldEvents.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/ItemClickEvent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/LayoutEvents.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/ListenerMethod.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/MethodEventSource.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/MouseEvents.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/SelectionEvent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/ShortcutAction.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/ShortcutListener.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/SortEvent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/Transferable.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/TransferableImpl.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/UIEvents.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/dd/DragAndDropEvent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/dd/DragSource.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/dd/DropHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/dd/DropTarget.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/dd/TargetDetails.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/dd/TargetDetailsImpl.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/dd/acceptcriteria/AcceptAll.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/dd/acceptcriteria/And.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/dd/acceptcriteria/Not.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/dd/acceptcriteria/Or.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java rename to 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 similarity index 100% rename from server/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java rename to 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 similarity index 100% rename from server/src/com/vaadin/navigator/NavigationStateManager.java rename to 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 similarity index 100% rename from server/src/com/vaadin/navigator/Navigator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/navigator/View.java rename to 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 similarity index 100% rename from server/src/com/vaadin/navigator/ViewChangeListener.java rename to 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 similarity index 100% rename from server/src/com/vaadin/navigator/ViewDisplay.java rename to 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 similarity index 100% rename from server/src/com/vaadin/navigator/ViewProvider.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/AbstractClientConnector.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/AbstractDeploymentConfiguration.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/AbstractErrorMessage.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/AbstractExtension.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/AbstractJavaScriptExtension.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/BootstrapFragmentResponse.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/BootstrapHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/BootstrapListener.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/BootstrapPageResponse.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/BootstrapResponse.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/BrowserWindowOpener.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/ClassResource.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/ClientConnector.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/ClientMethodInvocation.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/ComponentSizeValidator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/CompositeErrorMessage.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/ConnectorResource.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/ConnectorResourceHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/Constants.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/CustomizedSystemMessages.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/DefaultDeploymentConfiguration.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/DefaultErrorHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/DefaultSystemMessagesProvider.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/DefaultUIProvider.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/DeploymentConfiguration.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/DownloadStream.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/DragAndDropService.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/EncodeResult.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/ErrorEvent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/ErrorHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/ErrorHandlingRunnable.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/ErrorMessage.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/Extension.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/ExternalResource.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/FileDownloader.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/FileResource.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/FontAwesome.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/FontIcon.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/GAEVaadinServlet.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/GenericFontIcon.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/GlobalResourceHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/JavaScriptCallbackHelper.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/JsonCodec.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/JsonPaintTarget.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/KeyMapper.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/LegacyApplication.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/LegacyApplicationUIProvider.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/LegacyCommunicationManager.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/LegacyPaint.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/LegacyVaadinPortlet.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/LegacyVaadinServlet.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/LocaleService.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/NoInputStreamException.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/NoOutputStreamException.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/Page.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/PaintException.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/PaintTarget.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/RequestHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/Resource.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/ResourceReference.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/Responsive.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/RestrictedRenderResponse.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/Scrollable.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/ServerRpcManager.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/ServerRpcMethodInvocation.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/ServiceDestroyEvent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/ServiceDestroyListener.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/ServiceException.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/ServletPortletHelper.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/SessionDestroyEvent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/SessionDestroyListener.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/SessionExpiredException.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/SessionExpiredHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/SessionInitEvent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/SessionInitListener.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/SizeWithUnit.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/Sizeable.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/StreamResource.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/StreamVariable.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/SynchronizedRequestHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/SystemError.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/SystemMessageException.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/SystemMessages.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/SystemMessagesInfo.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/SystemMessagesProvider.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/ThemeResource.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/UIClassSelectionEvent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/UICreateEvent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/UIProvider.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/UIProviderEvent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/UnsupportedBrowserHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/UploadException.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/UserError.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/VaadinPortlet.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/VaadinPortletRequest.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/VaadinPortletResponse.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/VaadinPortletService.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/VaadinPortletSession.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/VaadinRequest.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/VaadinResponse.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/VaadinService.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/VaadinServiceClassLoaderUtil.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/VaadinServlet.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/VaadinServletRequest.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/VaadinServletResponse.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/VaadinServletService.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/VaadinSession.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/VariableOwner.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/ViewportGenerator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/WebBrowser.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/WrappedHttpSession.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/WrappedPortletSession.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/WrappedSession.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/AbstractStreamingEvent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/AtmospherePushConnection.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/ClientRpcWriter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/ConnectorHierarchyWriter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/ConnectorTypeWriter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/DateSerializer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/FileUploadHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/HeartbeatHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/JSONSerializer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/JSR356WebsocketInitializer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/LegacyUidlWriter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/MetadataWriter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/PortletBootstrapHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/PortletDummyRequestHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/PortletListenerNotifier.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/PortletStateAwareRequestHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/PortletUIInitHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/PublishedFileHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/PushAtmosphereHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/PushConnection.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/PushHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/PushRequestHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/ResourceWriter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/ServerRpcHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/ServletBootstrapHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/ServletUIInitHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/SessionRequestHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/SharedStateWriter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/StreamingEndEventImpl.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/StreamingErrorEventImpl.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/StreamingProgressEventImpl.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/StreamingStartEventImpl.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/UIInitHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/UidlRequestHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/UidlWriter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/data/DataGenerator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/communication/data/RpcDataProviderExtension.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/themeutils/SASSAddonImportFileCreator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/widgetsetutils/ClassPathExplorer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/AbsoluteLayout.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/AbstractColorPicker.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/AbstractComponent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/AbstractComponentContainer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/AbstractEmbedded.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/AbstractField.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/AbstractFocusable.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/AbstractJavaScriptComponent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/AbstractLayout.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/AbstractMedia.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/AbstractOrderedLayout.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/AbstractSelect.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/AbstractSingleComponentContainer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/AbstractSplitPanel.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/AbstractTextField.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Accordion.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Alignment.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Audio.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/BrowserFrame.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Button.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Calendar.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/CheckBox.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/ColorPicker.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/ColorPickerArea.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/ComboBox.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Component.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/ComponentContainer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/ConnectorTracker.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/CssLayout.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/CustomComponent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/CustomField.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/CustomLayout.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/DateField.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/DefaultFieldFactory.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/DragAndDropWrapper.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Embedded.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Field.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Flash.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Form.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/FormFieldFactory.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/FormLayout.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Grid.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/GridLayout.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/HasChildMeasurementHint.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/HasComponents.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/HorizontalLayout.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/HorizontalSplitPanel.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Html5File.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Image.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/InlineDateField.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/JavaScript.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/JavaScriptFunction.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Label.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Layout.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/LegacyComponent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/LegacyWindow.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Link.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/ListSelect.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/LoadingIndicatorConfiguration.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/LoginForm.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/MenuBar.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/NativeButton.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/NativeSelect.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Notification.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/NotificationConfiguration.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/OptionGroup.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Panel.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/PasswordField.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/PopupDateField.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/PopupView.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/ProgressBar.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/ProgressIndicator.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/PushConfiguration.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/ReconnectDialogConfiguration.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/RichTextArea.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Select.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/SelectiveRenderer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/SingleComponentContainer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Slider.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/TabSheet.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Table.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/TableFieldFactory.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/TextArea.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/TextField.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/TooltipConfiguration.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Tree.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/TreeTable.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/TwinColSelect.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/UI.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/UIDetachedException.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/UniqueSerializable.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Upload.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/VerticalLayout.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/VerticalSplitPanel.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Video.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/Window.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/calendar/CalendarComponentEvent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/calendar/CalendarComponentEvents.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/calendar/CalendarDateRange.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/calendar/CalendarTargetDetails.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/calendar/ContainerEventProvider.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/calendar/event/BasicEvent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/calendar/event/BasicEventProvider.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/calendar/event/CalendarEvent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/colorpicker/ColorChangeListener.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/colorpicker/ColorSelector.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/declarative/Design.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/declarative/DesignAttributeHandler.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/declarative/DesignContext.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/declarative/DesignException.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/declarative/DesignFormatter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/declarative/FieldBinder.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/declarative/FieldBindingException.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/declarative/ShouldWriteDataDelegate.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/declarative/converters/DesignDateConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/declarative/converters/DesignEnumConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/declarative/converters/DesignObjectConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/declarative/converters/DesignResourceConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/declarative/converters/DesignToStringConverter.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/declarative/converters/ShortcutKeyMapper.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/renderers/ButtonRenderer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/renderers/ClickableRenderer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/renderers/DateRenderer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/renderers/HtmlRenderer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/renderers/ImageRenderer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/renderers/NumberRenderer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/renderers/ProgressBarRenderer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/renderers/Renderer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/renderers/TextRenderer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/themes/BaseTheme.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/themes/ChameleonTheme.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/themes/LiferayTheme.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/themes/Reindeer.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/themes/Runo.java rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/themes/ValoTheme.java rename to 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 similarity index 100% rename from server/src/com/vaadin/util/ConnectorHelper.java rename to 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 similarity index 100% rename from server/src/com/vaadin/util/CurrentInstance.java rename to 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 similarity index 100% rename from server/src/com/vaadin/util/FileTypeResolver.java rename to 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 similarity index 100% rename from server/src/com/vaadin/util/ReflectTools.java rename to 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 similarity index 100% rename from server/src/com/vaadin/util/SerializerHelper.java rename to 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 00000000000..89514dbcc23 --- /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 similarity index 100% rename from server/src/com/vaadin/annotations/package.html rename to 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 similarity index 100% rename from server/src/com/vaadin/data/package.html rename to 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 similarity index 100% rename from server/src/com/vaadin/data/util/package.html rename to 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 similarity index 100% rename from server/src/com/vaadin/data/validator/package.html rename to 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 similarity index 100% rename from server/src/com/vaadin/event/package.html rename to 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 similarity index 100% rename from server/src/com/vaadin/package.html rename to 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 similarity index 100% rename from server/src/com/vaadin/server/package.html rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/doc-files/component_class_hierarchy.gif rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/doc-files/component_interfaces.gif rename to 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 similarity index 100% rename from server/src/com/vaadin/ui/package.html rename to server/src/main/resources/com/vaadin/ui/package.html diff --git a/server/tests/src/ClassInDefaultPackage.java b/server/src/test/java/ClassInDefaultPackage.java similarity index 100% rename from server/tests/src/ClassInDefaultPackage.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/benchmarks/PerformanceTester8759.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/fieldgroup/BeanFieldGroupTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/fieldgroup/FieldGroupDateTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/fieldgroup/FieldGroupTests.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/AbstractBeanContainerTestBase.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/AbstractContainerTestBase.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/BeanContainerTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/BeanItemContainerGenerator.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/BeanItemContainerSortTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/BeanItemTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/ContainerOrderedWrapperTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/ContainerSizeAssertTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/ContainerSortingTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/FileSystemContainerTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/GeneratedPropertyContainerBasicTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/GeneratedPropertyContainerTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/HierarchicalContainerOrderedWrapperTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/HierarchicalContainerTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/IndexedContainerTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/NestedMethodPropertyTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/ObjectPropertyTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/PropertyDescriptorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/PropertySetItemTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/TransactionalPropertyWrapperTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/filter/AbstractFilterTestBase.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/filter/AndOrFilterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/filter/CompareFilterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/filter/IsNullFilterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/filter/LikeFilterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/filter/NotFilterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/filter/SimpleStringFilterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/AllTests.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/DataGenerator.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/RowIdTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/TicketTests.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/UtilTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/AbstractClientConnectorProxyHandlingTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/AbstractClientConnectorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/AbstractDeploymentConfigurationTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/BrowserWindowOpenerTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/ConnectorResourceHandlerTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/DefaultDeploymentConfigurationTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/DownloadStreamTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/DragAndDropServiceTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/JSONSerializerTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/JsonEqualsTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/MockServletConfig.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/MockServletContext.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/MockUIContainingServlet.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/MockVaadinSession.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/PageTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/VaadinGateInRequestTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/VaadinHttpAndPortletRequestTestBase.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/VaadinLiferayRequestTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/VaadinPortletRequestTests.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/VaadinPortletServiceTests.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/VaadinPortletTests.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/VaadinServiceTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/VaadinServletConfigurationTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/VaadinServletTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/VaadinSessionTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/VaadinWebSpherePortalRequestTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/communication/AtmospherePushConnectionTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/communication/FileUploadHandlerTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/server/communication/MetadataWriterTest.java rename to 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 similarity index 83% rename from server/tests/src/com/vaadin/tests/CompileTransitionPropertyTest.java rename to server/src/test/java/com/vaadin/tests/CompileTransitionPropertyTest.java index d6c564a42b2..337ce19a06d 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 void testCompilation() throws Exception { 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/VaadinClasses.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/components/menubar/MenuBarDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/bean/Address.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/bean/AnotherTestEnum.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/bean/BeanToValidate.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/bean/BeanWithReadOnlyField.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/bean/Country.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/bean/Person.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/bean/PersonWithBeanValidationAnnotations.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/bean/Sex.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/bean/TestEnum.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/converter/ConverterFactoryTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/converter/DateToLongConverterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/converter/StringToByteConverterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/converter/StringToDateConverterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/converter/StringToEnumConverterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/converter/StringToFloatConverterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/converter/StringToLongConverterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/converter/StringToShortConverterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/validator/CompositeValidatorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/validator/DateRangeValidatorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/validator/EmailValidatorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/validator/LongRangeValidatorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/validator/NullValidatorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/validator/RegexpValidatorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/data/validator/StringLengthValidatorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/AbstractComponentSetResponsiveTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/ComponentFactoryTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/ComponentMapperTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/DeclarativeTestBase.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/DeclarativeTestBaseBase.java rename to 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 similarity index 77% rename from server/tests/src/com/vaadin/tests/design/DesignContextLocalIdTest.java rename to server/src/test/java/com/vaadin/tests/design/DesignContextLocalIdTest.java index f8fb1249b95..d488b9fc08e 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 @@ 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 void testWriteChildLocalIds() throws Exception { 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 void testWriteChildLocalIds() throws Exception { 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/DesignFormatterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/DesignReadInConstructor.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/DesignReadInConstructorTest.java rename to 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 similarity index 72% rename from server/tests/src/com/vaadin/tests/design/DesignTest.java rename to server/src/test/java/com/vaadin/tests/design/DesignTest.java index a5ccef0d2ce..cf19aecb874 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 @@ 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 static class MyVerticalLayout extends VerticalLayout { @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 void writeComponentToStream() throws IOException { 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/EmbeddedsTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/FieldNameWhichConflictsWithGettersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/InvalidLayoutTemplate.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/InvalidTagNames.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/LayoutTemplate.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/LocaleTest.java rename to 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 similarity index 75% rename from server/tests/src/com/vaadin/tests/design/ParseAllSupportedComponentsTest.java rename to server/src/test/java/com/vaadin/tests/design/ParseAllSupportedComponentsTest.java index d944826f107..54902c29fe9 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 similarity index 92% rename from server/tests/src/com/vaadin/tests/design/ParseLayoutTest.java rename to server/src/test/java/com/vaadin/tests/design/ParseLayoutTest.java index 20903512d12..784c986e1c3 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 java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; @@ -46,8 +45,8 @@ /** * A test for checking that parsing a layout preserves the IDs and the mapping - * from prefixes to package names (for example ) + * from prefixes to package names (for example + * ) * * @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 @@ private void assertButtonProperties() { @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 void fieldsAreBoundToATemplate() throws IOException { @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 similarity index 84% rename from server/tests/src/com/vaadin/tests/design/ParseLegacyPrefixTest.java rename to server/src/test/java/com/vaadin/tests/design/ParseLegacyPrefixTest.java index feaf73af3ca..76e15aae17b 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.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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/ParseMixedLegacyAndNewPrefixTest.java rename to 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 similarity index 86% rename from server/tests/src/com/vaadin/tests/design/WriteLegacyDesignTest.java rename to server/src/test/java/com/vaadin/tests/design/WriteLegacyDesignTest.java index e57a03c2326..facb5e9862e 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 @@ 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 void setUp() throws Exception { 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 void designIsSerializedWithCorrectPrefixesAndPackageNames() 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/designroot/DesignRootTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/designroot/DesignWithAnnotation.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/designroot/DesignWithEmptyAnnotation.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithAnnotation.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotation.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/designroot/ExtendedDesignWithEmptyAnnotationUI.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/nested/MyChildDesign.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/nested/MyChildDesignCustomComponent.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/nested/MyDesignRoot.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/nested/MyExtendedChildDesign.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/nested/NestedCustomLayoutsTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/nested/WriteNestedTemplatesTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomAbsoluteLayout.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomAccordion.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomCssLayout.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomFormLayout.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomGridLayout.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalLayout.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomHorizontalSplitPanel.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomPanel.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomTabSheet.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomVerticalLayout.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/nested/customlayouts/CustomVerticalSplitPanel.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/event/EventRouterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/event/ShortcutActionTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/AbstractBeanContainerListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/AbstractContainerListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/AbstractInMemoryContainerListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/AbstractPropertyListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/AssertionsEnabledTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/AtmosphereVersionTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/ClassesSerializableTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/ClientMethodSerializationTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/ContextClickListenerTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/EventRouterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/ExtensionTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/FileResourceTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/FileTypeResolverTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/IndexedContainerListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/KeyMapperTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/MimeTypesTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/PropertyFormatterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/PropertysetItemListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/SerializationTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/SimpleMultiPartInputStreamTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/StreamResourceTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/StreamVariableMappingTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/clientconnector/AttachDetachListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/AbstractListenerMethodsTestBase.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/ComponentSizeParseTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/DeclarativeMarginTestBase.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/FieldDefaultValues.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/FinalMethodTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/ReadEmptyDesignTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/StateGetDoesNotMarkDirtyTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/WriteEmptyDesignTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/absolutelayout/AddComponentsTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/absolutelayout/ComponentPositionTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentStyleNamesTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/AbstractComponentContainerListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/AddParentAsChildTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AbstractOrderedLayoutListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/LayoutSettingsOnReplaceTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractselect/AbstractSelectListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractselect/AbstractSelectStateTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTests.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractselect/OptionGroupTests.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/RemoveFromParentLockingTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractsinglecomponentcontainer/SetParentAsContentTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/audio/AudioDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/audio/AudioStateTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/audio/VideoDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/browserframe/BrowserFrameDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/button/ButtonClickTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/button/ButtonDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/button/ButtonListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/calendar/ContainerEventProviderTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/checkbox/CheckboxDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/colorpicker/ColorConversionsTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/combobox/ComboBoxStateTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/customlayout/CustomLayoutDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/customlayout/CustomLayoutTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/datefield/InlineDateFieldDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/datefield/ResolutionTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/embedded/EmbeddedListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/flash/FlashDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/form/FormTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/GridChildren.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/GridColumns.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/GridContainerTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/GridEditorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/GridExtensionTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/GridSelection.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/GridStateTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/TestGrid.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/grid/sort/SortTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/gridlayout/DefaultAlignmentTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/image/ImageDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/label/LabelConvertersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/label/LabelDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/label/LabelListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/link/LinkDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/listselect/ListSelectDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/listselect/ListSelectStateTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/loginform/LoginFormListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/menubar/MenuBarIdsTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupStateTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/orderedlayout/DefaultAlignmentTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/orderedlayout/OrderedLayoutTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/panel/PanelDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/panel/PanelListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/passwordfield/PasswordFieldDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/popupview/PopupViewDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/popupview/PopupViewListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/progressbar/ProgressBarDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/richtextarea/RichTextAreaStateTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/select/SelectListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/slider/SliderDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/slider/SliderTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/table/FooterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/table/MultipleSelectionTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/table/TableColumnAlignmentsTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/table/TableContextClickTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/table/TableDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/table/TableGeneratorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/table/TableListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/table/TableSelectable.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/table/TableSerializationTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/table/TableStateTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/table/TableVisibleColumnsTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/textarea/TextAreaDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatterTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/tree/ListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/tree/TreeListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/tree/TreeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/treetable/EmptyTreeTableTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableSetContainerNullTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/treetable/TreeTableTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/ui/CustomUIClassLoaderTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponentsTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/upload/UploadDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/upload/UploadListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/upload/UploadTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindowTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindowTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/window/WindowAttachTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/window/WindowDeclarativeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/window/WindowListenersTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/component/window/WindowTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTestBase.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/componentcontainer/CssLayoutTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/componentcontainer/VerticalLayoutTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/components/GridLayoutLastRowRemovalTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/components/TextFieldValueChangeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/components/WindowTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/renderer/ImageRendererTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/renderer/RendererTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/validation/BeanValidationTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/validation/RangeValidatorTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/util/AlwaysLockedVaadinSession.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/util/GraphVizClassHierarchyCreator.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/util/MockDeploymentConfiguration.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/util/MockUI.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/util/TestUtil.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/util/UniqueSerializableTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/ui/AbsFieldDataSourceLocaleChangeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/ui/AbsSelectTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/ui/CheckBoxTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/ui/DateFieldTests.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/ui/GridLayoutExpandRatioTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/ui/HorizontalSplitPanelTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/ui/LabelDataSourceTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/ui/NativeSelectTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/ui/PushConfigurationTransportTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/ui/RichTextAreaTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/ui/SplitPositionChangeListenerTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/ui/TableTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/ui/TextAreaTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/ui/TextFieldTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/ui/UIInitRefreshTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/ui/UIThemeEscapingTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/ui/VerticalSplitPanelTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/ui/declarative/DesignTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/util/CurrentInstanceTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/util/ReflectToolsGetFieldValueByTypeTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/util/ReflectToolsGetPrimitiveFieldValueTest.java rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/DesignReadInConstructor.html rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/MyVerticalLayout.html rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/all-components-legacy.html rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/all-components.html rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/designroot/DesignWithEmptyAnnotation.html rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/duplicate-ids.html rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/duplicate-local-ids.html rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/local-ids.html rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/nested/mychilddesign.html rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/nested/mydesignroot.html rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/testFile-legacy.html rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/testFile.html rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/verticallayout-one-child.html rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/design/verticallayout-two-children.html rename to 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 similarity index 100% rename from server/tests/src/com/vaadin/tests/styles.scss rename to server/src/test/resources/com/vaadin/tests/styles.scss diff --git a/uitest/build.xml b/uitest/build.xml index 0344af08662..3823c937c19 100644 --- a/uitest/build.xml +++ b/uitest/build.xml @@ -36,7 +36,7 @@ - + diff --git a/uitest/ivy.xml b/uitest/ivy.xml index 4939c31d1f0..0f2141e00bc 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -36,7 +36,7 @@ + rev="${vaadin.version}" conf="build->default">