Repackage Depot as com.samskivert.depot as it is now a standalone library.

We're also going to allow ourselves the luxury of a Google Collections
dependency.

src/java/com/samskivert/depot/BindVisitor.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.nio.ByteBuffer;
 import java.sql.Connection;
@@ -27,31 +27,31 @@ import java.sql.SQLException;
 import java.util.Map;
 import java.util.Set;
 
-import com.samskivert.jdbc.depot.clause.DeleteClause;
-import com.samskivert.jdbc.depot.clause.FieldDefinition;
-import com.samskivert.jdbc.depot.clause.ForUpdate;
-import com.samskivert.jdbc.depot.clause.FromOverride;
-import com.samskivert.jdbc.depot.clause.GroupBy;
-import com.samskivert.jdbc.depot.clause.InsertClause;
-import com.samskivert.jdbc.depot.clause.Join;
-import com.samskivert.jdbc.depot.clause.Limit;
-import com.samskivert.jdbc.depot.clause.OrderBy;
-import com.samskivert.jdbc.depot.clause.SelectClause;
-import com.samskivert.jdbc.depot.clause.UpdateClause;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
-import com.samskivert.jdbc.depot.expression.EpochSeconds;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.FunctionExp;
-import com.samskivert.jdbc.depot.expression.LiteralExp;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
-import com.samskivert.jdbc.depot.expression.ValueExp;
-import com.samskivert.jdbc.depot.operator.Conditionals.Exists;
-import com.samskivert.jdbc.depot.operator.Conditionals.FullTextMatch;
-import com.samskivert.jdbc.depot.operator.Conditionals.In;
-import com.samskivert.jdbc.depot.operator.Conditionals.IsNull;
-import com.samskivert.jdbc.depot.operator.Logic.Not;
-import com.samskivert.jdbc.depot.operator.SQLOperator.BinaryOperator;
-import com.samskivert.jdbc.depot.operator.SQLOperator.MultiOperator;
+import com.samskivert.depot.clause.DeleteClause;
+import com.samskivert.depot.clause.FieldDefinition;
+import com.samskivert.depot.clause.ForUpdate;
+import com.samskivert.depot.clause.FromOverride;
+import com.samskivert.depot.clause.GroupBy;
+import com.samskivert.depot.clause.InsertClause;
+import com.samskivert.depot.clause.Join;
+import com.samskivert.depot.clause.Limit;
+import com.samskivert.depot.clause.OrderBy;
+import com.samskivert.depot.clause.SelectClause;
+import com.samskivert.depot.clause.UpdateClause;
+import com.samskivert.depot.expression.ColumnExp;
+import com.samskivert.depot.expression.EpochSeconds;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.FunctionExp;
+import com.samskivert.depot.expression.LiteralExp;
+import com.samskivert.depot.expression.SQLExpression;
+import com.samskivert.depot.expression.ValueExp;
+import com.samskivert.depot.operator.Conditionals.Exists;
+import com.samskivert.depot.operator.Conditionals.FullTextMatch;
+import com.samskivert.depot.operator.Conditionals.In;
+import com.samskivert.depot.operator.Conditionals.IsNull;
+import com.samskivert.depot.operator.Logic.Not;
+import com.samskivert.depot.operator.SQLOperator.BinaryOperator;
+import com.samskivert.depot.operator.SQLOperator.MultiOperator;
 
 import com.samskivert.util.StringUtil;
 

src/java/com/samskivert/depot/BuildVisitor.java

