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

svn changeset:20254/svn branch:6.7

54 files changed, 174 insertions, 174 deletions

diff --git a/src/com/vaadin/data/util/CacheFlushNotifier.java b/src/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java
index c95378566e..bb61fefdc8 100644
--- a/src/com/vaadin/data/util/CacheFlushNotifier.java
+++ b/src/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java
@@ -1,13 +1,13 @@
-package com.vaadin.data.util;

+package com.vaadin.data.util.sqlcontainer;

 

 import java.lang.ref.ReferenceQueue;

 import java.lang.ref.WeakReference;

 import java.util.ArrayList;

 import java.util.List;

 

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

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

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

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

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

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

 

 /**

  * CacheFlushNotifier is a simple static notification mechanism to inform other

diff --git a/src/com/vaadin/data/util/CacheMap.java b/src/com/vaadin/data/util/sqlcontainer/CacheMap.java
index a7a17c6eee..ef173c74a9 100644
--- a/src/com/vaadin/data/util/CacheMap.java
+++ b/src/com/vaadin/data/util/sqlcontainer/CacheMap.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;

+package com.vaadin.data.util.sqlcontainer;

 

 import java.util.LinkedHashMap;

 import java.util.Map;

diff --git a/src/com/vaadin/data/util/ColumnProperty.java b/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
index 0deb1a756e..02246efaaa 100644
--- a/src/com/vaadin/data/util/ColumnProperty.java
+++ b/src/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.data.util.sqlcontainer;
 
 import java.lang.reflect.Constructor;
 import java.sql.Date;
diff --git a/src/com/vaadin/data/util/OptimisticLockException.java b/src/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java
index a32994aacb..9c6f8051dd 100644
--- a/src/com/vaadin/data/util/OptimisticLockException.java
+++ b/src/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.data.util.sqlcontainer;
 
 /**
  * An OptimisticLockException is thrown when trying to update or delete a row
diff --git a/src/com/vaadin/data/util/ReadOnlyRowId.java b/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java
index a3c559c26d..4604d2772e 100644
--- a/src/com/vaadin/data/util/ReadOnlyRowId.java
+++ b/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.data.util.sqlcontainer;
 
 public class ReadOnlyRowId extends RowId {
     private static final long serialVersionUID = -2626764781642012467L;
diff --git a/src/com/vaadin/data/util/Reference.java b/src/com/vaadin/data/util/sqlcontainer/Reference.java
index 9e174b4f0f..5b5744f718 100644
--- a/src/com/vaadin/data/util/Reference.java
+++ b/src/com/vaadin/data/util/sqlcontainer/Reference.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;

+package com.vaadin.data.util.sqlcontainer;

 

 import java.io.Serializable;

 

diff --git a/src/com/vaadin/data/util/RowId.java b/src/com/vaadin/data/util/sqlcontainer/RowId.java
index 565161b597..33ef273f63 100644
--- a/src/com/vaadin/data/util/RowId.java
+++ b/src/com/vaadin/data/util/sqlcontainer/RowId.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;

+package com.vaadin.data.util.sqlcontainer;

 

 import java.io.Serializable;

 

diff --git a/src/com/vaadin/data/util/RowItem.java b/src/com/vaadin/data/util/sqlcontainer/RowItem.java
index 5fae27824d..46aefd2fc9 100644
--- a/src/com/vaadin/data/util/RowItem.java
+++ b/src/com/vaadin/data/util/sqlcontainer/RowItem.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.data.util.sqlcontainer;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/com/vaadin/data/util/SQLContainer.java b/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
index 9189727de9..f077029f73 100644
--- a/src/com/vaadin/data/util/SQLContainer.java
+++ b/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.data.util.sqlcontainer;
 
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
@@ -20,12 +20,12 @@ import com.vaadin.data.Property;
 import com.vaadin.data.util.filter.Compare.Equal;
 import com.vaadin.data.util.filter.Like;
 import com.vaadin.data.util.filter.UnsupportedFilterException;
-import com.vaadin.data.util.query.OrderBy;
-import com.vaadin.data.util.query.QueryDelegate;
-import com.vaadin.data.util.query.QueryDelegate.RowIdChangeListener;
-import com.vaadin.data.util.query.TableQuery;
-import com.vaadin.data.util.query.generator.MSSQLGenerator;
-import com.vaadin.data.util.query.generator.OracleGenerator;
+import com.vaadin.data.util.sqlcontainer.query.OrderBy;
+import com.vaadin.data.util.sqlcontainer.query.QueryDelegate;
+import com.vaadin.data.util.sqlcontainer.query.TableQuery;
+import com.vaadin.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener;
+import com.vaadin.data.util.sqlcontainer.query.generator.MSSQLGenerator;
+import com.vaadin.data.util.sqlcontainer.query.generator.OracleGenerator;
 
 public class SQLContainer implements Container, Container.Filterable,
         Container.Indexed, Container.Sortable, Container.ItemSetChangeNotifier {
diff --git a/src/com/vaadin/data/util/SQLUtil.java b/src/com/vaadin/data/util/sqlcontainer/SQLUtil.java
index 5426d8d213..bed9e6782c 100644
--- a/src/com/vaadin/data/util/SQLUtil.java
+++ b/src/com/vaadin/data/util/sqlcontainer/SQLUtil.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.data.util.sqlcontainer;
 
 public class SQLUtil {
 	/**
diff --git a/src/com/vaadin/data/util/TemporaryRowId.java b/src/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java
index ec5ca7f862..2ff187e40c 100644
--- a/src/com/vaadin/data/util/TemporaryRowId.java
+++ b/src/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util;
+package com.vaadin.data.util.sqlcontainer;
 
 public class TemporaryRowId extends RowId {
     private static final long serialVersionUID = -641983830469018329L;
diff --git a/src/com/vaadin/data/util/connection/J2EEConnectionPool.java b/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java
index 789fcb9225..65a6bc6f39 100644
--- a/src/com/vaadin/data/util/connection/J2EEConnectionPool.java
+++ b/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.connection;
+package com.vaadin.data.util.sqlcontainer.connection;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/src/com/vaadin/data/util/connection/JDBCConnectionPool.java b/src/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java
index 8f10d7706a..cc7916aa55 100644
--- a/src/com/vaadin/data/util/connection/JDBCConnectionPool.java
+++ b/src/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.connection;
+package com.vaadin.data.util.sqlcontainer.connection;
 
 import java.io.Serializable;
 import java.sql.Connection;
diff --git a/src/com/vaadin/data/util/connection/SimpleJDBCConnectionPool.java b/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java
index 91da3f1677..2c1a0499db 100644
--- a/src/com/vaadin/data/util/connection/SimpleJDBCConnectionPool.java
+++ b/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.connection;

+package com.vaadin.data.util.sqlcontainer.connection;

 

 import java.io.IOException;

 import java.sql.Connection;

diff --git a/src/com/vaadin/data/util/query/FreeformQuery.java b/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java
index 2ac67c990f..26434b70bd 100644
--- a/src/com/vaadin/data/util/query/FreeformQuery.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.query;
+package com.vaadin.data.util.sqlcontainer.query;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -12,11 +12,11 @@ import java.util.Collections;
 import java.util.List;
 
 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.query.generator.StatementHelper;
-import com.vaadin.data.util.query.generator.filter.QueryBuilder;
+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.query.generator.StatementHelper;
+import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
 
 @SuppressWarnings("serial")
 public class FreeformQuery implements QueryDelegate {
diff --git a/src/com/vaadin/data/util/query/FreeformQueryDelegate.java b/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java
index c87acecb72..443483da64 100644
--- a/src/com/vaadin/data/util/query/FreeformQueryDelegate.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.query;
+package com.vaadin.data.util.sqlcontainer.query;
 
 import java.io.Serializable;
 import java.sql.Connection;
@@ -6,7 +6,7 @@ import java.sql.SQLException;
 import java.util.List;
 
 import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.RowItem;
+import com.vaadin.data.util.sqlcontainer.RowItem;
 
 public interface FreeformQueryDelegate extends Serializable {
     /**
diff --git a/src/com/vaadin/data/util/query/FreeformStatementDelegate.java b/src/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java
index 0de8677095..67b0213dfe 100644
--- a/src/com/vaadin/data/util/query/FreeformStatementDelegate.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java
@@ -1,6 +1,6 @@
-package com.vaadin.data.util.query;

+package com.vaadin.data.util.sqlcontainer.query;

 

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

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

 

 /**

  * FreeformStatementDelegate is an extension to FreeformQueryDelegate that

diff --git a/src/com/vaadin/data/util/query/OrderBy.java b/src/com/vaadin/data/util/sqlcontainer/query/OrderBy.java
index d83d3223b0..439e905a13 100644
--- a/src/com/vaadin/data/util/query/OrderBy.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/OrderBy.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.query;
+package com.vaadin.data.util.sqlcontainer.query;
 
 import java.io.Serializable;
 
diff --git a/src/com/vaadin/data/util/query/QueryDelegate.java b/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
index 95ec89f8c3..6949fa0350 100644
--- a/src/com/vaadin/data/util/query/QueryDelegate.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.query;
+package com.vaadin.data.util.sqlcontainer.query;
 
 import java.io.Serializable;
 import java.sql.ResultSet;
@@ -6,8 +6,8 @@ import java.sql.SQLException;
 import java.util.List;
 
 import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.RowId;
-import com.vaadin.data.util.RowItem;
+import com.vaadin.data.util.sqlcontainer.RowId;
+import com.vaadin.data.util.sqlcontainer.RowItem;
 
 public interface QueryDelegate extends Serializable {
     /**
diff --git a/src/com/vaadin/data/util/query/TableQuery.java b/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
index c44a748d9a..58f83c2d52 100644
--- a/src/com/vaadin/data/util/query/TableQuery.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.query;
+package com.vaadin.data.util.sqlcontainer.query;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -16,18 +16,18 @@ import java.util.List;
 import java.util.Map;
 
 import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.ColumnProperty;
-import com.vaadin.data.util.OptimisticLockException;
-import com.vaadin.data.util.RowId;
-import com.vaadin.data.util.RowItem;
-import com.vaadin.data.util.SQLUtil;
-import com.vaadin.data.util.TemporaryRowId;
-import com.vaadin.data.util.connection.JDBCConnectionPool;
 import com.vaadin.data.util.filter.Compare.Equal;
-import com.vaadin.data.util.query.generator.DefaultSQLGenerator;
-import com.vaadin.data.util.query.generator.MSSQLGenerator;
-import com.vaadin.data.util.query.generator.SQLGenerator;
-import com.vaadin.data.util.query.generator.StatementHelper;
+import com.vaadin.data.util.sqlcontainer.ColumnProperty;
+import com.vaadin.data.util.sqlcontainer.OptimisticLockException;
+import com.vaadin.data.util.sqlcontainer.RowId;
+import com.vaadin.data.util.sqlcontainer.RowItem;
+import com.vaadin.data.util.sqlcontainer.SQLUtil;
+import com.vaadin.data.util.sqlcontainer.TemporaryRowId;
+import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
+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.SQLGenerator;
+import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
 
 @SuppressWarnings("serial")
 public class TableQuery implements QueryDelegate,
diff --git a/src/com/vaadin/data/util/query/generator/DefaultSQLGenerator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java
index b904141b99..08881b0c63 100644
--- a/src/com/vaadin/data/util/query/generator/DefaultSQLGenerator.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java
@@ -1,17 +1,17 @@
-package com.vaadin.data.util.query.generator;
+package com.vaadin.data.util.sqlcontainer.query.generator;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.ColumnProperty;
-import com.vaadin.data.util.RowItem;
-import com.vaadin.data.util.SQLUtil;
-import com.vaadin.data.util.TemporaryRowId;
-import com.vaadin.data.util.query.OrderBy;
-import com.vaadin.data.util.query.generator.filter.QueryBuilder;
-import com.vaadin.data.util.query.generator.filter.StringDecorator;
+import com.vaadin.data.util.sqlcontainer.ColumnProperty;
+import com.vaadin.data.util.sqlcontainer.RowItem;
+import com.vaadin.data.util.sqlcontainer.SQLUtil;
+import com.vaadin.data.util.sqlcontainer.TemporaryRowId;
+import com.vaadin.data.util.sqlcontainer.query.OrderBy;
+import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
+import com.vaadin.data.util.sqlcontainer.query.generator.filter.StringDecorator;
 
 /**
  * Generates generic SQL that is supported by HSQLDB, MySQL and PostgreSQL.
diff --git a/src/com/vaadin/data/util/query/generator/MSSQLGenerator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java
index da98e6751b..98f474a9b7 100644
--- a/src/com/vaadin/data/util/query/generator/MSSQLGenerator.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java
@@ -1,10 +1,10 @@
-package com.vaadin.data.util.query.generator;
+package com.vaadin.data.util.sqlcontainer.query.generator;
 
 import java.util.List;
 
 import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.query.OrderBy;
-import com.vaadin.data.util.query.generator.filter.QueryBuilder;
+import com.vaadin.data.util.sqlcontainer.query.OrderBy;
+import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
 
 @SuppressWarnings("serial")
 public class MSSQLGenerator extends DefaultSQLGenerator {
diff --git a/src/com/vaadin/data/util/query/generator/OracleGenerator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java
index 519d1822a2..223211b36e 100644
--- a/src/com/vaadin/data/util/query/generator/OracleGenerator.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java
@@ -1,10 +1,10 @@
-package com.vaadin.data.util.query.generator;
+package com.vaadin.data.util.sqlcontainer.query.generator;
 
 import java.util.List;
 
 import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.query.OrderBy;
-import com.vaadin.data.util.query.generator.filter.QueryBuilder;
+import com.vaadin.data.util.sqlcontainer.query.OrderBy;
+import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
 
 @SuppressWarnings("serial")
 public class OracleGenerator extends DefaultSQLGenerator {
diff --git a/src/com/vaadin/data/util/query/generator/SQLGenerator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java
index dfdecae6f3..97c104100b 100644
--- a/src/com/vaadin/data/util/query/generator/SQLGenerator.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java
@@ -1,11 +1,11 @@
-package com.vaadin.data.util.query.generator;
+package com.vaadin.data.util.sqlcontainer.query.generator;
 
 import java.io.Serializable;
 import java.util.List;
 
 import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.RowItem;
-import com.vaadin.data.util.query.OrderBy;
+import com.vaadin.data.util.sqlcontainer.RowItem;
+import com.vaadin.data.util.sqlcontainer.query.OrderBy;
 
 /**
  * The SQLGenerator interface is meant to be implemented for each different SQL
diff --git a/src/com/vaadin/data/util/query/generator/StatementHelper.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java
index b230f586a6..90d2983ef6 100644
--- a/src/com/vaadin/data/util/query/generator/StatementHelper.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.query.generator;

+package com.vaadin.data.util.sqlcontainer.query.generator;

 

 import java.math.BigDecimal;

 import java.sql.Date;

diff --git a/src/com/vaadin/data/util/query/generator/filter/AndTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java
index 19f1ce5f02..edc38955db 100644
--- a/src/com/vaadin/data/util/query/generator/filter/AndTranslator.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java
@@ -1,8 +1,8 @@
-package com.vaadin.data.util.query.generator.filter;
+package com.vaadin.data.util.sqlcontainer.query.generator.filter;
 
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.util.filter.And;
-import com.vaadin.data.util.query.generator.StatementHelper;
+import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class AndTranslator implements FilterTranslator {
 
diff --git a/src/com/vaadin/data/util/query/generator/filter/BetweenTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java
index 0492741b0a..55e7ab740c 100644
--- a/src/com/vaadin/data/util/query/generator/filter/BetweenTranslator.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java
@@ -1,8 +1,8 @@
-package com.vaadin.data.util.query.generator.filter;
+package com.vaadin.data.util.sqlcontainer.query.generator.filter;
 
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.util.filter.Between;
-import com.vaadin.data.util.query.generator.StatementHelper;
+import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class BetweenTranslator implements FilterTranslator {
 
diff --git a/src/com/vaadin/data/util/query/generator/filter/CompareTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java
index c35baf02f5..07cdb11153 100644
--- a/src/com/vaadin/data/util/query/generator/filter/CompareTranslator.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java
@@ -1,8 +1,8 @@
-package com.vaadin.data.util.query.generator.filter;
+package com.vaadin.data.util.sqlcontainer.query.generator.filter;
 
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.util.filter.Compare;
-import com.vaadin.data.util.query.generator.StatementHelper;
+import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class CompareTranslator implements FilterTranslator {
 
diff --git a/src/com/vaadin/data/util/query/generator/filter/FilterTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java
index 75ac488156..be649dfa7f 100644
--- a/src/com/vaadin/data/util/query/generator/filter/FilterTranslator.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java
@@ -1,7 +1,7 @@
-package com.vaadin.data.util.query.generator.filter;
+package com.vaadin.data.util.sqlcontainer.query.generator.filter;
 
 import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.query.generator.StatementHelper;
+import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public interface FilterTranslator {
     public boolean translatesFilter(Filter filter);
diff --git a/src/com/vaadin/data/util/query/generator/filter/IsNullTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java
index fc44d65b67..0a5392c13e 100644
--- a/src/com/vaadin/data/util/query/generator/filter/IsNullTranslator.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java
@@ -1,8 +1,8 @@
-package com.vaadin.data.util.query.generator.filter;
+package com.vaadin.data.util.sqlcontainer.query.generator.filter;
 
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.util.filter.IsNull;
-import com.vaadin.data.util.query.generator.StatementHelper;
+import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class IsNullTranslator implements FilterTranslator {
 
diff --git a/src/com/vaadin/data/util/query/generator/filter/LikeTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java
index e4d1d72280..7146ff6cd2 100644
--- a/src/com/vaadin/data/util/query/generator/filter/LikeTranslator.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java
@@ -1,8 +1,8 @@
-package com.vaadin.data.util.query.generator.filter;
+package com.vaadin.data.util.sqlcontainer.query.generator.filter;
 
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.util.filter.Like;
-import com.vaadin.data.util.query.generator.StatementHelper;
+import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class LikeTranslator implements FilterTranslator {
 
diff --git a/src/com/vaadin/data/util/query/generator/filter/NotTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java
index 1cb7321458..def6e540da 100644
--- a/src/com/vaadin/data/util/query/generator/filter/NotTranslator.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java
@@ -1,9 +1,9 @@
-package com.vaadin.data.util.query.generator.filter;
+package com.vaadin.data.util.sqlcontainer.query.generator.filter;
 
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.util.filter.IsNull;
 import com.vaadin.data.util.filter.Not;
-import com.vaadin.data.util.query.generator.StatementHelper;
+import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class NotTranslator implements FilterTranslator {
 
diff --git a/src/com/vaadin/data/util/query/generator/filter/OrTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java
index 1ba2db6c3a..880e711468 100644
--- a/src/com/vaadin/data/util/query/generator/filter/OrTranslator.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java
@@ -1,8 +1,8 @@
-package com.vaadin.data.util.query.generator.filter;
+package com.vaadin.data.util.sqlcontainer.query.generator.filter;
 
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.util.filter.Or;
-import com.vaadin.data.util.query.generator.StatementHelper;
+import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class OrTranslator implements FilterTranslator {
 
diff --git a/src/com/vaadin/data/util/query/generator/filter/QueryBuilder.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java
index 75405d8312..7649671726 100644
--- a/src/com/vaadin/data/util/query/generator/filter/QueryBuilder.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java
@@ -1,11 +1,11 @@
-package com.vaadin.data.util.query.generator.filter;
+package com.vaadin.data.util.sqlcontainer.query.generator.filter;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
 import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.query.generator.StatementHelper;
+import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class QueryBuilder {
 
diff --git a/src/com/vaadin/data/util/query/generator/filter/SimpleStringTranslator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java
index 6be678cc45..96b64dd110 100644
--- a/src/com/vaadin/data/util/query/generator/filter/SimpleStringTranslator.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java
@@ -1,9 +1,9 @@
-package com.vaadin.data.util.query.generator.filter;
+package com.vaadin.data.util.sqlcontainer.query.generator.filter;
 
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.util.filter.Like;
 import com.vaadin.data.util.filter.SimpleStringFilter;
-import com.vaadin.data.util.query.generator.StatementHelper;
+import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class SimpleStringTranslator implements FilterTranslator {
 
diff --git a/src/com/vaadin/data/util/query/generator/filter/StringDecorator.java b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java
index 0fdd9a1f3b..10d33ea6dd 100644
--- a/src/com/vaadin/data/util/query/generator/filter/StringDecorator.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java
@@ -1,4 +1,4 @@
-package com.vaadin.data.util.query.generator.filter;
+package com.vaadin.data.util.sqlcontainer.query.generator.filter;
 
 /**
  * The StringDecorator knows how to produce a quoted string using the specified
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;