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

svn changeset:20254/svn branch:6.7

src/com/vaadin/data/util/CacheFlushNotifier.java → 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

src/com/vaadin/data/util/CacheMap.java → 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;

src/com/vaadin/data/util/ColumnProperty.java → 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;

src/com/vaadin/data/util/OptimisticLockException.java → 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

src/com/vaadin/data/util/ReadOnlyRowId.java → 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;

src/com/vaadin/data/util/Reference.java → 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;
 

src/com/vaadin/data/util/RowId.java → 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;
 

src/com/vaadin/data/util/RowItem.java → 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;

src/com/vaadin/data/util/SQLContainer.java → 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 {

src/com/vaadin/data/util/SQLUtil.java → 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 {
 	/**

src/com/vaadin/data/util/TemporaryRowId.java → 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;

src/com/vaadin/data/util/connection/J2EEConnectionPool.java → 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;

src/com/vaadin/data/util/connection/JDBCConnectionPool.java → 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;

src/com/vaadin/data/util/connection/SimpleJDBCConnectionPool.java → 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;

src/com/vaadin/data/util/query/FreeformQuery.java → 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 {

src/com/vaadin/data/util/query/FreeformQueryDelegate.java → 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 {
     /**

src/com/vaadin/data/util/query/FreeformStatementDelegate.java → 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

src/com/vaadin/data/util/query/OrderBy.java → 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;
 

src/com/vaadin/data/util/query/QueryDelegate.java → 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 {
     /**

src/com/vaadin/data/util/query/TableQuery.java → 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,

src/com/vaadin/data/util/query/generator/DefaultSQLGenerator.java → 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.

src/com/vaadin/data/util/query/generator/MSSQLGenerator.java → 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 {

src/com/vaadin/data/util/query/generator/OracleGenerator.java → 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 {

src/com/vaadin/data/util/query/generator/SQLGenerator.java → 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

src/com/vaadin/data/util/query/generator/StatementHelper.java → 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;

src/com/vaadin/data/util/query/generator/filter/AndTranslator.java → 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 {
 

src/com/vaadin/data/util/query/generator/filter/BetweenTranslator.java → 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 {
 

src/com/vaadin/data/util/query/generator/filter/CompareTranslator.java → 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 {
 

src/com/vaadin/data/util/query/generator/filter/FilterTranslator.java → 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);

src/com/vaadin/data/util/query/generator/filter/IsNullTranslator.java → 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 {
 

src/com/vaadin/data/util/query/generator/filter/LikeTranslator.java → 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 {
 

src/com/vaadin/data/util/query/generator/filter/NotTranslator.java → 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 {
 

src/com/vaadin/data/util/query/generator/filter/OrTranslator.java → 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 {
 

src/com/vaadin/data/util/query/generator/filter/QueryBuilder.java → 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 {
 

src/com/vaadin/data/util/query/generator/filter/SimpleStringTranslator.java → 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 {
 

src/com/vaadin/data/util/query/generator/filter/StringDecorator.java → 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

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;

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;

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;

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 {
 

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 {

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 {

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 {
 

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 {
 

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;
 

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 {

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;

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 {
 

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 {
 

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 {

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;
 

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;

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 {
 

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;