@@ -18,40 +18,40 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.samskivert.jdbc.depot.annotation.Computed;
-import com.samskivert.jdbc.depot.clause.DeleteClause;
-import com.samskivert.jdbc.depot.clause.FieldDefinition;
-import com.samskivert.jdbc.depot.clause.FieldOverride;
-import com.samskivert.jdbc.depot.clause.ForUpdate;
-import com.samskivert.jdbc.depot.clause.FromOverride;
-import com.samskivert.jdbc.depot.clause.GroupBy;
-import com.samskivert.jdbc.depot.clause.InsertClause;
-import com.samskivert.jdbc.depot.clause.Join;
-import com.samskivert.jdbc.depot.clause.Limit;
-import com.samskivert.jdbc.depot.clause.OrderBy;
-import com.samskivert.jdbc.depot.clause.SelectClause;
-import com.samskivert.jdbc.depot.clause.UpdateClause;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
-import com.samskivert.jdbc.depot.expression.EpochSeconds;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.FunctionExp;
-import com.samskivert.jdbc.depot.expression.LiteralExp;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
-import com.samskivert.jdbc.depot.expression.ValueExp;
-import com.samskivert.jdbc.depot.operator.Conditionals.Exists;
-import com.samskivert.jdbc.depot.operator.Conditionals.FullTextMatch;
-import com.samskivert.jdbc.depot.operator.Conditionals.In;
-import com.samskivert.jdbc.depot.operator.Conditionals.IsNull;
-import com.samskivert.jdbc.depot.operator.Logic.Not;
-import com.samskivert.jdbc.depot.operator.SQLOperator.BinaryOperator;
-import com.samskivert.jdbc.depot.operator.SQLOperator.MultiOperator;
+import com.samskivert.depot.annotation.Computed;
+import com.samskivert.depot.clause.DeleteClause;
+import com.samskivert.depot.clause.FieldDefinition;
+import com.samskivert.depot.clause.FieldOverride;
+import com.samskivert.depot.clause.ForUpdate;
+import com.samskivert.depot.clause.FromOverride;
+import com.samskivert.depot.clause.GroupBy;
+import com.samskivert.depot.clause.InsertClause;
+import com.samskivert.depot.clause.Join;
+import com.samskivert.depot.clause.Limit;
+import com.samskivert.depot.clause.OrderBy;
+import com.samskivert.depot.clause.SelectClause;
+import com.samskivert.depot.clause.UpdateClause;
+import com.samskivert.depot.expression.ColumnExp;
+import com.samskivert.depot.expression.EpochSeconds;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.FunctionExp;
+import com.samskivert.depot.expression.LiteralExp;
+import com.samskivert.depot.expression.SQLExpression;
+import com.samskivert.depot.expression.ValueExp;
+import com.samskivert.depot.operator.Conditionals.Exists;
+import com.samskivert.depot.operator.Conditionals.FullTextMatch;
+import com.samskivert.depot.operator.Conditionals.In;
+import com.samskivert.depot.operator.Conditionals.IsNull;
+import com.samskivert.depot.operator.Logic.Not;
+import com.samskivert.depot.operator.SQLOperator.BinaryOperator;
+import com.samskivert.depot.operator.SQLOperator.MultiOperator;
 
 /**
  * Implements the base functionality of the SQL-building pass of {@link SQLBuilder}. Dialectal

src/java/com/samskivert/depot/ByteEnum.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 /**
  * An enum value can be used as a field in a persistent object if it implements this interface and

src/java/com/samskivert/depot/CacheAdapter.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.io.Serializable;
 

src/java/com/samskivert/depot/CacheInvalidator.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.io.Serializable;
 

src/java/com/samskivert/depot/CacheKey.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.io.Serializable;
 

src/java/com/samskivert/depot/DataMigration.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 /**
  * Encapsulates a migration of data between entities that should be run only once and using the

src/java/com/samskivert/depot/DatabaseException.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 /**
  * Represents a failure reported by the underlying database.

src/java/com/samskivert/depot/DepotMarshaller.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.lang.reflect.Field;
 
@@ -36,21 +36,21 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import com.samskivert.jdbc.depot.annotation.Computed;
-import com.samskivert.jdbc.depot.annotation.Entity;
-import com.samskivert.jdbc.depot.annotation.FullTextIndex;
-import com.samskivert.jdbc.depot.annotation.GeneratedValue;
-import com.samskivert.jdbc.depot.annotation.Id;
-import com.samskivert.jdbc.depot.annotation.Index;
-import com.samskivert.jdbc.depot.annotation.TableGenerator;
-import com.samskivert.jdbc.depot.annotation.Transient;
-import com.samskivert.jdbc.depot.annotation.UniqueConstraint;
+import com.samskivert.depot.annotation.Computed;
+import com.samskivert.depot.annotation.Entity;
+import com.samskivert.depot.annotation.FullTextIndex;
+import com.samskivert.depot.annotation.GeneratedValue;
+import com.samskivert.depot.annotation.Id;
+import com.samskivert.depot.annotation.Index;
+import com.samskivert.depot.annotation.TableGenerator;
+import com.samskivert.depot.annotation.Transient;
+import com.samskivert.depot.annotation.UniqueConstraint;
 
 import com.samskivert.jdbc.ColumnDefinition;
 import com.samskivert.jdbc.DatabaseLiaison;
 import com.samskivert.util.ArrayUtil;
 
-import static com.samskivert.jdbc.depot.Log.log;
+import static com.samskivert.depot.Log.log;
 
 /**
  * Handles the marshalling and unmarshalling of persistent instances to JDBC primitives ({@link

src/java/com/samskivert/depot/DepotMigrationHistoryRecord.java

@@ -18,13 +18,13 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Timestamp;
 
-import com.samskivert.jdbc.depot.annotation.Column;
-import com.samskivert.jdbc.depot.annotation.Id;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
+import com.samskivert.depot.annotation.Column;
+import com.samskivert.depot.annotation.Id;
+import com.samskivert.depot.expression.ColumnExp;
 
 /**
  * Maintains a record of all successfully invoked data migrations.

src/java/com/samskivert/depot/DepotRepository.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -41,17 +41,17 @@ import com.samskivert.jdbc.ConnectionProvider;
 import com.samskivert.jdbc.DatabaseLiaison;
 import com.samskivert.jdbc.JDBCUtil;
 
-import com.samskivert.jdbc.depot.Modifier.*;
-import com.samskivert.jdbc.depot.clause.DeleteClause;
-import com.samskivert.jdbc.depot.clause.FieldOverride;
-import com.samskivert.jdbc.depot.clause.InsertClause;
-import com.samskivert.jdbc.depot.clause.QueryClause;
-import com.samskivert.jdbc.depot.clause.SelectClause;
-import com.samskivert.jdbc.depot.clause.UpdateClause;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
-import com.samskivert.jdbc.depot.expression.ValueExp;
+import com.samskivert.depot.Modifier.*;
+import com.samskivert.depot.clause.DeleteClause;
+import com.samskivert.depot.clause.FieldOverride;
+import com.samskivert.depot.clause.InsertClause;
+import com.samskivert.depot.clause.QueryClause;
+import com.samskivert.depot.clause.SelectClause;
+import com.samskivert.depot.clause.UpdateClause;
+import com.samskivert.depot.expression.SQLExpression;
+import com.samskivert.depot.expression.ValueExp;
 
-import static com.samskivert.jdbc.depot.Log.log;
+import static com.samskivert.depot.Log.log;
 
 /**
  * Provides a base for classes that provide access to persistent objects. Also defines the

src/java/com/samskivert/depot/DepotTypes.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.SQLException;
 
@@ -29,8 +29,8 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import com.samskivert.jdbc.depot.clause.QueryClause;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.clause.QueryClause;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  * Maintains a record of the persistent classes brought into the context of the associated SQL,

src/java/com/samskivert/depot/DuplicateKeyException.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 /**
  * Thrown when an insert or update results in a duplicate key on a column that has a uniqueness

src/java/com/samskivert/depot/EHCacheAdapter.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.io.Serializable;
 
@@ -29,7 +29,7 @@ import net.sf.ehcache.distribution.CacheManagerPeerListener;
 import net.sf.ehcache.distribution.CacheManagerPeerProvider;
 import net.sf.ehcache.distribution.RMIAsynchronousCacheReplicator;
 
-import static com.samskivert.jdbc.depot.Log.log;
+import static com.samskivert.depot.Log.log;
 
 /**
  * An implementation of {@link CacheAdapter} for ehcache.

src/java/com/samskivert/depot/FieldMarshaller.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -35,9 +35,9 @@ import java.sql.Time;
 import java.sql.Timestamp;
 
 import com.samskivert.jdbc.ColumnDefinition;
-import com.samskivert.jdbc.depot.annotation.Column;
-import com.samskivert.jdbc.depot.annotation.Computed;
-import com.samskivert.jdbc.depot.annotation.GeneratedValue;
+import com.samskivert.depot.annotation.Column;
+import com.samskivert.depot.annotation.Computed;
+import com.samskivert.depot.annotation.GeneratedValue;
 
 import com.samskivert.util.StringUtil;
 

src/java/com/samskivert/depot/FindAllQuery.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -37,12 +37,12 @@ import java.util.Set;
 import com.samskivert.jdbc.DatabaseLiaison;
 import com.samskivert.jdbc.JDBCUtil;
 
-import com.samskivert.jdbc.depot.clause.FieldOverride;
-import com.samskivert.jdbc.depot.clause.QueryClause;
-import com.samskivert.jdbc.depot.clause.SelectClause;
-import com.samskivert.jdbc.depot.operator.Conditionals.*;
+import com.samskivert.depot.clause.FieldOverride;
+import com.samskivert.depot.clause.QueryClause;
+import com.samskivert.depot.clause.SelectClause;
+import com.samskivert.depot.operator.Conditionals.*;
 
-import static com.samskivert.jdbc.depot.Log.log;
+import static com.samskivert.depot.Log.log;
 
 /**
  * This class implements the functionality required by {@link DepotRepository#findAll}: fetch

src/java/com/samskivert/depot/FindOneQuery.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -27,8 +27,8 @@ import java.sql.SQLException;
 
 import com.samskivert.jdbc.DatabaseLiaison;
 import com.samskivert.jdbc.JDBCUtil;
-import com.samskivert.jdbc.depot.clause.QueryClause;
-import com.samskivert.jdbc.depot.clause.SelectClause;
+import com.samskivert.depot.clause.QueryClause;
+import com.samskivert.depot.clause.SelectClause;
 
 /**
  * The implementation of {@link DepotRepository#load} functionality.

src/java/com/samskivert/depot/IdentityValueGenerator.java

@@ -18,13 +18,13 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 
 import com.samskivert.jdbc.DatabaseLiaison;
-import com.samskivert.jdbc.depot.annotation.GeneratedValue;
+import com.samskivert.depot.annotation.GeneratedValue;
 
 /**
  * Generates primary keys using an identity column.

src/java/com/samskivert/depot/Key.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -27,8 +27,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.SQLExpression;
 import com.samskivert.util.StringUtil;
 
 /**

src/java/com/samskivert/depot/KeySet.java

@@ -18,15 +18,15 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.LiteralExp;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
-import com.samskivert.jdbc.depot.operator.Conditionals;
-import com.samskivert.jdbc.depot.operator.Logic;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.LiteralExp;
+import com.samskivert.depot.expression.SQLExpression;
+import com.samskivert.depot.operator.Conditionals;
+import com.samskivert.depot.operator.Logic;
 
 /**
  * Contains a set of primary keys that match a set of persistent records. This is used internally

src/java/com/samskivert/depot/KeyUtil.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -26,7 +26,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.samskivert.jdbc.depot.annotation.Id;
+import com.samskivert.depot.annotation.Id;
 
 /**
  * Simple utility methods used by {@link Key} and {@link KeySet}.

src/java/com/samskivert/depot/Log.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import com.samskivert.util.Logger;
 
@@ -28,5 +28,5 @@ import com.samskivert.util.Logger;
 public class Log
 {
     /** We dispatch our log messages through this logger. */
