Move Table/TreeTable to compatibility package

Change-Id: Ic9f2badf8688c32d704be67519c0f4c9a3da0e28

55 files changed, 16 insertions, 16 deletions

diff --git a/client/src/main/java/com/vaadin/client/ui/VScrollTable.java b/compatibility-client/src/main/java/com/vaadin/client/ui/VScrollTable.java
index 24ea202189..24ea202189 100644
--- a/client/src/main/java/com/vaadin/client/ui/VScrollTable.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/VScrollTable.java
diff --git a/client/src/main/java/com/vaadin/client/ui/VTreeTable.java b/compatibility-client/src/main/java/com/vaadin/client/ui/VTreeTable.java
index 25a9d4e29b..25a9d4e29b 100644
--- a/client/src/main/java/com/vaadin/client/ui/VTreeTable.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/VTreeTable.java
diff --git a/client/src/main/java/com/vaadin/client/ui/table/TableConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/table/TableConnector.java
index ccfb715291..ccfb715291 100644
--- a/client/src/main/java/com/vaadin/client/ui/table/TableConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/table/TableConnector.java
diff --git a/client/src/main/java/com/vaadin/client/ui/table/VTableLazyInitItemIdentifiers.java b/compatibility-client/src/main/java/com/vaadin/client/ui/table/VTableLazyInitItemIdentifiers.java
index 20433dd960..20433dd960 100644
--- a/client/src/main/java/com/vaadin/client/ui/table/VTableLazyInitItemIdentifiers.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/table/VTableLazyInitItemIdentifiers.java
diff --git a/client/src/main/java/com/vaadin/client/ui/treetable/TreeTableConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/treetable/TreeTableConnector.java
index 77074d4cb5..77074d4cb5 100644
--- a/client/src/main/java/com/vaadin/client/ui/treetable/TreeTableConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/treetable/TreeTableConnector.java
diff --git a/compatibility-server/pom.xml b/compatibility-server/pom.xml
index 38dcc07f21..4f6d26fe5f 100644
--- a/compatibility-server/pom.xml
+++ b/compatibility-server/pom.xml
@@ -38,6 +38,16 @@
 			<artifactId>javax.servlet-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<!-- Bean Validation API -->
 		<dependency>
 			<groupId>javax.validation</groupId>
