Moved top package

pom.xml

@@ -281,8 +281,8 @@
 				</executions>
 				<configuration>
 					<ignoreMissingFile>false</ignoreMissingFile>
-					<file>src/main/java/com/j256/ormlite/misc/VersionUtils.java</file>
-					<outputFile>src/main/java/com/j256/ormlite/misc/VersionUtils.java</outputFile>
+					<file>src/main/java/com/j256/ormlite/core/misc/VersionUtils.java</file>
+					<outputFile>src/main/java/com/j256/ormlite/core/misc/VersionUtils.java</outputFile>
 					<regex>true</regex>
 					<token>(VERSION__).*(__)</token>
 					<value>$1${version}$2</value>

src/main/java/com/j256/ormlite/dao/BaseDaoImpl.java → src/main/java/com/j256/ormlite/core/dao/BaseDaoImpl.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.core.dao;
 
 import java.io.IOException;
 import java.sql.SQLException;
@@ -11,30 +11,30 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 
-import com.j256.ormlite.db.DatabaseType;
-import com.j256.ormlite.field.DataType;
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.field.FieldType;
-import com.j256.ormlite.misc.BaseDaoEnabled;
-import com.j256.ormlite.misc.SqlExceptionUtil;
-import com.j256.ormlite.stmt.DeleteBuilder;
-import com.j256.ormlite.stmt.GenericRowMapper;
-import com.j256.ormlite.stmt.PreparedDelete;
-import com.j256.ormlite.stmt.PreparedQuery;
-import com.j256.ormlite.stmt.PreparedUpdate;
-import com.j256.ormlite.stmt.QueryBuilder;
-import com.j256.ormlite.stmt.SelectArg;
-import com.j256.ormlite.stmt.SelectIterator;
-import com.j256.ormlite.stmt.StatementBuilder.StatementType;
-import com.j256.ormlite.stmt.StatementExecutor;
-import com.j256.ormlite.stmt.UpdateBuilder;
-import com.j256.ormlite.stmt.Where;
-import com.j256.ormlite.support.ConnectionSource;
-import com.j256.ormlite.support.DatabaseConnection;
-import com.j256.ormlite.support.DatabaseResults;
-import com.j256.ormlite.table.DatabaseTableConfig;
-import com.j256.ormlite.table.ObjectFactory;
-import com.j256.ormlite.table.TableInfo;
+import com.j256.ormlite.core.db.DatabaseType;
+import com.j256.ormlite.core.field.DataType;
+import com.j256.ormlite.core.field.DatabaseField;
+import com.j256.ormlite.core.field.FieldType;
+import com.j256.ormlite.core.misc.BaseDaoEnabled;
+import com.j256.ormlite.core.misc.SqlExceptionUtil;
+import com.j256.ormlite.core.stmt.DeleteBuilder;
+import com.j256.ormlite.core.stmt.GenericRowMapper;
+import com.j256.ormlite.core.stmt.PreparedDelete;
+import com.j256.ormlite.core.stmt.PreparedQuery;
+import com.j256.ormlite.core.stmt.PreparedUpdate;
+import com.j256.ormlite.core.stmt.QueryBuilder;
+import com.j256.ormlite.core.stmt.SelectArg;
+import com.j256.ormlite.core.stmt.SelectIterator;
+import com.j256.ormlite.core.stmt.StatementBuilder.StatementType;
+import com.j256.ormlite.core.stmt.StatementExecutor;
+import com.j256.ormlite.core.stmt.UpdateBuilder;
+import com.j256.ormlite.core.stmt.Where;
+import com.j256.ormlite.core.support.ConnectionSource;
+import com.j256.ormlite.core.support.DatabaseConnection;
+import com.j256.ormlite.core.support.DatabaseResults;
+import com.j256.ormlite.core.table.DatabaseTableConfig;
+import com.j256.ormlite.core.table.ObjectFactory;
+import com.j256.ormlite.core.table.TableInfo;
 
 /**
  * Base class for the Database Access Objects that handle the reading and writing a class from the database.

src/main/java/com/j256/ormlite/dao/BaseForeignCollection.java → src/main/java/com/j256/ormlite/core/dao/BaseForeignCollection.java

@@ -1,16 +1,16 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.core.dao;
 
 import java.io.Serializable;
 import java.sql.SQLException;
 import java.util.Collection;
 
-import com.j256.ormlite.field.FieldType;
-import com.j256.ormlite.field.ForeignCollectionField;
-import com.j256.ormlite.misc.IOUtils;
-import com.j256.ormlite.stmt.PreparedQuery;
-import com.j256.ormlite.stmt.QueryBuilder;
-import com.j256.ormlite.stmt.SelectArg;
-import com.j256.ormlite.stmt.mapped.MappedPreparedStmt;
+import com.j256.ormlite.core.field.FieldType;
+import com.j256.ormlite.core.field.ForeignCollectionField;
+import com.j256.ormlite.core.misc.IOUtils;
+import com.j256.ormlite.core.stmt.PreparedQuery;
+import com.j256.ormlite.core.stmt.QueryBuilder;
+import com.j256.ormlite.core.stmt.SelectArg;
+import com.j256.ormlite.core.stmt.mapped.MappedPreparedStmt;
 
 /**
  * Base collection that is set on a field that as been marked with the {@link ForeignCollectionField} annotation when an

src/main/java/com/j256/ormlite/dao/CloseableIterable.java → src/main/java/com/j256/ormlite/core/dao/CloseableIterable.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.core.dao;
 
 /**
  * Extension to Iterable to provide a iterator() method that returns a {@link CloseableIterator}.

src/main/java/com/j256/ormlite/dao/CloseableIterator.java → src/main/java/com/j256/ormlite/core/dao/CloseableIterator.java

@@ -1,10 +1,10 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.core.dao;
 
 import java.io.Closeable;
 import java.sql.SQLException;
 import java.util.Iterator;
 
-import com.j256.ormlite.support.DatabaseResults;
+import com.j256.ormlite.core.support.DatabaseResults;
 
 /**
  * Extension to Iterator to provide a close() method. This should be in the JDK.

src/main/java/com/j256/ormlite/dao/CloseableWrappedIterable.java → src/main/java/com/j256/ormlite/core/dao/CloseableWrappedIterable.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.core.dao;
 
 import java.io.Closeable;
 import java.io.IOException;

src/main/java/com/j256/ormlite/dao/CloseableWrappedIterableImpl.java → src/main/java/com/j256/ormlite/core/dao/CloseableWrappedIterableImpl.java

@@ -1,8 +1,8 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.core.dao;
 
 import java.io.IOException;
 
-import com.j256.ormlite.misc.IOUtils;
+import com.j256.ormlite.core.misc.IOUtils;
 
 /**
  * Class which is used to help folks use for loops but still close at the end. This is a wrapper to allow multiple

src/main/java/com/j256/ormlite/dao/Dao.java → src/main/java/com/j256/ormlite/core/dao/Dao.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.core.dao;
 
 import java.io.IOException;
 import java.lang.ref.SoftReference;
@@ -10,22 +10,22 @@
 import java.util.Map;
 import java.util.concurrent.Callable;
 
-import com.j256.ormlite.field.DataType;
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.field.FieldType;
-import com.j256.ormlite.field.ForeignCollectionField;
-import com.j256.ormlite.stmt.DeleteBuilder;
-import com.j256.ormlite.stmt.GenericRowMapper;
-import com.j256.ormlite.stmt.PreparedDelete;
-import com.j256.ormlite.stmt.PreparedQuery;
-import com.j256.ormlite.stmt.PreparedUpdate;
-import com.j256.ormlite.stmt.QueryBuilder;
-import com.j256.ormlite.stmt.SelectArg;
-import com.j256.ormlite.stmt.UpdateBuilder;
-import com.j256.ormlite.support.ConnectionSource;
-import com.j256.ormlite.support.DatabaseConnection;
-import com.j256.ormlite.support.DatabaseResults;
-import com.j256.ormlite.table.ObjectFactory;
+import com.j256.ormlite.core.field.DataType;
+import com.j256.ormlite.core.field.DatabaseField;
+import com.j256.ormlite.core.field.FieldType;
+import com.j256.ormlite.core.field.ForeignCollectionField;
+import com.j256.ormlite.core.stmt.DeleteBuilder;
+import com.j256.ormlite.core.stmt.GenericRowMapper;
+import com.j256.ormlite.core.stmt.PreparedDelete;
+import com.j256.ormlite.core.stmt.PreparedQuery;
+import com.j256.ormlite.core.stmt.PreparedUpdate;
+import com.j256.ormlite.core.stmt.QueryBuilder;
+import com.j256.ormlite.core.stmt.SelectArg;
+import com.j256.ormlite.core.stmt.UpdateBuilder;
+import com.j256.ormlite.core.support.ConnectionSource;
+import com.j256.ormlite.core.support.DatabaseConnection;
+import com.j256.ormlite.core.support.DatabaseResults;
+import com.j256.ormlite.core.table.ObjectFactory;
 
 /**
  * The definition of the Database Access Objects that handle the reading and writing a class from the database. Kudos to

src/main/java/com/j256/ormlite/dao/DaoManager.java → src/main/java/com/j256/ormlite/core/dao/DaoManager.java

@@ -1,18 +1,18 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.core.dao;
 
 import java.lang.reflect.Constructor;
 import java.sql.SQLException;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.j256.ormlite.db.DatabaseType;
-import com.j256.ormlite.logger.Logger;
-import com.j256.ormlite.logger.LoggerFactory;
-import com.j256.ormlite.misc.SqlExceptionUtil;
-import com.j256.ormlite.support.ConnectionSource;
-import com.j256.ormlite.table.DatabaseTable;
-import com.j256.ormlite.table.DatabaseTableConfig;
+import com.j256.ormlite.core.db.DatabaseType;
+import com.j256.ormlite.core.logger.Logger;
+import com.j256.ormlite.core.logger.LoggerFactory;
+import com.j256.ormlite.core.misc.SqlExceptionUtil;
+import com.j256.ormlite.core.support.ConnectionSource;
+import com.j256.ormlite.core.table.DatabaseTable;
+import com.j256.ormlite.core.table.DatabaseTableConfig;
 
 /**
  * Class which caches created DAOs. Sometimes internal DAOs are used to support such features as auto-refreshing of

src/main/java/com/j256/ormlite/dao/DatabaseResultsMapper.java → src/main/java/com/j256/ormlite/core/dao/DatabaseResultsMapper.java

@@ -1,8 +1,8 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.core.dao;
 
 import java.sql.SQLException;
 
-import com.j256.ormlite.support.DatabaseResults;
+import com.j256.ormlite.core.support.DatabaseResults;
 
 /**
  * Result apper that utilized the raw {@link DatabaseResults} object. See

src/main/java/com/j256/ormlite/dao/EagerForeignCollection.java → src/main/java/com/j256/ormlite/core/dao/EagerForeignCollection.java

@@ -1,15 +1,15 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.core.dao;
 
 import java.io.Serializable;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import com.j256.ormlite.field.FieldType;
-import com.j256.ormlite.field.ForeignCollectionField;
-import com.j256.ormlite.support.DatabaseConnection;
-import com.j256.ormlite.support.DatabaseResults;
+import com.j256.ormlite.core.field.FieldType;
+import com.j256.ormlite.core.field.ForeignCollectionField;
+import com.j256.ormlite.core.support.DatabaseConnection;
+import com.j256.ormlite.core.support.DatabaseResults;
 
 /**
  * Collection that is set on a field that as been marked with the {@link ForeignCollectionField} annotation when an

src/main/java/com/j256/ormlite/dao/ForeignCollection.java → src/main/java/com/j256/ormlite/core/dao/ForeignCollection.java

@@ -1,10 +1,10 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.core.dao;
 
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.Collection;
 
-import com.j256.ormlite.field.ForeignCollectionField;
+import com.j256.ormlite.core.field.ForeignCollectionField;
 
 /**
  * <p>

src/main/java/com/j256/ormlite/dao/GenericRawResults.java → src/main/java/com/j256/ormlite/core/dao/GenericRawResults.java

@@ -1,10 +1,10 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.core.dao;
 
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
 
-import com.j256.ormlite.field.DataType;
+import com.j256.ormlite.core.field.DataType;
 
 /**
  * Results returned by a call to {@link Dao#queryRaw(String, String...)} which returns results as a String[],

src/main/java/com/j256/ormlite/dao/LazyForeignCollection.java → src/main/java/com/j256/ormlite/core/dao/LazyForeignCollection.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.core.dao;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -9,10 +9,10 @@
 import java.util.List;
 import java.util.Set;
 
-import com.j256.ormlite.field.FieldType;
-import com.j256.ormlite.field.ForeignCollectionField;
-import com.j256.ormlite.misc.IOUtils;
-import com.j256.ormlite.support.DatabaseConnection;
+import com.j256.ormlite.core.field.FieldType;
+import com.j256.ormlite.core.field.ForeignCollectionField;
+import com.j256.ormlite.core.misc.IOUtils;
+import com.j256.ormlite.core.support.DatabaseConnection;
 
 /**
  * Collection that is set on a field that as been marked with the {@link ForeignCollectionField} annotation when an

src/main/java/com/j256/ormlite/dao/LruObjectCache.java → src/main/java/com/j256/ormlite/core/dao/LruObjectCache.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.core.dao;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;

src/main/java/com/j256/ormlite/dao/ObjectCache.java → src/main/java/com/j256/ormlite/core/dao/ObjectCache.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.core.dao;
 
 /**
  * Definition of an object cache that can be injected into the Dao with the {@link Dao#setObjectCache(ObjectCache)}.

src/main/java/com/j256/ormlite/dao/RawRowMapper.java → src/main/java/com/j256/ormlite/core/dao/RawRowMapper.java

@@ -1,16 +1,16 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.core.dao;
 
 import java.sql.SQLException;
 
-import com.j256.ormlite.stmt.QueryBuilder;
+import com.j256.ormlite.core.stmt.QueryBuilder;
 
 /**
  * Parameterized row mapper that takes output from the {@link GenericRawResults} and returns a T. Is used in the
  * {@link Dao#queryRaw(String, RawRowMapper, String...)} method.
  * 
  * <p>
  * <b> NOTE: </b> If you need to map Objects instead then consider using the {@link RawRowObjectMapper} with the
- * {@link Dao#queryRaw(String, com.j256.ormlite.field.DataType[], RawRowObjectMapper, String...)} method which allows
+ * {@link Dao#queryRaw(String, com.j256.ormlite.core.field.DataType[], RawRowObjectMapper, String...)} method which allows
  * you to iterate over the raw results as Object[].
  * </p>
  * 

src/main/java/com/j256/ormlite/dao/RawRowObjectMapper.java → src/main/java/com/j256/ormlite/core/dao/RawRowObjectMapper.java

@@ -1,9 +1,9 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.core.dao;
 
 import java.sql.SQLException;
 
-import com.j256.ormlite.field.DataType;
-import com.j256.ormlite.stmt.QueryBuilder;
+import com.j256.ormlite.core.field.DataType;
+import com.j256.ormlite.core.stmt.QueryBuilder;
 
 /**
  * Parameterized row mapper that takes output from the {@link GenericRawResults} and returns a T. Is used in the

src/main/java/com/j256/ormlite/dao/ReferenceObjectCache.java → src/main/java/com/j256/ormlite/core/dao/ReferenceObjectCache.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.core.dao;
 
 import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;

src/main/java/com/j256/ormlite/dao/RuntimeExceptionDao.java → src/main/java/com/j256/ormlite/core/dao/RuntimeExceptionDao.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.core.dao;
 
 import java.io.IOException;
 import java.sql.SQLException;
@@ -7,23 +7,23 @@
 import java.util.Map;
 import java.util.concurrent.Callable;
 
-import com.j256.ormlite.field.DataType;
-import com.j256.ormlite.field.FieldType;
-import com.j256.ormlite.logger.Log.Level;
-import com.j256.ormlite.logger.Logger;
-import com.j256.ormlite.logger.LoggerFactory;
-import com.j256.ormlite.stmt.DeleteBuilder;
-import com.j256.ormlite.stmt.GenericRowMapper;
-import com.j256.ormlite.stmt.PreparedDelete;
-import com.j256.ormlite.stmt.PreparedQuery;
-import com.j256.ormlite.stmt.PreparedUpdate;
-import com.j256.ormlite.stmt.QueryBuilder;
-import com.j256.ormlite.stmt.UpdateBuilder;
-import com.j256.ormlite.support.ConnectionSource;
-import com.j256.ormlite.support.DatabaseConnection;
-import com.j256.ormlite.support.DatabaseResults;
-import com.j256.ormlite.table.DatabaseTableConfig;
-import com.j256.ormlite.table.ObjectFactory;
+import com.j256.ormlite.core.field.DataType;
+import com.j256.ormlite.core.field.FieldType;
+import com.j256.ormlite.core.logger.Log.Level;
+import com.j256.ormlite.core.logger.Logger;
+import com.j256.ormlite.core.logger.LoggerFactory;
+import com.j256.ormlite.core.stmt.DeleteBuilder;
+import com.j256.ormlite.core.stmt.GenericRowMapper;
+import com.j256.ormlite.core.stmt.PreparedDelete;
+import com.j256.ormlite.core.stmt.PreparedQuery;
+import com.j256.ormlite.core.stmt.PreparedUpdate;
+import com.j256.ormlite.core.stmt.QueryBuilder;
+import com.j256.ormlite.core.stmt.UpdateBuilder;
+import com.j256.ormlite.core.support.ConnectionSource;
+import com.j256.ormlite.core.support.DatabaseConnection;
+import com.j256.ormlite.core.support.DatabaseResults;
+import com.j256.ormlite.core.table.DatabaseTableConfig;
+import com.j256.ormlite.core.table.ObjectFactory;
 
 /**
  * Proxy to a {@link Dao} that wraps each Exception and rethrows it as RuntimeException. You can use this if your usage