-    public static Logger log = Logger.getLogger("com.samskivert.jdbc.depot");
+    public static Logger log = Logger.getLogger("com.samskivert.depot");
 }

src/java/com/samskivert/depot/Modifier.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.SQLException;

src/java/com/samskivert/depot/MultiKey.java

@@ -18,15 +18,15 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.samskivert.jdbc.depot.clause.Where;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.clause.Where;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  * A special form of {@link Where} clause that specifies an explicit range of database rows. It

src/java/com/samskivert/depot/MySQLBuilder.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Blob;
 import java.sql.Clob;
@@ -32,22 +32,22 @@ import java.sql.Timestamp;
 import java.util.Set;
 
 import com.samskivert.jdbc.JDBCUtil;
-import com.samskivert.jdbc.depot.FieldMarshaller.BooleanMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.ByteArrayMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.ByteEnumMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.ByteMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.DoubleMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.FloatMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.IntArrayMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.IntMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.LongMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.ObjectMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.ShortMarshaller;
-import com.samskivert.jdbc.depot.annotation.FullTextIndex;
-import com.samskivert.jdbc.depot.clause.DeleteClause;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
-import com.samskivert.jdbc.depot.expression.EpochSeconds;
-import com.samskivert.jdbc.depot.operator.Conditionals.FullTextMatch;
+import com.samskivert.depot.FieldMarshaller.BooleanMarshaller;
+import com.samskivert.depot.FieldMarshaller.ByteArrayMarshaller;
+import com.samskivert.depot.FieldMarshaller.ByteEnumMarshaller;
+import com.samskivert.depot.FieldMarshaller.ByteMarshaller;
+import com.samskivert.depot.FieldMarshaller.DoubleMarshaller;
+import com.samskivert.depot.FieldMarshaller.FloatMarshaller;
+import com.samskivert.depot.FieldMarshaller.IntArrayMarshaller;
+import com.samskivert.depot.FieldMarshaller.IntMarshaller;
+import com.samskivert.depot.FieldMarshaller.LongMarshaller;
+import com.samskivert.depot.FieldMarshaller.ObjectMarshaller;
+import com.samskivert.depot.FieldMarshaller.ShortMarshaller;
+import com.samskivert.depot.annotation.FullTextIndex;
+import com.samskivert.depot.clause.DeleteClause;
+import com.samskivert.depot.expression.ColumnExp;
+import com.samskivert.depot.expression.EpochSeconds;
+import com.samskivert.depot.operator.Conditionals.FullTextMatch;
 
 import static com.samskivert.Log.log;
 

