Moved SQLContainer from util package into its own util.sqlcontainer package. #5712

svn changeset:20254/svn branch:6.7

18 files changed, 86 insertions, 86 deletions

diff --git a/tests/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java b/tests/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
index 2a609bca42..606e9e3697 100644
--- a/tests/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
+++ b/tests/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
@@ -10,10 +10,10 @@ import com.vaadin.data.Container.ItemSetChangeListener;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.util.SQLContainer;
-import com.vaadin.data.util.connection.JDBCConnectionPool;
-import com.vaadin.data.util.connection.SimpleJDBCConnectionPool;
-import com.vaadin.data.util.query.TableQuery;
+import com.vaadin.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
+import com.vaadin.data.util.sqlcontainer.query.TableQuery;
 import com.vaadin.tests.server.container.sqlcontainer.AllTests;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java b/tests/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
index 6ead5b17b9..419e606bfc 100644
--- a/tests/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
+++ b/tests/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
@@ -3,10 +3,10 @@ package com.vaadin.tests.containers.sqlcontainer;
 import java.sql.SQLException;
 
 import com.vaadin.Application;
-import com.vaadin.data.util.SQLContainer;
-import com.vaadin.data.util.connection.JDBCConnectionPool;
-import com.vaadin.data.util.connection.SimpleJDBCConnectionPool;
-import com.vaadin.data.util.query.TableQuery;
+import com.vaadin.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
+import com.vaadin.data.util.sqlcontainer.query.TableQuery;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/AllTests.java b/tests/src/com/vaadin/tests/server/container/sqlcontainer/AllTests.java
index 709295d552..f985fa2ad9 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/AllTests.java
+++ b/tests/src/com/vaadin/tests/server/container/sqlcontainer/AllTests.java
@@ -4,10 +4,10 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-import com.vaadin.data.util.query.generator.DefaultSQLGenerator;
-import com.vaadin.data.util.query.generator.MSSQLGenerator;
-import com.vaadin.data.util.query.generator.OracleGenerator;
-import com.vaadin.data.util.query.generator.SQLGenerator;
+import com.vaadin.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;
+import com.vaadin.data.util.sqlcontainer.query.generator.MSSQLGenerator;
+import com.vaadin.data.util.sqlcontainer.query.generator.OracleGenerator;
+import com.vaadin.data.util.sqlcontainer.query.generator.SQLGenerator;
 import com.vaadin.tests.server.container.sqlcontainer.connection.J2EEConnectionPoolTest;
 import com.vaadin.tests.server.container.sqlcontainer.connection.SimpleJDBCConnectionPoolTest;
 import com.vaadin.tests.server.container.sqlcontainer.filters.BetweenTest;
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/ColumnPropertyTest.java b/tests/src/com/vaadin/tests/server/container/sqlcontainer/ColumnPropertyTest.java
index d4331faada..efe539f2c7 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/ColumnPropertyTest.java
+++ b/tests/src/com/vaadin/tests/server/container/sqlcontainer/ColumnPropertyTest.java
@@ -7,11 +7,11 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.data.Property.ReadOnlyException;
-import com.vaadin.data.util.ColumnProperty;
-import com.vaadin.data.util.ColumnProperty.NotNullableException;
-import com.vaadin.data.util.RowId;
-import com.vaadin.data.util.RowItem;
-import com.vaadin.data.util.SQLContainer;
+import com.vaadin.data.util.sqlcontainer.ColumnProperty;
+import com.vaadin.data.util.sqlcontainer.RowId;
+import com.vaadin.data.util.sqlcontainer.RowItem;
+import com.vaadin.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.data.util.sqlcontainer.ColumnProperty.NotNullableException;
 
 public class ColumnPropertyTest {
 
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/DataGenerator.java b/tests/src/com/vaadin/tests/server/container/sqlcontainer/DataGenerator.java
index 4029eb8109..52225984a7 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/DataGenerator.java
+++ b/tests/src/com/vaadin/tests/server/container/sqlcontainer/DataGenerator.java
@@ -7,7 +7,7 @@ import java.sql.Statement;
 
 import org.junit.Assert;
 
-import com.vaadin.data.util.connection.JDBCConnectionPool;
+import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
 import com.vaadin.tests.server.container.sqlcontainer.AllTests.DB;
 
 public class DataGenerator {
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/FreeformQueryUtil.java b/tests/src/com/vaadin/tests/server/container/sqlcontainer/FreeformQueryUtil.java
index a0170baf51..22e8531c65 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/FreeformQueryUtil.java
+++ b/tests/src/com/vaadin/tests/server/container/sqlcontainer/FreeformQueryUtil.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.server.container.sqlcontainer;
 import java.util.List;
 
 import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.query.generator.StatementHelper;
-import com.vaadin.data.util.query.generator.filter.QueryBuilder;
+import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
 import com.vaadin.tests.server.container.sqlcontainer.AllTests.DB;
 
 public class FreeformQueryUtil {
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/ReadOnlyRowIdTest.java b/tests/src/com/vaadin/tests/server/container/sqlcontainer/ReadOnlyRowIdTest.java
index aa4e144db6..c395bc42bf 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/ReadOnlyRowIdTest.java
+++ b/tests/src/com/vaadin/tests/server/container/sqlcontainer/ReadOnlyRowIdTest.java
@@ -4,7 +4,7 @@ import junit.framework.Assert;
 
 import org.junit.Test;
 
-import com.vaadin.data.util.ReadOnlyRowId;
+import com.vaadin.data.util.sqlcontainer.ReadOnlyRowId;
 
 public class ReadOnlyRowIdTest {
 
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/RowIdTest.java b/tests/src/com/vaadin/tests/server/container/sqlcontainer/RowIdTest.java
index e619f203e2..f243c43ec2 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/RowIdTest.java
+++ b/tests/src/com/vaadin/tests/server/container/sqlcontainer/RowIdTest.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.server.container.sqlcontainer;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.data.util.RowId;
+import com.vaadin.data.util.sqlcontainer.RowId;
 
 public class RowIdTest {
 
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/SQLContainerTableQueryTest.java b/tests/src/com/vaadin/tests/server/container/sqlcontainer/SQLContainerTableQueryTest.java
index 9c42906cd5..af9cdbf306 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/SQLContainerTableQueryTest.java
+++ b/tests/src/com/vaadin/tests/server/container/sqlcontainer/SQLContainerTableQueryTest.java
@@ -17,15 +17,15 @@ import org.junit.Test;
 import com.vaadin.data.Container.ItemSetChangeEvent;

 import com.vaadin.data.Container.ItemSetChangeListener;

 import com.vaadin.data.Item;

-import com.vaadin.data.util.RowId;

-import com.vaadin.data.util.RowItem;

-import com.vaadin.data.util.SQLContainer;

-import com.vaadin.data.util.TemporaryRowId;

-import com.vaadin.data.util.connection.JDBCConnectionPool;

-import com.vaadin.data.util.connection.SimpleJDBCConnectionPool;

 import com.vaadin.data.util.filter.Like;

-import com.vaadin.data.util.query.OrderBy;

-import com.vaadin.data.util.query.TableQuery;

+import com.vaadin.data.util.sqlcontainer.RowId;

+import com.vaadin.data.util.sqlcontainer.RowItem;

+import com.vaadin.data.util.sqlcontainer.SQLContainer;

+import com.vaadin.data.util.sqlcontainer.TemporaryRowId;

+import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;

+import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;

+import com.vaadin.data.util.sqlcontainer.query.OrderBy;

+import com.vaadin.data.util.sqlcontainer.query.TableQuery;

 import com.vaadin.terminal.gwt.client.Util;

 import com.vaadin.tests.server.container.sqlcontainer.AllTests.DB;

 

diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/SQLContainerTest.java b/tests/src/com/vaadin/tests/server/container/sqlcontainer/SQLContainerTest.java
index fbc32206c1..095e4a2345 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/SQLContainerTest.java
+++ b/tests/src/com/vaadin/tests/server/container/sqlcontainer/SQLContainerTest.java
@@ -20,23 +20,23 @@ import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Container.ItemSetChangeEvent;
 import com.vaadin.data.Container.ItemSetChangeListener;
 import com.vaadin.data.Item;
-import com.vaadin.data.util.RowId;
-import com.vaadin.data.util.RowItem;
-import com.vaadin.data.util.SQLContainer;
-import com.vaadin.data.util.TemporaryRowId;
-import com.vaadin.data.util.connection.JDBCConnectionPool;
-import com.vaadin.data.util.connection.SimpleJDBCConnectionPool;
 import com.vaadin.data.util.filter.Compare.Equal;
 import com.vaadin.data.util.filter.Like;
-import com.vaadin.data.util.query.FreeformQuery;
-import com.vaadin.data.util.query.FreeformQueryDelegate;
-import com.vaadin.data.util.query.FreeformStatementDelegate;
-import com.vaadin.data.util.query.OrderBy;
-import com.vaadin.data.util.query.generator.MSSQLGenerator;
-import com.vaadin.data.util.query.generator.OracleGenerator;
-import com.vaadin.data.util.query.generator.SQLGenerator;
-import com.vaadin.data.util.query.generator.StatementHelper;
-import com.vaadin.data.util.query.generator.filter.QueryBuilder;
+import com.vaadin.data.util.sqlcontainer.RowId;
+import com.vaadin.data.util.sqlcontainer.RowItem;
+import com.vaadin.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.data.util.sqlcontainer.TemporaryRowId;
+import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
+import com.vaadin.data.util.sqlcontainer.query.FreeformQuery;
+import com.vaadin.data.util.sqlcontainer.query.FreeformQueryDelegate;
+import com.vaadin.data.util.sqlcontainer.query.FreeformStatementDelegate;
+import com.vaadin.data.util.sqlcontainer.query.OrderBy;
+import com.vaadin.data.util.sqlcontainer.query.generator.MSSQLGenerator;
+import com.vaadin.data.util.sqlcontainer.query.generator.OracleGenerator;
+import com.vaadin.data.util.sqlcontainer.query.generator.SQLGenerator;
+import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
 import com.vaadin.tests.server.container.sqlcontainer.AllTests.DB;
 
 public class SQLContainerTest {
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/TicketTests.java b/tests/src/com/vaadin/tests/server/container/sqlcontainer/TicketTests.java
index 513bdf3329..8123cdb516 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/TicketTests.java
+++ b/tests/src/com/vaadin/tests/server/container/sqlcontainer/TicketTests.java
@@ -13,14 +13,14 @@ import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.SQLContainer;
-import com.vaadin.data.util.connection.SimpleJDBCConnectionPool;
 import com.vaadin.data.util.filter.Compare.Equal;
-import com.vaadin.data.util.query.FreeformQuery;
-import com.vaadin.data.util.query.FreeformStatementDelegate;
-import com.vaadin.data.util.query.TableQuery;
-import com.vaadin.data.util.query.generator.StatementHelper;
-import com.vaadin.data.util.query.generator.filter.QueryBuilder;
+import com.vaadin.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
+import com.vaadin.data.util.sqlcontainer.query.FreeformQuery;
+import com.vaadin.data.util.sqlcontainer.query.FreeformStatementDelegate;
+import com.vaadin.data.util.sqlcontainer.query.TableQuery;
+import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
 import com.vaadin.tests.server.container.sqlcontainer.AllTests.DB;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Window;
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/UtilTest.java b/tests/src/com/vaadin/tests/server/container/sqlcontainer/UtilTest.java
index b99839616e..a8d4e48004 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/UtilTest.java
+++ b/tests/src/com/vaadin/tests/server/container/sqlcontainer/UtilTest.java
@@ -4,7 +4,7 @@ import junit.framework.Assert;
 
 import org.junit.Test;
 
-import com.vaadin.data.util.SQLUtil;
+import com.vaadin.data.util.sqlcontainer.SQLUtil;
 
 public class UtilTest {
 
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/connection/J2EEConnectionPoolTest.java b/tests/src/com/vaadin/tests/server/container/sqlcontainer/connection/J2EEConnectionPoolTest.java
index 7f9f5a019b..dc5ca51d94 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/connection/J2EEConnectionPoolTest.java
+++ b/tests/src/com/vaadin/tests/server/container/sqlcontainer/connection/J2EEConnectionPoolTest.java
@@ -12,7 +12,7 @@ import junit.framework.Assert;
 import org.easymock.EasyMock;
 import org.junit.Test;
 
-import com.vaadin.data.util.connection.J2EEConnectionPool;
+import com.vaadin.data.util.sqlcontainer.connection.J2EEConnectionPool;
 
 public class J2EEConnectionPoolTest {
 
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java b/tests/src/com/vaadin/tests/server/container/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
index 018d893898..c05b3cbf1b 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
+++ b/tests/src/com/vaadin/tests/server/container/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
@@ -9,8 +9,8 @@ import org.easymock.EasyMock;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.util.connection.JDBCConnectionPool;
-import com.vaadin.data.util.connection.SimpleJDBCConnectionPool;
+import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
 import com.vaadin.tests.server.container.sqlcontainer.AllTests;
 
 public class SimpleJDBCConnectionPoolTest {
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/generator/SQLGeneratorsTest.java b/tests/src/com/vaadin/tests/server/container/sqlcontainer/generator/SQLGeneratorsTest.java
index 3c16ebef46..06873d4aff 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/generator/SQLGeneratorsTest.java
+++ b/tests/src/com/vaadin/tests/server/container/sqlcontainer/generator/SQLGeneratorsTest.java
@@ -11,19 +11,19 @@ import org.junit.Before;
 import org.junit.Test;

 

 import com.vaadin.data.Container.Filter;

-import com.vaadin.data.util.RowItem;

-import com.vaadin.data.util.SQLContainer;

-import com.vaadin.data.util.connection.JDBCConnectionPool;

-import com.vaadin.data.util.connection.SimpleJDBCConnectionPool;

 import com.vaadin.data.util.filter.Like;

 import com.vaadin.data.util.filter.Or;

-import com.vaadin.data.util.query.OrderBy;

-import com.vaadin.data.util.query.TableQuery;

-import com.vaadin.data.util.query.generator.DefaultSQLGenerator;

-import com.vaadin.data.util.query.generator.MSSQLGenerator;

-import com.vaadin.data.util.query.generator.OracleGenerator;

-import com.vaadin.data.util.query.generator.SQLGenerator;

-import com.vaadin.data.util.query.generator.StatementHelper;

+import com.vaadin.data.util.sqlcontainer.RowItem;

+import com.vaadin.data.util.sqlcontainer.SQLContainer;

+import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;

+import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;

+import com.vaadin.data.util.sqlcontainer.query.OrderBy;

+import com.vaadin.data.util.sqlcontainer.query.TableQuery;

+import com.vaadin.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;

+import com.vaadin.data.util.sqlcontainer.query.generator.MSSQLGenerator;

+import com.vaadin.data.util.sqlcontainer.query.generator.OracleGenerator;

+import com.vaadin.data.util.sqlcontainer.query.generator.SQLGenerator;

+import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;

 import com.vaadin.tests.server.container.sqlcontainer.AllTests;

 import com.vaadin.tests.server.container.sqlcontainer.DataGenerator;

 

diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/FreeformQueryTest.java b/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/FreeformQueryTest.java
index 743d8bd5ac..cc213f764f 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/FreeformQueryTest.java
+++ b/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/FreeformQueryTest.java
@@ -15,15 +15,15 @@ import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.RowId;
-import com.vaadin.data.util.RowItem;
-import com.vaadin.data.util.SQLContainer;
-import com.vaadin.data.util.connection.JDBCConnectionPool;
-import com.vaadin.data.util.connection.SimpleJDBCConnectionPool;
 import com.vaadin.data.util.filter.Like;
-import com.vaadin.data.util.query.FreeformQuery;
-import com.vaadin.data.util.query.FreeformQueryDelegate;
-import com.vaadin.data.util.query.OrderBy;
+import com.vaadin.data.util.sqlcontainer.RowId;
+import com.vaadin.data.util.sqlcontainer.RowItem;
+import com.vaadin.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
+import com.vaadin.data.util.sqlcontainer.query.FreeformQuery;
+import com.vaadin.data.util.sqlcontainer.query.FreeformQueryDelegate;
+import com.vaadin.data.util.sqlcontainer.query.OrderBy;
 import com.vaadin.tests.server.container.sqlcontainer.AllTests;
 import com.vaadin.tests.server.container.sqlcontainer.AllTests.DB;
 import com.vaadin.tests.server.container.sqlcontainer.DataGenerator;
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/QueryBuilderTest.java b/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/QueryBuilderTest.java
index 8ccca120cc..02130fab83 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/QueryBuilderTest.java
+++ b/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/QueryBuilderTest.java
@@ -20,9 +20,9 @@ import com.vaadin.data.util.filter.Like;
 import com.vaadin.data.util.filter.Not;
 import com.vaadin.data.util.filter.Or;
 import com.vaadin.data.util.filter.SimpleStringFilter;
-import com.vaadin.data.util.query.generator.StatementHelper;
-import com.vaadin.data.util.query.generator.filter.QueryBuilder;
-import com.vaadin.data.util.query.generator.filter.StringDecorator;
+import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
+import com.vaadin.data.util.sqlcontainer.query.generator.filter.StringDecorator;
 
 public class QueryBuilderTest {
 
diff --git a/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/TableQueryTest.java b/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/TableQueryTest.java
index 600dcac44e..a3b2b20ffe 100644
--- a/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/TableQueryTest.java
+++ b/tests/src/com/vaadin/tests/server/container/sqlcontainer/query/TableQueryTest.java
@@ -15,16 +15,16 @@ import org.junit.Before;
 import org.junit.Test;

 

 import com.vaadin.data.Container.Filter;

-import com.vaadin.data.util.OptimisticLockException;

-import com.vaadin.data.util.RowItem;

-import com.vaadin.data.util.SQLContainer;

-import com.vaadin.data.util.connection.JDBCConnectionPool;

-import com.vaadin.data.util.connection.SimpleJDBCConnectionPool;

 import com.vaadin.data.util.filter.Compare.Equal;

 import com.vaadin.data.util.filter.Like;

-import com.vaadin.data.util.query.OrderBy;

-import com.vaadin.data.util.query.TableQuery;

-import com.vaadin.data.util.query.generator.DefaultSQLGenerator;

+import com.vaadin.data.util.sqlcontainer.OptimisticLockException;

+import com.vaadin.data.util.sqlcontainer.RowItem;

+import com.vaadin.data.util.sqlcontainer.SQLContainer;

+import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;

+import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;

+import com.vaadin.data.util.sqlcontainer.query.OrderBy;

+import com.vaadin.data.util.sqlcontainer.query.TableQuery;

+import com.vaadin.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;

 import com.vaadin.tests.server.container.sqlcontainer.AllTests;

 import com.vaadin.tests.server.container.sqlcontainer.AllTests.DB;

 import com.vaadin.tests.server.container.sqlcontainer.DataGenerator;