diff --git a/server/src/main/java/com/vaadin/ui/DefaultFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/ui/DefaultFieldFactory.java
index 2ee5ecf00e..2ee5ecf00e 100644
--- a/server/src/main/java/com/vaadin/ui/DefaultFieldFactory.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/DefaultFieldFactory.java
diff --git a/server/src/main/java/com/vaadin/ui/Table.java b/compatibility-server/src/main/java/com/vaadin/ui/Table.java
index 13333146f2..13333146f2 100644
--- a/server/src/main/java/com/vaadin/ui/Table.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/Table.java
diff --git a/server/src/main/java/com/vaadin/ui/TableFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/ui/TableFieldFactory.java
index 54f8bc5110..54f8bc5110 100644
--- a/server/src/main/java/com/vaadin/ui/TableFieldFactory.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/TableFieldFactory.java
diff --git a/server/src/main/java/com/vaadin/ui/TreeTable.java b/compatibility-server/src/main/java/com/vaadin/ui/TreeTable.java
index 2e69a0071d..2e69a0071d 100644
--- a/server/src/main/java/com/vaadin/ui/TreeTable.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/TreeTable.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/AllTests.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/AllTests.java
index 9c3f6c0eaa..9c3f6c0eaa 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/AllTests.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/AllTests.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
index edc56035e1..edc56035e1 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java
index 8ce298c065..8ce298c065 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
index 8688c9ae64..8688c9ae64 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java
index 29968ecf94..29968ecf94 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/RowIdTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/RowIdTest.java
index e93048157b..e93048157b 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/RowIdTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/RowIdTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
index 0bdcc9a3c3..0bdcc9a3c3 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java
index d499ceed92..d499ceed92 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java
index 3718cf756d..3718cf756d 100755
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/TicketTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/TicketTest.java
index 1a19eda542..1a19eda542 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/TicketTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/TicketTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/UtilTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/UtilTest.java
index a575d649f1..a575d649f1 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/UtilTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/UtilTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java
index 1463a27217..1463a27217 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
index 1c70c8dad7..1c70c8dad7 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
index 5a6ae78aeb..5a6ae78aeb 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
index 41db88b881..41db88b881 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java
index a6b6f4b55c..a6b6f4b55c 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java
index f1130aad80..f1130aad80 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java
index dd1db30b72..dd1db30b72 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.java
index 7201ec7ad8..7201ec7ad8 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java
index 1b9e14b0d8..1b9e14b0d8 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java
index 7974582147..7974582147 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
index d2067a85b4..d2067a85b4 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java
index 8a6ee0aa45..8a6ee0aa45 100644
--- a/server/src/test/java/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/LegacyAbstractFieldListenersTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractfield/LegacyAbstractFieldListenersTest.java
index 5843bd901f..5843bd901f 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/LegacyAbstractFieldListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractfield/LegacyAbstractFieldListenersTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java
index 86bb34145f..86bb34145f 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/FooterTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/FooterTest.java
index 3df2b8fbcb..3df2b8fbcb 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/FooterTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/FooterTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/MultipleSelectionTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/MultipleSelectionTest.java
index b29357ea6a..b29357ea6a 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/MultipleSelectionTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/MultipleSelectionTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TableColumnAlignmentsTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableColumnAlignmentsTest.java
index ff4c8336fb..ff4c8336fb 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/TableColumnAlignmentsTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableColumnAlignmentsTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TableContextClickTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableContextClickTest.java
index 3ee8b76d76..3ee8b76d76 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/TableContextClickTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableContextClickTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java
index f3b9b1cece..f3b9b1cece 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.java
index 7a7b13e933..7a7b13e933 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TableGeneratorTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableGeneratorTest.java
index 6fbe5557f8..6fbe5557f8 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/TableGeneratorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableGeneratorTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TableListenersTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableListenersTest.java
index ac6fb171e3..ac6fb171e3 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/TableListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableListenersTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java
index 5a9297014c..5a9297014c 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TableSelectableTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableSelectableTest.java
index 906827958f..906827958f 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/TableSelectableTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableSelectableTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TableSerializationTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableSerializationTest.java
index 22f2381980..22f2381980 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/TableSerializationTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableSerializationTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TableStateTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableStateTest.java
index 43b03c41e8..43b03c41e8 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/TableStateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableStateTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/table/TableVisibleColumnsTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableVisibleColumnsTest.java
index f9f6e7f979..f9f6e7f979 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/table/TableVisibleColumnsTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableVisibleColumnsTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/treetable/EmptyTreeTableTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/EmptyTreeTableTest.java
index 2a667bea72..2a667bea72 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/treetable/EmptyTreeTableTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/EmptyTreeTableTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java
index eb25bcb0aa..eb25bcb0aa 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableSetContainerNullTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableSetContainerNullTest.java
index 9718d24f8c..9718d24f8c 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableSetContainerNullTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableSetContainerNullTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableTest.java
index 4706ec1413..4706ec1413 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableTest.java
diff --git a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java
index 6927adba8e..39fa9cb23e 100644
--- a/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java
+++ b/server/src/main/java/com/vaadin/event/dd/acceptcriteria/SourceIsTarget.java
@@ -23,13 +23,11 @@ import com.vaadin.event.TransferableImpl;
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropTarget;
 import com.vaadin.ui.Component;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Tree;
 
 /**
  *
  * A criterion that ensures the drag source is the same as drop target. Eg.
- * {@link Tree} or {@link Table} could support only re-ordering of items, but no
+ * {code Tree} or {@code Table} could support only re-ordering of items, but no
  * {@link Transferable}s coming outside.
  * <p>
  * Note! Class is singleton, use {@link #get()} method to get the instance.
diff --git a/server/src/main/java/com/vaadin/server/VaadinSession.java b/server/src/main/java/com/vaadin/server/VaadinSession.java
index 1b852510e3..d10390dd64 100644
--- a/server/src/main/java/com/vaadin/server/VaadinSession.java
+++ b/server/src/main/java/com/vaadin/server/VaadinSession.java
@@ -49,14 +49,12 @@ import javax.servlet.http.HttpSessionBindingListener;
 
 import com.vaadin.event.EventRouter;
 import com.vaadin.shared.communication.PushMode;
-import com.vaadin.ui.Table;
 import com.vaadin.ui.UI;
 import com.vaadin.util.CurrentInstance;
 import com.vaadin.util.ReflectTools;
 import com.vaadin.v7.data.util.converter.LegacyConverter;
 import com.vaadin.v7.data.util.converter.LegacyConverterFactory;
 import com.vaadin.v7.data.util.converter.LegacyDefaultConverterFactory;
-import com.vaadin.v7.ui.LegacyAbstractField;
 
 /**
  * Contains everything that Vaadin needs to store for a specific user. This is
@@ -615,12 +613,6 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable {
      * on a String).
      * </p>
      * <p>
-     * The {@link LegacyConverter} for an individual field can be overridden
-     * using {@link LegacyAbstractField#setConverter(LegacyConverter)} and for
-     * individual property ids in a {@link Table} using
-     * {@link Table#setConverter(Object, LegacyConverter)}.
-     * </p>
-     * <p>
      * The converter factory must never be set to null.
      *
      * @param converterFactory
diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java
index c7b4fb374c..958b8c4aae 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/abstractsplitpanel/AbstractSplitPanelDeclarativeTest.java
@@ -21,8 +21,8 @@ import com.vaadin.server.Sizeable.Unit;
 import com.vaadin.tests.design.DeclarativeTestBase;
 import com.vaadin.ui.AbstractSplitPanel;
 import com.vaadin.ui.Button;
+import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.HorizontalSplitPanel;
-import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.VerticalSplitPanel;
 
@@ -39,14 +39,14 @@ public class AbstractSplitPanelDeclarativeTest
     public void testWithBothChildren() {
         String design = "<vaadin-horizontal-split-panel split-position=20.5% "
                 + "min-split-position=20% max-split-position=50px locked "
-                + "reversed> <vaadin-table /> <vaadin-vertical-layout />"
+                + "reversed> <vaadin-horizontal-layout /> <vaadin-vertical-layout />"
                 + "</vaadin-horizontal-split-panel>";
         AbstractSplitPanel sp = new HorizontalSplitPanel();
         sp.setSplitPosition(20.5f, Unit.PERCENTAGE, true);
         sp.setMinSplitPosition(20, Unit.PERCENTAGE);
         sp.setMaxSplitPosition(50, Unit.PIXELS);
         sp.setLocked(true);
-        sp.addComponent(new Table());
+        sp.addComponent(new HorizontalLayout());
         sp.addComponent(new VerticalLayout());
         testRead(design, sp);
         testWrite(design, sp);
@@ -54,10 +54,10 @@ public class AbstractSplitPanelDeclarativeTest
 
     @Test
     public void testWithFirstChild() {
-        String design = "<vaadin-vertical-split-panel><vaadin-table caption=\"First slot\"/>"
+        String design = "<vaadin-vertical-split-panel><vaadin-horizontal-layout caption=\"First slot\"/>"
                 + "</vaadin-vertical-split-panel>";
         AbstractSplitPanel sp = new VerticalSplitPanel();
-        Table t = new Table();
+        HorizontalLayout t = new HorizontalLayout();
         t.setCaption("First slot");
         sp.addComponent(t);
         testRead(design, sp);