src/java/com/samskivert/depot/Operation.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.SQLException;

src/java/com/samskivert/depot/PersistenceContext.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -40,9 +40,9 @@ import com.samskivert.jdbc.LiaisonRegistry;
 import com.samskivert.jdbc.MySQLLiaison;
 import com.samskivert.jdbc.PostgreSQLLiaison;
 
-import com.samskivert.jdbc.depot.annotation.TableGenerator;
+import com.samskivert.depot.annotation.TableGenerator;
 
-import static com.samskivert.jdbc.depot.Log.log;
+import static com.samskivert.depot.Log.log;
 
 /**
  * Defines a scope in which global annotations are shared.
@@ -50,7 +50,7 @@ import static com.samskivert.jdbc.depot.Log.log;
 public class PersistenceContext
 {
     /** Allow toggling of query logging and other debug output via a system property. */
-    public static final boolean DEBUG = Boolean.getBoolean("com.samskivert.jdbc.depot.debug");
+    public static final boolean DEBUG = Boolean.getBoolean("com.samskivert.depot.debug");
 
     /** Map {@link TableGenerator} instances by name. */
     public HashMap<String, TableGenerator> tableGenerators = new HashMap<String, TableGenerator>();

src/java/com/samskivert/depot/PersistentRecord.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.io.Serializable;
 

src/java/com/samskivert/depot/PostgreSQLBuilder.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Blob;
 import java.sql.Clob;
@@ -34,20 +34,20 @@ import java.util.Set;
 import com.samskivert.jdbc.DatabaseLiaison;
 import com.samskivert.jdbc.JDBCUtil;
 import com.samskivert.jdbc.LiaisonRegistry;
-import com.samskivert.jdbc.depot.FieldMarshaller.BooleanMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.ByteArrayMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.ByteEnumMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.ByteMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.DoubleMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.FloatMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.IntArrayMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.IntMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.LongMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.ObjectMarshaller;
-import com.samskivert.jdbc.depot.FieldMarshaller.ShortMarshaller;
-import com.samskivert.jdbc.depot.annotation.FullTextIndex;
-import com.samskivert.jdbc.depot.expression.EpochSeconds;
-import com.samskivert.jdbc.depot.operator.Conditionals.FullTextMatch;
+import com.samskivert.depot.FieldMarshaller.BooleanMarshaller;
+import com.samskivert.depot.FieldMarshaller.ByteArrayMarshaller;
+import com.samskivert.depot.FieldMarshaller.ByteEnumMarshaller;
+import com.samskivert.depot.FieldMarshaller.ByteMarshaller;
+import com.samskivert.depot.FieldMarshaller.DoubleMarshaller;
+import com.samskivert.depot.FieldMarshaller.FloatMarshaller;
+import com.samskivert.depot.FieldMarshaller.IntArrayMarshaller;
+import com.samskivert.depot.FieldMarshaller.IntMarshaller;
+import com.samskivert.depot.FieldMarshaller.LongMarshaller;
+import com.samskivert.depot.FieldMarshaller.ObjectMarshaller;
+import com.samskivert.depot.FieldMarshaller.ShortMarshaller;
+import com.samskivert.depot.annotation.FullTextIndex;
+import com.samskivert.depot.expression.EpochSeconds;
+import com.samskivert.depot.operator.Conditionals.FullTextMatch;
 import com.samskivert.util.ArrayUtil;
 import com.samskivert.util.StringUtil;
 

src/java/com/samskivert/depot/Query.java

@@ -18,13 +18,13 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 
 import com.samskivert.jdbc.DatabaseLiaison;
-import com.samskivert.jdbc.depot.PersistenceContext.CacheListener;
+import com.samskivert.depot.PersistenceContext.CacheListener;
 
 /**
  * The base of all read-only queries.

src/java/com/samskivert/depot/SQLBuilder.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.lang.reflect.Field;
 import java.util.Set;
@@ -28,13 +28,13 @@ import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
 import com.samskivert.jdbc.ColumnDefinition;
-import com.samskivert.jdbc.depot.annotation.Column;
-import com.samskivert.jdbc.depot.annotation.FullTextIndex;
-import com.samskivert.jdbc.depot.annotation.GeneratedValue;
-import com.samskivert.jdbc.depot.clause.QueryClause;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.annotation.Column;
+import com.samskivert.depot.annotation.FullTextIndex;
+import com.samskivert.depot.annotation.GeneratedValue;
+import com.samskivert.depot.clause.QueryClause;
+import com.samskivert.depot.expression.ExpressionVisitor;
 
-import static com.samskivert.jdbc.depot.Log.log;
+import static com.samskivert.depot.Log.log;
 
 /**
  * At the heart of Depot's SQL generation, this object constructs two {@link ExpressionVisitor}

src/java/com/samskivert/depot/SchemaMigration.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -26,9 +26,9 @@ import java.util.Map;
 
 import com.samskivert.jdbc.ColumnDefinition;
 import com.samskivert.jdbc.DatabaseLiaison;
-import com.samskivert.jdbc.depot.annotation.Column;
+import com.samskivert.depot.annotation.Column;
 
-import static com.samskivert.jdbc.depot.Log.log;
+import static com.samskivert.depot.Log.log;
 
 /**
  * Encapsulates the migration of a persistent record's database schema. These can be registered

src/java/com/samskivert/depot/SimpleCacheKey.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.io.Serializable;
 

src/java/com/samskivert/depot/TableValueGenerator.java

@@ -18,15 +18,15 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import com.samskivert.jdbc.depot.annotation.GeneratedValue;
-import com.samskivert.jdbc.depot.annotation.TableGenerator;
+import com.samskivert.depot.annotation.GeneratedValue;
+import com.samskivert.depot.annotation.TableGenerator;
 
 import com.samskivert.jdbc.ColumnDefinition;
 import com.samskivert.jdbc.DatabaseLiaison;

src/java/com/samskivert/depot/ValidatingCacheInvalidator.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 /**
  * An augmented cache invalidator interface for invalidators that can ensure that they are

src/java/com/samskivert/depot/ValueGenerator.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -27,9 +27,9 @@ import java.sql.Statement;
 
 import com.samskivert.jdbc.DatabaseLiaison;
 import com.samskivert.jdbc.JDBCUtil;
-import com.samskivert.jdbc.depot.annotation.GeneratedValue;
+import com.samskivert.depot.annotation.GeneratedValue;
 
-import static com.samskivert.jdbc.depot.Log.log;
+import static com.samskivert.depot.Log.log;
 
 /**
  * Defines the interface to our value generators.

src/java/com/samskivert/depot/WhereClause.java

@@ -18,10 +18,10 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot;
+package com.samskivert.depot;
 
-import com.samskivert.jdbc.depot.clause.QueryClause;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.clause.QueryClause;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  * Currently only exists as a type without any functionality of its own.

src/java/com/samskivert/depot/annotation/Column.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/java/com/samskivert/depot/annotation/Computed.java

@@ -18,17 +18,17 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.clause.FieldOverride;
-import com.samskivert.jdbc.depot.clause.FromOverride;
-import com.samskivert.jdbc.depot.clause.Join;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.clause.FieldOverride;
+import com.samskivert.depot.clause.FromOverride;
+import com.samskivert.depot.clause.Join;
 
 /**
  * Marks a field as computed, meaning it is ignored for schema purposes and it does not directly

src/java/com/samskivert/depot/annotation/Entity.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/java/com/samskivert/depot/annotation/FullTextIndex.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

src/java/com/samskivert/depot/annotation/GeneratedValue.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/java/com/samskivert/depot/annotation/GenerationType.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 /**
  * Defines the types of primary key generation.

src/java/com/samskivert/depot/annotation/Id.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/java/com/samskivert/depot/annotation/Index.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

src/java/com/samskivert/depot/annotation/TableGenerator.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/java/com/samskivert/depot/annotation/Transient.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/java/com/samskivert/depot/annotation/UniqueConstraint.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.annotation;
+package com.samskivert.depot.annotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

src/java/com/samskivert/depot/clause/DeleteClause.java

@@ -18,13 +18,13 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.WhereClause;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.WhereClause;
+import com.samskivert.depot.expression.ExpressionVisitor;
 
 /**
  * Builds actual SQL given a main persistent type and some {@link QueryClause} objects.

src/java/com/samskivert/depot/clause/FieldDefinition.java

@@ -18,15 +18,15 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.LiteralExp;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ColumnExp;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.LiteralExp;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  * Supplies a definition for a computed field of the persistent object we're creating.

src/java/com/samskivert/depot/clause/FieldOverride.java

@@ -18,12 +18,12 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
-import com.samskivert.jdbc.depot.expression.LiteralExp;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ColumnExp;
+import com.samskivert.depot.expression.LiteralExp;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  * Redirects one field of the persistent object we're creating from its default associated column

src/java/com/samskivert/depot/clause/ForUpdate.java

@@ -18,12 +18,12 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ExpressionVisitor;
 
 /**
  *  Represents a FOR UPDATE clause.

src/java/com/samskivert/depot/clause/FromOverride.java

@@ -18,14 +18,14 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ExpressionVisitor;
 
 /**
  *  Completely overrides the FROM clause, if it exists.

src/java/com/samskivert/depot/clause/GroupBy.java

@@ -18,13 +18,13 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  *  Represents a GROUP BY clause.

src/java/com/samskivert/depot/clause/InsertClause.java

@@ -18,13 +18,13 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.Collection;
 import java.util.Set;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ExpressionVisitor;
 
 /**
  * Builds actual SQL given a main persistent type and some {@link QueryClause} objects.

src/java/com/samskivert/depot/clause/Join.java

@@ -18,15 +18,15 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
-import com.samskivert.jdbc.depot.operator.Conditionals.Equals;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ColumnExp;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.SQLExpression;
+import com.samskivert.depot.operator.Conditionals.Equals;
 
 /**
  *  Represents a JOIN.

src/java/com/samskivert/depot/clause/Limit.java

@@ -18,12 +18,12 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ExpressionVisitor;
 
 /**
  *  Represents a LIMIT/OFFSET clause, for pagination.

src/java/com/samskivert/depot/clause/OrderBy.java

@@ -18,14 +18,14 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.LiteralExp;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.LiteralExp;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  *  Represents an ORDER BY clause.

src/java/com/samskivert/depot/clause/QueryClause.java

@@ -18,9 +18,9 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  * Represents a piece or modifier of an SQL query.

src/java/com/samskivert/depot/clause/SelectClause.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,9 +27,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.WhereClause;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.WhereClause;
+import com.samskivert.depot.expression.ExpressionVisitor;
 
 /**
  * Builds actual SQL given a main persistent type and some {@link QueryClause} objects.

src/java/com/samskivert/depot/clause/UpdateClause.java

@@ -18,14 +18,14 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.WhereClause;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.WhereClause;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  * Builds actual SQL given a main persistent type and some {@link QueryClause} objects.

src/java/com/samskivert/depot/clause/Where.java

@@ -18,19 +18,19 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.clause;
+package com.samskivert.depot.clause;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.WhereClause;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
-import com.samskivert.jdbc.depot.expression.ValueExp;
-import com.samskivert.jdbc.depot.operator.Conditionals.Equals;
-import com.samskivert.jdbc.depot.operator.Conditionals.IsNull;
-import com.samskivert.jdbc.depot.operator.Logic.And;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.WhereClause;
+import com.samskivert.depot.expression.ColumnExp;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.SQLExpression;
+import com.samskivert.depot.expression.ValueExp;
+import com.samskivert.depot.operator.Conditionals.Equals;
+import com.samskivert.depot.operator.Conditionals.IsNull;
+import com.samskivert.depot.operator.Logic.And;
 
 /**
  * Represents a where clause: the condition can be any comparison operator or logical combination

src/java/com/samskivert/depot/expression/ColumnExp.java

@@ -18,11 +18,11 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.expression;
+package com.samskivert.depot.expression;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
+import com.samskivert.depot.PersistentRecord;
 
 /**
  * An expression that unambiguously identifies a field of a class, e.g. GameRecord.itemId.

src/java/com/samskivert/depot/expression/EpochSeconds.java

@@ -18,11 +18,11 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.expression;
+package com.samskivert.depot.expression;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
+import com.samskivert.depot.PersistentRecord;
 
 /**
  * An expression for extracting the seconds since the epoch from a date expression.

src/java/com/samskivert/depot/expression/ExpressionVisitor.java

@@ -18,32 +18,32 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.expression;
+package com.samskivert.depot.expression;
 
-import com.samskivert.jdbc.depot.Key;
-import com.samskivert.jdbc.depot.MultiKey;
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.WhereClause;
+import com.samskivert.depot.Key;
+import com.samskivert.depot.MultiKey;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.WhereClause;
 
-import com.samskivert.jdbc.depot.clause.DeleteClause;
-import com.samskivert.jdbc.depot.clause.FieldDefinition;
-import com.samskivert.jdbc.depot.clause.ForUpdate;
-import com.samskivert.jdbc.depot.clause.FromOverride;
-import com.samskivert.jdbc.depot.clause.GroupBy;
-import com.samskivert.jdbc.depot.clause.InsertClause;
-import com.samskivert.jdbc.depot.clause.Join;
-import com.samskivert.jdbc.depot.clause.Limit;
-import com.samskivert.jdbc.depot.clause.OrderBy;
-import com.samskivert.jdbc.depot.clause.SelectClause;
-import com.samskivert.jdbc.depot.clause.UpdateClause;
+import com.samskivert.depot.clause.DeleteClause;
+import com.samskivert.depot.clause.FieldDefinition;
+import com.samskivert.depot.clause.ForUpdate;
+import com.samskivert.depot.clause.FromOverride;
+import com.samskivert.depot.clause.GroupBy;
+import com.samskivert.depot.clause.InsertClause;
+import com.samskivert.depot.clause.Join;
+import com.samskivert.depot.clause.Limit;
+import com.samskivert.depot.clause.OrderBy;
+import com.samskivert.depot.clause.SelectClause;
+import com.samskivert.depot.clause.UpdateClause;
 
-import com.samskivert.jdbc.depot.operator.Conditionals.Exists;
-import com.samskivert.jdbc.depot.operator.Conditionals.In;
-import com.samskivert.jdbc.depot.operator.Conditionals.IsNull;
-import com.samskivert.jdbc.depot.operator.Conditionals.FullTextMatch;
-import com.samskivert.jdbc.depot.operator.Logic.Not;
-import com.samskivert.jdbc.depot.operator.SQLOperator.BinaryOperator;
-import com.samskivert.jdbc.depot.operator.SQLOperator.MultiOperator;
+import com.samskivert.depot.operator.Conditionals.Exists;
+import com.samskivert.depot.operator.Conditionals.In;
+import com.samskivert.depot.operator.Conditionals.IsNull;
+import com.samskivert.depot.operator.Conditionals.FullTextMatch;
+import com.samskivert.depot.operator.Logic.Not;
+import com.samskivert.depot.operator.SQLOperator.BinaryOperator;
+import com.samskivert.depot.operator.SQLOperator.MultiOperator;
 
 /**
  * Enumerates visitation methods for every possible SQL expression type.

src/java/com/samskivert/depot/expression/FunctionExp.java

@@ -18,11 +18,11 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.expression;
+package com.samskivert.depot.expression;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
+import com.samskivert.depot.PersistentRecord;
 
 /**
  * An expression for a function, e.g. FLOOR(blah).

src/java/com/samskivert/depot/expression/LiteralExp.java

@@ -18,11 +18,11 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.expression;
+package com.samskivert.depot.expression;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
+import com.samskivert.depot.PersistentRecord;
 
 /**
  * An expression for things we don't support natively, e.g. COUNT(*).

src/java/com/samskivert/depot/expression/SQLExpression.java

@@ -18,12 +18,12 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.expression;
+package com.samskivert.depot.expression;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.SQLBuilder;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.SQLBuilder;
 
 /**
  * Represents an SQL expression, e.g. column name, function, or constant.

src/java/com/samskivert/depot/expression/ValueExp.java

@@ -18,11 +18,11 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.expression;
+package com.samskivert.depot.expression;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
+import com.samskivert.depot.PersistentRecord;
 
 /**
  * A Java value that is bound as a parameter to the query, e.g. 1 or 'abc'.

src/java/com/samskivert/depot/operator/Arithmetic.java

@@ -18,10 +18,10 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.operator;
+package com.samskivert.depot.operator;
 
-import com.samskivert.jdbc.depot.expression.SQLExpression;
-import com.samskivert.jdbc.depot.operator.SQLOperator.BinaryOperator;
+import com.samskivert.depot.expression.SQLExpression;
+import com.samskivert.depot.operator.SQLOperator.BinaryOperator;
 
 /**
  * A convenient container for implementations of arithmetic operators. Classes that value brevity

src/java/com/samskivert/depot/operator/Conditionals.java

@@ -18,15 +18,15 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.operator;
+package com.samskivert.depot.operator;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.clause.SelectClause;
-import com.samskivert.jdbc.depot.expression.ColumnExp;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.clause.SelectClause;
+import com.samskivert.depot.expression.ColumnExp;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  * A convenient container for implementations of conditional operators.  Classes that value brevity

src/java/com/samskivert/depot/operator/Logic.java

@@ -18,13 +18,13 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.operator;
+package com.samskivert.depot.operator;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.SQLExpression;
 
 /**
  * A convenient container for implementations of logical operators.  Classes that value brevity

src/java/com/samskivert/depot/operator/SQLOperator.java

@@ -18,14 +18,14 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.operator;
+package com.samskivert.depot.operator;
 
 import java.util.Collection;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.expression.ExpressionVisitor;
-import com.samskivert.jdbc.depot.expression.SQLExpression;
-import com.samskivert.jdbc.depot.expression.ValueExp;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.expression.ExpressionVisitor;
+import com.samskivert.depot.expression.SQLExpression;
+import com.samskivert.depot.expression.ValueExp;
 
 /**
  * A common interface for operator hierarchies in SQL. The main purpose of breaking this out from

src/java/com/samskivert/depot/tools/GenRecordTask.java

@@ -18,7 +18,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-package com.samskivert.jdbc.depot.tools;
+package com.samskivert.depot.tools;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -49,9 +49,9 @@ import org.apache.tools.ant.util.ClasspathUtils;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 
-import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.jdbc.depot.annotation.Id;
-import com.samskivert.jdbc.depot.annotation.Transient;
+import com.samskivert.depot.PersistentRecord;
+import com.samskivert.depot.annotation.Id;
+import com.samskivert.depot.annotation.Transient;
 import com.samskivert.util.ClassUtil;
 import com.samskivert.util.GenUtil;
 import com.samskivert.util.StringUtil;
@@ -469,13 +469,13 @@ public class GenRecordTask extends Task
     protected Class<?> _prclass;
 
     /** Specifies the path to the name code template. */
-    protected static final String NAME_TMPL = "com/samskivert/jdbc/depot/tools/record_name.tmpl";
+    protected static final String NAME_TMPL = "com/samskivert.depot/tools/record_name.tmpl";
 
     /** Specifies the path to the column code template. */
-    protected static final String COL_TMPL = "com/samskivert/jdbc/depot/tools/record_column.tmpl";
+    protected static final String COL_TMPL = "com/samskivert.depot/tools/record_column.tmpl";
 
     /** Specifies the path to the key code template. */
-    protected static final String KEY_TMPL = "com/samskivert/jdbc/depot/tools/record_key.tmpl";
+    protected static final String KEY_TMPL = "com/samskivert.depot/tools/record_key.tmpl";
 
     // markers
     protected static final String MARKER = "// AUTO-GENERATED: ";