From 28f9439b5f94c44a58c4bafa823de70a60accbb6 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@samskivert.com>
Date: Fri, 27 Aug 2010 17:49:18 +0000
Subject: [PATCH] More layout standardizing.

---
 build-ivy.xml                                 | 190 ++++++++++++++++++
 build.xml                                     |   5 +-
 ivy.xml                                       |  21 ++
 .../com/samskivert/depot/CacheAdapter.java    |   0
 .../samskivert/depot/CacheInvalidator.java    |   0
 .../java/com/samskivert/depot/CacheKey.java   |   0
 .../com/samskivert/depot/CountRecord.java     |   0
 .../com/samskivert/depot/DataMigration.java   |   0
 .../samskivert/depot/DatabaseException.java   |   0
 .../java/com/samskivert/depot/DateFuncs.java  |   0
 .../com/samskivert/depot/DepotRepository.java |   0
 .../depot/DuplicateKeyException.java          |   0
 .../com/samskivert/depot/EHCacheAdapter.java  |   0
 .../java/com/samskivert/depot/Exps.java       |   0
 .../java/com/samskivert/depot/Funcs.java      |   0
 .../java/com/samskivert/depot/Key.java        |   0
 .../java/com/samskivert/depot/KeySet.java     |   0
 .../java/com/samskivert/depot/Log.java        |   0
 .../java/com/samskivert/depot/MathFuncs.java  |   0
 .../com/samskivert/depot/MultiKeySet.java     |   0
 .../java/com/samskivert/depot/Ops.java        |   0
 .../samskivert/depot/PersistenceContext.java  |   0
 .../samskivert/depot/PersistentRecord.java    |   0
 .../com/samskivert/depot/SQLFragment.java     |   0
 .../com/samskivert/depot/SchemaMigration.java |   0
 .../java/com/samskivert/depot/Stats.java      |   0
 .../com/samskivert/depot/StringFuncs.java     |   0
 .../com/samskivert/depot/Transformer.java     |   0
 .../com/samskivert/depot/Transformers.java    |   0
 .../depot/ValidatingCacheInvalidator.java     |   0
 .../samskivert/depot/annotation/Column.java   |   0
 .../samskivert/depot/annotation/Computed.java |   0
 .../samskivert/depot/annotation/Entity.java   |   0
 .../depot/annotation/FullTextIndex.java       |   0
 .../depot/annotation/GeneratedValue.java      |   0
 .../depot/annotation/GenerationType.java      |   0
 .../com/samskivert/depot/annotation/Id.java   |   0
 .../samskivert/depot/annotation/Index.java    |   0
 .../depot/annotation/TableGenerator.java      |   0
 .../depot/annotation/Transform.java           |   0
 .../depot/annotation/Transient.java           |   0
 .../depot/annotation/UniqueConstraint.java    |   0
 .../depot/annotation/package-info.java        |   0
 .../depot/clause/FieldDefinition.java         |   0
 .../depot/clause/FieldOverride.java           |   0
 .../samskivert/depot/clause/ForUpdate.java    |   0
 .../samskivert/depot/clause/FromOverride.java |   0
 .../com/samskivert/depot/clause/GroupBy.java  |   0
 .../samskivert/depot/clause/InsertClause.java |   0
 .../com/samskivert/depot/clause/Join.java     |   0
 .../com/samskivert/depot/clause/Limit.java    |   0
 .../com/samskivert/depot/clause/OrderBy.java  |   0
 .../samskivert/depot/clause/QueryClause.java  |   0
 .../samskivert/depot/clause/SelectClause.java |   0
 .../com/samskivert/depot/clause/Where.java    |   0
 .../samskivert/depot/clause/WhereClause.java  |   0
 .../samskivert/depot/clause/package-info.java |   0
 .../depot/expression/ColumnExp.java           |   0
 .../depot/expression/FluentExp.java           |   0
 .../depot/expression/SQLExpression.java       |   0
 .../depot/expression/package-info.java        |   0
 .../samskivert/depot/impl/BuildVisitor.java   |   0
 .../depot/impl/DepotMarshaller.java           |   0
 .../samskivert/depot/impl/DepotMetaData.java  |   0
 .../impl/DepotMigrationHistoryRecord.java     |   0
 .../com/samskivert/depot/impl/DepotTypes.java |   0
 .../com/samskivert/depot/impl/DepotUtil.java  |   0
 .../depot/impl/ExpressionEvaluator.java       |   0
 .../depot/impl/FieldMarshaller.java           |   0
 .../depot/impl/FindAllKeysQuery.java          |   0
 .../samskivert/depot/impl/FindAllQuery.java   |   0
 .../samskivert/depot/impl/FindOneQuery.java   |   0
 .../depot/impl/FragmentVisitor.java           |   0
 .../samskivert/depot/impl/HSQLBuilder.java    |   0
 .../depot/impl/IdentityValueGenerator.java    |   0
 .../samskivert/depot/impl/KeyCacheKey.java    |   0
 .../com/samskivert/depot/impl/Modifier.java   |   0
 .../samskivert/depot/impl/MySQLBuilder.java   |   0
 .../com/samskivert/depot/impl/Operation.java  |   0
 .../depot/impl/PostgreSQL4Builder.java        |   0
 .../depot/impl/PostgreSQLBuilder.java         |   0
 .../java/com/samskivert/depot/impl/Query.java |   0
 .../com/samskivert/depot/impl/SQLBuilder.java |   0
 .../samskivert/depot/impl/SimpleCacheKey.java |   0
 .../depot/impl/TableValueGenerator.java       |   0
 .../samskivert/depot/impl/ValueGenerator.java |   0
 .../depot/impl/clause/CreateIndexClause.java  |   0
 .../depot/impl/clause/DeleteClause.java       |   0
 .../depot/impl/clause/DropIndexClause.java    |   0
 .../depot/impl/clause/UpdateClause.java       |   0
 .../depot/impl/expression/AggregateFun.java   |   0
 .../depot/impl/expression/ArgumentExp.java    |   0
 .../depot/impl/expression/ConditionalFun.java |   0
 .../depot/impl/expression/DateFun.java        |   0
 .../depot/impl/expression/Function.java       |   0
 .../depot/impl/expression/IntervalExp.java    |   0
 .../depot/impl/expression/LiteralExp.java     |   0
 .../depot/impl/expression/NumericalFun.java   |   0
 .../depot/impl/expression/StringFun.java      |   0
 .../depot/impl/expression/ValueExp.java       |   0
 .../samskivert/depot/impl/operator/Add.java   |   0
 .../depot/impl/operator/Arithmetic.java       |   0
 .../depot/impl/operator/BaseOperator.java     |   0
 .../depot/impl/operator/BinaryOperator.java   |   0
 .../depot/impl/operator/BitAnd.java           |   0
 .../samskivert/depot/impl/operator/BitOr.java |   0
 .../samskivert/depot/impl/operator/Div.java   |   0
 .../depot/impl/operator/Equals.java           |   0
 .../depot/impl/operator/Exists.java           |   0
 .../depot/impl/operator/GreaterThan.java      |   0
 .../impl/operator/GreaterThanEquals.java      |   0
 .../samskivert/depot/impl/operator/In.java    |   0
 .../depot/impl/operator/IsNull.java           |   0
 .../depot/impl/operator/LessThan.java         |   0
 .../depot/impl/operator/LessThanEquals.java   |   0
 .../samskivert/depot/impl/operator/Like.java  |   0
 .../samskivert/depot/impl/operator/Mul.java   |   0
 .../depot/impl/operator/MultiOperator.java    |   0
 .../samskivert/depot/impl/operator/Not.java   |   0
 .../depot/impl/operator/NotEquals.java        |   0
 .../samskivert/depot/impl/operator/Sub.java   |   0
 .../samskivert/depot/impl/util/SeqImpl.java   |   0
 .../com/samskivert/depot/operator/Case.java   |   0
 .../samskivert/depot/operator/FullText.java   |   0
 .../depot/operator/package-info.java          |   0
 .../java/com/samskivert/depot/overview.html   |   0
 .../com/samskivert/depot/package-info.java    |   0
 .../samskivert/depot/tools/GenRecordTask.java |   0
 .../samskivert/depot/tools/package-info.java  |   0
 .../samskivert/depot/tools/record_column.tmpl |   0
 .../samskivert/depot/tools/record_key.tmpl    |   0
 .../samskivert/depot/tools/record_proto.tmpl  |   0
 .../samskivert/depot/util/RuntimeUtil.java    |   0
 .../com/samskivert/depot/util/Sequence.java   |   0
 .../samskivert/depot/util/package-info.java   |   0
 135 files changed, 214 insertions(+), 2 deletions(-)
 create mode 100644 build-ivy.xml
 create mode 100644 ivy.xml
 rename src/{ => main}/java/com/samskivert/depot/CacheAdapter.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/CacheInvalidator.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/CacheKey.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/CountRecord.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/DataMigration.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/DatabaseException.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/DateFuncs.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/DepotRepository.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/DuplicateKeyException.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/EHCacheAdapter.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/Exps.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/Funcs.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/Key.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/KeySet.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/Log.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/MathFuncs.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/MultiKeySet.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/Ops.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/PersistenceContext.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/PersistentRecord.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/SQLFragment.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/SchemaMigration.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/Stats.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/StringFuncs.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/Transformer.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/Transformers.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/ValidatingCacheInvalidator.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/annotation/Column.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/annotation/Computed.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/annotation/Entity.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/annotation/FullTextIndex.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/annotation/GeneratedValue.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/annotation/GenerationType.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/annotation/Id.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/annotation/Index.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/annotation/TableGenerator.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/annotation/Transform.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/annotation/Transient.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/annotation/UniqueConstraint.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/annotation/package-info.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/clause/FieldDefinition.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/clause/FieldOverride.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/clause/ForUpdate.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/clause/FromOverride.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/clause/GroupBy.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/clause/InsertClause.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/clause/Join.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/clause/Limit.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/clause/OrderBy.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/clause/QueryClause.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/clause/SelectClause.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/clause/Where.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/clause/WhereClause.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/clause/package-info.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/expression/ColumnExp.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/expression/FluentExp.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/expression/SQLExpression.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/expression/package-info.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/BuildVisitor.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/DepotMarshaller.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/DepotMetaData.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/DepotMigrationHistoryRecord.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/DepotTypes.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/DepotUtil.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/ExpressionEvaluator.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/FieldMarshaller.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/FindAllKeysQuery.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/FindAllQuery.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/FindOneQuery.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/FragmentVisitor.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/HSQLBuilder.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/IdentityValueGenerator.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/KeyCacheKey.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/Modifier.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/MySQLBuilder.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/Operation.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/PostgreSQL4Builder.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/PostgreSQLBuilder.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/Query.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/SQLBuilder.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/SimpleCacheKey.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/TableValueGenerator.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/ValueGenerator.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/clause/CreateIndexClause.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/clause/DeleteClause.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/clause/DropIndexClause.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/clause/UpdateClause.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/expression/AggregateFun.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/expression/ArgumentExp.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/expression/ConditionalFun.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/expression/DateFun.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/expression/Function.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/expression/IntervalExp.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/expression/LiteralExp.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/expression/NumericalFun.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/expression/StringFun.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/expression/ValueExp.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/Add.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/Arithmetic.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/BaseOperator.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/BinaryOperator.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/BitAnd.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/BitOr.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/Div.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/Equals.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/Exists.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/GreaterThan.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/GreaterThanEquals.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/In.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/IsNull.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/LessThan.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/LessThanEquals.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/Like.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/Mul.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/MultiOperator.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/Not.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/NotEquals.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/operator/Sub.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/impl/util/SeqImpl.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/operator/Case.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/operator/FullText.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/operator/package-info.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/overview.html (100%)
 rename src/{ => main}/java/com/samskivert/depot/package-info.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/tools/GenRecordTask.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/tools/package-info.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/tools/record_column.tmpl (100%)
 rename src/{ => main}/java/com/samskivert/depot/tools/record_key.tmpl (100%)
 rename src/{ => main}/java/com/samskivert/depot/tools/record_proto.tmpl (100%)
 rename src/{ => main}/java/com/samskivert/depot/util/RuntimeUtil.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/util/Sequence.java (100%)
 rename src/{ => main}/java/com/samskivert/depot/util/package-info.java (100%)

diff --git a/build-ivy.xml b/build-ivy.xml
new file mode 100644
index 0000000..681197f
--- /dev/null
+++ b/build-ivy.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0"?>
+<project xmlns:ivy="antlib:org.apache.ivy.ant" name="depot" default="compile" basedir=".">
+  <!-- project metadata -->
+  <property name="lib.name"         value="depot"/>
+  <property name="doc.packages"     value="com.samskivert.depot.*"/>
+  <property name="doc.overview"     value="com/samskivert/depot/overview.html"/>
+  <property name="copyright.holder" value="Michael Bayne"/>
+
+  <!-- various directories used when building things -->
+  <property name="src.dir"     value="src/java"/>
+  <property name="test.dir"    value="src/test/java"/>
+  <property name="deploy.dir"  value="dist"/>
+  <property name="classes.dir" value="${deploy.dir}/classes"/>
+  <property name="tclasses.dir" value="${deploy.dir}/test-classes"/>
+  <property name="javadoc.dir" value="${deploy.dir}/docs"/>
+
+  <!-- downloads ivy if necessary and sets everything up -->
+  <property name="ivy.vers" value="2.1.0-rc2" />
+  <property name="ivy.jar.dir" value="${user.home}/.ant/lib" />
+  <condition property="ivy.exists"><available file="${ivy.jar.dir}/ivy.jar"/></condition>
+  <target name="-download-ivy" unless="ivy.exists">
+    <mkdir dir="${ivy.jar.dir}"/>
+    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.vers}/ivy-${ivy.vers}.jar" 
+         dest="${ivy.jar.dir}/ivy.jar" usetimestamp="true"/>
+  </target>
+  <target name="-init-ivy" depends="-download-ivy">
+    <path id="ivy.lib.path"><fileset dir="${ivy.jar.dir}" includes="*.jar"/></path>
+    <taskdef resource="org/apache/ivy/ant/antlib.xml"
+             uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+    <ivy:cachepath pathid="compile.classpath" conf="runtime" log="download-only"/>
+    <ivy:cachepath pathid="tools.classpath" conf="tools" log="download-only"/>
+    <ivy:cachepath pathid="test.classpath" conf="test" log="download-only"/>
+  </target>
+
+  <!-- prepares the application directories -->
+  <target name="-prepare" depends="-init-ivy">
+    <tstamp><format property="year" pattern="yyyy" /></tstamp>
+    <mkdir dir="${deploy.dir}"/>
+    <mkdir dir="${deploy.dir}/lib"/>
+    <mkdir dir="${classes.dir}"/>
+    <mkdir dir="${tclasses.dir}"/>
+    <mkdir dir="${javadoc.dir}"/>
+    <copy todir="${classes.dir}">
+      <fileset dir="${src.dir}" includes="**/*.tmpl"/>
+    </copy>
+  </target>
+
+  <target name="check-ivy" depends="-init-ivy" description="Computes and prints Ivy classpath.">
+    <property refid="compile.classpath" name="compile.str"/>
+    <echo>Compile: ${compile.str}</echo>
+    <property refid="test.classpath" name="test.str"/>
+    <echo>Test: ${test.str}</echo>
+  </target>
+
+  <target name="clean" description="Cleans out build results.">
+    <delete dir="${classes.dir}"/>
+    <delete dir="${deploy.dir}/docs"/>
+    <delete failonerror="false"><fileset dir="${deploy.dir}" includes="*.jar"/></delete>
+  </target>
+
+  <target name="distclean" description="Completely removes build result directory.">
+    <delete dir="${deploy.dir}"/>
+  </target>
+
+  <target name="compile" depends="-prepare" description="Compiles main code.">
+    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
+           debug="on" optimize="${build.optimize}" source="1.5" target="1.5" encoding="utf-8">
+      <classpath refid="compile.classpath"/>
+      <exclude name="com/samskivert/depot/tools/**"/>
+      <compilerarg value="-Xlint"/>
+      <compilerarg value="-Xlint:-serial"/>
+    </javac>
+  </target>
+
+  <target name="tools-compile" depends="compile" description="Compiles tool code.">
+    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
+           debug="on" optimize="${build.optimize}" source="1.5" target="1.5" encoding="utf-8">
+      <classpath refid="tools.classpath"/>
+      <include name="com/samskivert/depot/tools/**"/>
+      <compilerarg value="-Xlint"/>
+      <compilerarg value="-Xlint:-serial"/>
+    </javac>
+  </target>
+
+  <target name="test-compile" depends="compile" description="Compiles test classes.">
+    <javac srcdir="${test.dir}" destdir="${tclasses.dir}" includeAntRuntime="false"
+           debug="on" optimize="${build.optimize}" source="1.5" target="1.5" encoding="utf-8">
+      <classpath>
+        <pathelement location="${classes.dir}"/>
+        <path refid="test.classpath"/>
+      </classpath>
+      <compilerarg value="-Xlint"/>
+      <compilerarg value="-Xlint:-serial"/>
+    </javac>
+  </target>
+
+  <target name="genrecord" depends="-prepare"
+          description="Regenerates persistent record boilerplate.">
+    <taskdef name="grecord" classname="com.samskivert.depot.tools.GenRecordTask">
+      <classpath>
+        <pathelement location="${classes.dir}"/>
+        <path refid="compile.classpath"/>
+      </classpath>
+    </taskdef>
+    <!-- make sure the record class files are all compiled -->
+    <javac srcdir="src/java" destdir="${classes.dir}"
+           debug="on" optimize="${build.optimize}" deprecation="on">
+      <classpath refid="compile.classpath"/>
+      <include name="**/*Record.java"/>
+    </javac>
+    <!-- now update the source files -->
+    <grecord>
+      <classpath>
+        <pathelement location="${classes.dir}"/>
+        <pathelement location="${tclasses.dir}"/>
+      </classpath>
+      <fileset dir="${src.dir}" includes="**/*Record.java"/>
+      <fileset dir="${test.dir}" includes="**/*Record.java"/>
+    </grecord>
+  </target>
+
+  <target name="javadoc" depends="-prepare" description="Builds javadocs.">
+    <javadoc windowtitle="${lib.name} API" doctitle="${lib.name} API"
+             overview="${src.dir}/${doc.overview}" destdir="${javadoc.dir}"
+             additionalparam="-breakiterator"
+             link="http://samskivert.com/code/samskivert/docs/">
+      <packageset dir="${src.dir}">
+        <exclude name="com/samskivert/depot/impl/**"/>
+        <exclude name="com/samskivert/depot/tests/**"/>
+        <exclude name="com/samskivert/depot/EHCacheAdapter.java" unless="build.ehcache"/>
+        <exclude name="com/samskivert/depot/tools/**" unless="build.tools"/>
+      </packageset>
+      <bottom>Copyright &#169; 2006-${year} ${copyright.holder}. All Rights Reserved.</bottom>
+      <classpath refid="classpath"/>
+      <link href="http://java.sun.com/j2se/1.5/docs/api/"/>
+    </javadoc>
+  </target>
+
+  <target name="all" depends="clean,compile,javadoc,dist"
+          description="Cleans and rebuilds everything including documentation."/>
+
+  <target name="tests" depends="test-compile"
+          description="Runs the unit tests. Use -Dtest=Foo to run FooTest.">
+    <!-- allows passing -Dtest=NamePrefix to restrict to subset of tests -->
+    <property name="test" value=""/>
+    <taskdef name="unit" classpathref="test.classpath"
+      classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
+    <unit printsummary="off" haltonfailure="yes" fork="${junit.fork}">
+      <classpath>
+        <pathelement location="${classes.dir}"/>
+        <pathelement location="${tclasses.dir}"/>
+        <pathelement location="${basedir}"/> <!-- for rsrc/ -->
+        <path refid="test.classpath"/>
+      </classpath>
+      <sysproperty key="com.samskivert.depot.debug" value="${debug}"/>
+      <formatter type="brief" usefile="false"/>
+      <batchtest>
+        <fileset dir="${test.dir}">
+          <include name="**/${test}*Test.java"/>
+        </fileset>
+      </batchtest>
+    </unit>
+  </target>
+
+  <target name="dist" depends="tools-compile" description="Builds our jar file.">
+    <jar destfile="${deploy.dir}/${lib.name}.jar" basedir="${classes.dir}">
+      <exclude name="**/tests/**"/>
+    </jar>
+  </target>
+
+  <target name="snapshot" depends="dist"
+          description="Generates a snapshot zip containing the jar file and its dependencies.">
+    <tstamp><format property="date" pattern="yyyyMMdd" /></tstamp>
+    <mkdir dir="${deploy.dir}/depot-${date}"/>
+    <copy todir="${deploy.dir}/depot-${date}">
+      <fileset dir="${deploy.dir}/lib" includes="*.jar"/>
+      <fileset dir="${deploy.dir}" includes="${lib.name}.jar"/>
+    </copy>
+    <copy file="lib/SNAPSHOT_README" tofile="${deploy.dir}/depot-${date}/README"/>
+    <zip destfile="${deploy.dir}/depot-${date}.zip" basedir="${deploy.dir}">
+      <include name="depot-${date}/**"/>
+    </zip>
+  </target>
+
+  <target name="publish" depends="dist" description="Publishes jar to local repository.">
+    <ivy:publish resolver="local" pubrevision="1.0">
+      <artifacts pattern="${deploy.dir}/[artifact].[ext]" />
+    </ivy:publish>
+  </target>
+</project>
diff --git a/build.xml b/build.xml
index 014eb50..9c2552d 100644
--- a/build.xml
+++ b/build.xml
@@ -7,7 +7,7 @@
   <property name="copyright.holder" value="Michael Bayne"/>
 
   <!-- various directories used when building things -->
-  <property name="src.dir"     value="src/java"/>
+  <property name="src.dir"     value="src/main/java"/>
   <property name="test.dir"     value="src/test/java"/>
   <property name="deploy.dir"  value="dist"/>
   <property name="classes.dir" value="${deploy.dir}/classes"/>
@@ -79,7 +79,8 @@
     </javac>
     <!-- now update the source files -->
     <grecord classpathref="classpath">
-      <fileset dir="src/java" includes="**/*Record.java"/>
+      <fileset dir="${src.dir}" includes="**/*Record.java"/>
+      <fileset dir="${test.dir}" includes="**/*Record.java"/>
     </grecord>
   </target>
 
diff --git a/ivy.xml b/ivy.xml
new file mode 100644
index 0000000..63ca33b
--- /dev/null
+++ b/ivy.xml
@@ -0,0 +1,21 @@
+<ivy-module version="1.0">
+  <info organisation="com.samskivert" module="depot" revision="1.0">
+    <description homepage="http://code.google.com/p/depot"/>
+  </info>
+  <configurations defaultconfmapping="test->master(*);compile->master(*);runtime->master(*);tools->master(*)">
+    <conf name="master" visibility="public"/>
+    <conf name="compile" visibility="public"/>
+    <conf name="runtime" visibility="public" extends="compile"/>
+    <conf name="tools" visibility="public" extends="runtime"/>
+    <conf name="test" visibility="private" extends="runtime"/>
+    <conf name="default" visibility="public" extends="runtime,master"/>
+  </configurations>
+  <dependencies>
+    <dependency org="com.samskivert" name="samskivert" rev="1.0" conf="runtime"/>
+    <dependency org="com.google.guava" name="guava" rev="r05" conf="runtime"/>
+    <dependency org="net.sf.ehcache" name="ehcache" rev="1.6.0" conf="runtime"/>
+    <dependency org="org.hsqldb" name="hsqldb" rev="2.0.0" conf="test"/>
+    <dependency org="junit" name="junit" rev="4.8.1" conf="test"/>
+    <dependency org="org.apache.ant" name="ant" rev="1.7.1" conf="tools"/>
+  </dependencies>
+</ivy-module>
diff --git a/src/java/com/samskivert/depot/CacheAdapter.java b/src/main/java/com/samskivert/depot/CacheAdapter.java
similarity index 100%
rename from src/java/com/samskivert/depot/CacheAdapter.java
rename to src/main/java/com/samskivert/depot/CacheAdapter.java
diff --git a/src/java/com/samskivert/depot/CacheInvalidator.java b/src/main/java/com/samskivert/depot/CacheInvalidator.java
similarity index 100%
rename from src/java/com/samskivert/depot/CacheInvalidator.java
rename to src/main/java/com/samskivert/depot/CacheInvalidator.java
diff --git a/src/java/com/samskivert/depot/CacheKey.java b/src/main/java/com/samskivert/depot/CacheKey.java
similarity index 100%
rename from src/java/com/samskivert/depot/CacheKey.java
rename to src/main/java/com/samskivert/depot/CacheKey.java
diff --git a/src/java/com/samskivert/depot/CountRecord.java b/src/main/java/com/samskivert/depot/CountRecord.java
similarity index 100%
rename from src/java/com/samskivert/depot/CountRecord.java
rename to src/main/java/com/samskivert/depot/CountRecord.java
diff --git a/src/java/com/samskivert/depot/DataMigration.java b/src/main/java/com/samskivert/depot/DataMigration.java
similarity index 100%
rename from src/java/com/samskivert/depot/DataMigration.java
rename to src/main/java/com/samskivert/depot/DataMigration.java
diff --git a/src/java/com/samskivert/depot/DatabaseException.java b/src/main/java/com/samskivert/depot/DatabaseException.java
similarity index 100%
rename from src/java/com/samskivert/depot/DatabaseException.java
rename to src/main/java/com/samskivert/depot/DatabaseException.java
diff --git a/src/java/com/samskivert/depot/DateFuncs.java b/src/main/java/com/samskivert/depot/DateFuncs.java
similarity index 100%
rename from src/java/com/samskivert/depot/DateFuncs.java
rename to src/main/java/com/samskivert/depot/DateFuncs.java
diff --git a/src/java/com/samskivert/depot/DepotRepository.java b/src/main/java/com/samskivert/depot/DepotRepository.java
similarity index 100%
rename from src/java/com/samskivert/depot/DepotRepository.java
rename to src/main/java/com/samskivert/depot/DepotRepository.java
diff --git a/src/java/com/samskivert/depot/DuplicateKeyException.java b/src/main/java/com/samskivert/depot/DuplicateKeyException.java
similarity index 100%
rename from src/java/com/samskivert/depot/DuplicateKeyException.java
rename to src/main/java/com/samskivert/depot/DuplicateKeyException.java
diff --git a/src/java/com/samskivert/depot/EHCacheAdapter.java b/src/main/java/com/samskivert/depot/EHCacheAdapter.java
similarity index 100%
rename from src/java/com/samskivert/depot/EHCacheAdapter.java
rename to src/main/java/com/samskivert/depot/EHCacheAdapter.java
diff --git a/src/java/com/samskivert/depot/Exps.java b/src/main/java/com/samskivert/depot/Exps.java
similarity index 100%
rename from src/java/com/samskivert/depot/Exps.java
rename to src/main/java/com/samskivert/depot/Exps.java
diff --git a/src/java/com/samskivert/depot/Funcs.java b/src/main/java/com/samskivert/depot/Funcs.java
similarity index 100%
rename from src/java/com/samskivert/depot/Funcs.java
rename to src/main/java/com/samskivert/depot/Funcs.java
diff --git a/src/java/com/samskivert/depot/Key.java b/src/main/java/com/samskivert/depot/Key.java
similarity index 100%
rename from src/java/com/samskivert/depot/Key.java
rename to src/main/java/com/samskivert/depot/Key.java
diff --git a/src/java/com/samskivert/depot/KeySet.java b/src/main/java/com/samskivert/depot/KeySet.java
similarity index 100%
rename from src/java/com/samskivert/depot/KeySet.java
rename to src/main/java/com/samskivert/depot/KeySet.java
diff --git a/src/java/com/samskivert/depot/Log.java b/src/main/java/com/samskivert/depot/Log.java
similarity index 100%
rename from src/java/com/samskivert/depot/Log.java
rename to src/main/java/com/samskivert/depot/Log.java
diff --git a/src/java/com/samskivert/depot/MathFuncs.java b/src/main/java/com/samskivert/depot/MathFuncs.java
similarity index 100%
rename from src/java/com/samskivert/depot/MathFuncs.java
rename to src/main/java/com/samskivert/depot/MathFuncs.java
diff --git a/src/java/com/samskivert/depot/MultiKeySet.java b/src/main/java/com/samskivert/depot/MultiKeySet.java
similarity index 100%
rename from src/java/com/samskivert/depot/MultiKeySet.java
rename to src/main/java/com/samskivert/depot/MultiKeySet.java
diff --git a/src/java/com/samskivert/depot/Ops.java b/src/main/java/com/samskivert/depot/Ops.java
similarity index 100%
rename from src/java/com/samskivert/depot/Ops.java
rename to src/main/java/com/samskivert/depot/Ops.java
diff --git a/src/java/com/samskivert/depot/PersistenceContext.java b/src/main/java/com/samskivert/depot/PersistenceContext.java
similarity index 100%
rename from src/java/com/samskivert/depot/PersistenceContext.java
rename to src/main/java/com/samskivert/depot/PersistenceContext.java
diff --git a/src/java/com/samskivert/depot/PersistentRecord.java b/src/main/java/com/samskivert/depot/PersistentRecord.java
similarity index 100%
rename from src/java/com/samskivert/depot/PersistentRecord.java
rename to src/main/java/com/samskivert/depot/PersistentRecord.java
diff --git a/src/java/com/samskivert/depot/SQLFragment.java b/src/main/java/com/samskivert/depot/SQLFragment.java
similarity index 100%
rename from src/java/com/samskivert/depot/SQLFragment.java
rename to src/main/java/com/samskivert/depot/SQLFragment.java
diff --git a/src/java/com/samskivert/depot/SchemaMigration.java b/src/main/java/com/samskivert/depot/SchemaMigration.java
similarity index 100%
rename from src/java/com/samskivert/depot/SchemaMigration.java
rename to src/main/java/com/samskivert/depot/SchemaMigration.java
diff --git a/src/java/com/samskivert/depot/Stats.java b/src/main/java/com/samskivert/depot/Stats.java
similarity index 100%
rename from src/java/com/samskivert/depot/Stats.java
rename to src/main/java/com/samskivert/depot/Stats.java
diff --git a/src/java/com/samskivert/depot/StringFuncs.java b/src/main/java/com/samskivert/depot/StringFuncs.java
similarity index 100%
rename from src/java/com/samskivert/depot/StringFuncs.java
rename to src/main/java/com/samskivert/depot/StringFuncs.java
diff --git a/src/java/com/samskivert/depot/Transformer.java b/src/main/java/com/samskivert/depot/Transformer.java
similarity index 100%
rename from src/java/com/samskivert/depot/Transformer.java
rename to src/main/java/com/samskivert/depot/Transformer.java
diff --git a/src/java/com/samskivert/depot/Transformers.java b/src/main/java/com/samskivert/depot/Transformers.java
similarity index 100%
rename from src/java/com/samskivert/depot/Transformers.java
rename to src/main/java/com/samskivert/depot/Transformers.java
diff --git a/src/java/com/samskivert/depot/ValidatingCacheInvalidator.java b/src/main/java/com/samskivert/depot/ValidatingCacheInvalidator.java
similarity index 100%
rename from src/java/com/samskivert/depot/ValidatingCacheInvalidator.java
rename to src/main/java/com/samskivert/depot/ValidatingCacheInvalidator.java
diff --git a/src/java/com/samskivert/depot/annotation/Column.java b/src/main/java/com/samskivert/depot/annotation/Column.java
similarity index 100%
rename from src/java/com/samskivert/depot/annotation/Column.java
rename to src/main/java/com/samskivert/depot/annotation/Column.java
diff --git a/src/java/com/samskivert/depot/annotation/Computed.java b/src/main/java/com/samskivert/depot/annotation/Computed.java
similarity index 100%
rename from src/java/com/samskivert/depot/annotation/Computed.java
rename to src/main/java/com/samskivert/depot/annotation/Computed.java
diff --git a/src/java/com/samskivert/depot/annotation/Entity.java b/src/main/java/com/samskivert/depot/annotation/Entity.java
similarity index 100%
rename from src/java/com/samskivert/depot/annotation/Entity.java
rename to src/main/java/com/samskivert/depot/annotation/Entity.java
diff --git a/src/java/com/samskivert/depot/annotation/FullTextIndex.java b/src/main/java/com/samskivert/depot/annotation/FullTextIndex.java
similarity index 100%
rename from src/java/com/samskivert/depot/annotation/FullTextIndex.java
rename to src/main/java/com/samskivert/depot/annotation/FullTextIndex.java
diff --git a/src/java/com/samskivert/depot/annotation/GeneratedValue.java b/src/main/java/com/samskivert/depot/annotation/GeneratedValue.java
similarity index 100%
rename from src/java/com/samskivert/depot/annotation/GeneratedValue.java
rename to src/main/java/com/samskivert/depot/annotation/GeneratedValue.java
diff --git a/src/java/com/samskivert/depot/annotation/GenerationType.java b/src/main/java/com/samskivert/depot/annotation/GenerationType.java
similarity index 100%
rename from src/java/com/samskivert/depot/annotation/GenerationType.java
rename to src/main/java/com/samskivert/depot/annotation/GenerationType.java
diff --git a/src/java/com/samskivert/depot/annotation/Id.java b/src/main/java/com/samskivert/depot/annotation/Id.java
similarity index 100%
rename from src/java/com/samskivert/depot/annotation/Id.java
rename to src/main/java/com/samskivert/depot/annotation/Id.java
diff --git a/src/java/com/samskivert/depot/annotation/Index.java b/src/main/java/com/samskivert/depot/annotation/Index.java
similarity index 100%
rename from src/java/com/samskivert/depot/annotation/Index.java
rename to src/main/java/com/samskivert/depot/annotation/Index.java
diff --git a/src/java/com/samskivert/depot/annotation/TableGenerator.java b/src/main/java/com/samskivert/depot/annotation/TableGenerator.java
similarity index 100%
rename from src/java/com/samskivert/depot/annotation/TableGenerator.java
rename to src/main/java/com/samskivert/depot/annotation/TableGenerator.java
diff --git a/src/java/com/samskivert/depot/annotation/Transform.java b/src/main/java/com/samskivert/depot/annotation/Transform.java
similarity index 100%
rename from src/java/com/samskivert/depot/annotation/Transform.java
rename to src/main/java/com/samskivert/depot/annotation/Transform.java
diff --git a/src/java/com/samskivert/depot/annotation/Transient.java b/src/main/java/com/samskivert/depot/annotation/Transient.java
similarity index 100%
rename from src/java/com/samskivert/depot/annotation/Transient.java
rename to src/main/java/com/samskivert/depot/annotation/Transient.java
diff --git a/src/java/com/samskivert/depot/annotation/UniqueConstraint.java b/src/main/java/com/samskivert/depot/annotation/UniqueConstraint.java
similarity index 100%
rename from src/java/com/samskivert/depot/annotation/UniqueConstraint.java
rename to src/main/java/com/samskivert/depot/annotation/UniqueConstraint.java
diff --git a/src/java/com/samskivert/depot/annotation/package-info.java b/src/main/java/com/samskivert/depot/annotation/package-info.java
similarity index 100%
rename from src/java/com/samskivert/depot/annotation/package-info.java
rename to src/main/java/com/samskivert/depot/annotation/package-info.java
diff --git a/src/java/com/samskivert/depot/clause/FieldDefinition.java b/src/main/java/com/samskivert/depot/clause/FieldDefinition.java
similarity index 100%
rename from src/java/com/samskivert/depot/clause/FieldDefinition.java
rename to src/main/java/com/samskivert/depot/clause/FieldDefinition.java
diff --git a/src/java/com/samskivert/depot/clause/FieldOverride.java b/src/main/java/com/samskivert/depot/clause/FieldOverride.java
similarity index 100%
rename from src/java/com/samskivert/depot/clause/FieldOverride.java
rename to src/main/java/com/samskivert/depot/clause/FieldOverride.java
diff --git a/src/java/com/samskivert/depot/clause/ForUpdate.java b/src/main/java/com/samskivert/depot/clause/ForUpdate.java
similarity index 100%
rename from src/java/com/samskivert/depot/clause/ForUpdate.java
rename to src/main/java/com/samskivert/depot/clause/ForUpdate.java
diff --git a/src/java/com/samskivert/depot/clause/FromOverride.java b/src/main/java/com/samskivert/depot/clause/FromOverride.java
similarity index 100%
rename from src/java/com/samskivert/depot/clause/FromOverride.java
rename to src/main/java/com/samskivert/depot/clause/FromOverride.java
diff --git a/src/java/com/samskivert/depot/clause/GroupBy.java b/src/main/java/com/samskivert/depot/clause/GroupBy.java
similarity index 100%
rename from src/java/com/samskivert/depot/clause/GroupBy.java
rename to src/main/java/com/samskivert/depot/clause/GroupBy.java
diff --git a/src/java/com/samskivert/depot/clause/InsertClause.java b/src/main/java/com/samskivert/depot/clause/InsertClause.java
similarity index 100%
rename from src/java/com/samskivert/depot/clause/InsertClause.java
rename to src/main/java/com/samskivert/depot/clause/InsertClause.java
diff --git a/src/java/com/samskivert/depot/clause/Join.java b/src/main/java/com/samskivert/depot/clause/Join.java
similarity index 100%
rename from src/java/com/samskivert/depot/clause/Join.java
rename to src/main/java/com/samskivert/depot/clause/Join.java
diff --git a/src/java/com/samskivert/depot/clause/Limit.java b/src/main/java/com/samskivert/depot/clause/Limit.java
similarity index 100%
rename from src/java/com/samskivert/depot/clause/Limit.java
rename to src/main/java/com/samskivert/depot/clause/Limit.java
diff --git a/src/java/com/samskivert/depot/clause/OrderBy.java b/src/main/java/com/samskivert/depot/clause/OrderBy.java
similarity index 100%
rename from src/java/com/samskivert/depot/clause/OrderBy.java
rename to src/main/java/com/samskivert/depot/clause/OrderBy.java
diff --git a/src/java/com/samskivert/depot/clause/QueryClause.java b/src/main/java/com/samskivert/depot/clause/QueryClause.java
similarity index 100%
rename from src/java/com/samskivert/depot/clause/QueryClause.java
rename to src/main/java/com/samskivert/depot/clause/QueryClause.java
diff --git a/src/java/com/samskivert/depot/clause/SelectClause.java b/src/main/java/com/samskivert/depot/clause/SelectClause.java
similarity index 100%
rename from src/java/com/samskivert/depot/clause/SelectClause.java
rename to src/main/java/com/samskivert/depot/clause/SelectClause.java
diff --git a/src/java/com/samskivert/depot/clause/Where.java b/src/main/java/com/samskivert/depot/clause/Where.java
similarity index 100%
rename from src/java/com/samskivert/depot/clause/Where.java
rename to src/main/java/com/samskivert/depot/clause/Where.java
diff --git a/src/java/com/samskivert/depot/clause/WhereClause.java b/src/main/java/com/samskivert/depot/clause/WhereClause.java
similarity index 100%
rename from src/java/com/samskivert/depot/clause/WhereClause.java
rename to src/main/java/com/samskivert/depot/clause/WhereClause.java
diff --git a/src/java/com/samskivert/depot/clause/package-info.java b/src/main/java/com/samskivert/depot/clause/package-info.java
similarity index 100%
rename from src/java/com/samskivert/depot/clause/package-info.java
rename to src/main/java/com/samskivert/depot/clause/package-info.java
diff --git a/src/java/com/samskivert/depot/expression/ColumnExp.java b/src/main/java/com/samskivert/depot/expression/ColumnExp.java
similarity index 100%
rename from src/java/com/samskivert/depot/expression/ColumnExp.java
rename to src/main/java/com/samskivert/depot/expression/ColumnExp.java
diff --git a/src/java/com/samskivert/depot/expression/FluentExp.java b/src/main/java/com/samskivert/depot/expression/FluentExp.java
similarity index 100%
rename from src/java/com/samskivert/depot/expression/FluentExp.java
rename to src/main/java/com/samskivert/depot/expression/FluentExp.java
diff --git a/src/java/com/samskivert/depot/expression/SQLExpression.java b/src/main/java/com/samskivert/depot/expression/SQLExpression.java
similarity index 100%
rename from src/java/com/samskivert/depot/expression/SQLExpression.java
rename to src/main/java/com/samskivert/depot/expression/SQLExpression.java
diff --git a/src/java/com/samskivert/depot/expression/package-info.java b/src/main/java/com/samskivert/depot/expression/package-info.java
similarity index 100%
rename from src/java/com/samskivert/depot/expression/package-info.java
rename to src/main/java/com/samskivert/depot/expression/package-info.java
diff --git a/src/java/com/samskivert/depot/impl/BuildVisitor.java b/src/main/java/com/samskivert/depot/impl/BuildVisitor.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/BuildVisitor.java
rename to src/main/java/com/samskivert/depot/impl/BuildVisitor.java
diff --git a/src/java/com/samskivert/depot/impl/DepotMarshaller.java b/src/main/java/com/samskivert/depot/impl/DepotMarshaller.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/DepotMarshaller.java
rename to src/main/java/com/samskivert/depot/impl/DepotMarshaller.java
diff --git a/src/java/com/samskivert/depot/impl/DepotMetaData.java b/src/main/java/com/samskivert/depot/impl/DepotMetaData.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/DepotMetaData.java
rename to src/main/java/com/samskivert/depot/impl/DepotMetaData.java
diff --git a/src/java/com/samskivert/depot/impl/DepotMigrationHistoryRecord.java b/src/main/java/com/samskivert/depot/impl/DepotMigrationHistoryRecord.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/DepotMigrationHistoryRecord.java
rename to src/main/java/com/samskivert/depot/impl/DepotMigrationHistoryRecord.java
diff --git a/src/java/com/samskivert/depot/impl/DepotTypes.java b/src/main/java/com/samskivert/depot/impl/DepotTypes.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/DepotTypes.java
rename to src/main/java/com/samskivert/depot/impl/DepotTypes.java
diff --git a/src/java/com/samskivert/depot/impl/DepotUtil.java b/src/main/java/com/samskivert/depot/impl/DepotUtil.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/DepotUtil.java
rename to src/main/java/com/samskivert/depot/impl/DepotUtil.java
diff --git a/src/java/com/samskivert/depot/impl/ExpressionEvaluator.java b/src/main/java/com/samskivert/depot/impl/ExpressionEvaluator.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/ExpressionEvaluator.java
rename to src/main/java/com/samskivert/depot/impl/ExpressionEvaluator.java
diff --git a/src/java/com/samskivert/depot/impl/FieldMarshaller.java b/src/main/java/com/samskivert/depot/impl/FieldMarshaller.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/FieldMarshaller.java
rename to src/main/java/com/samskivert/depot/impl/FieldMarshaller.java
diff --git a/src/java/com/samskivert/depot/impl/FindAllKeysQuery.java b/src/main/java/com/samskivert/depot/impl/FindAllKeysQuery.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/FindAllKeysQuery.java
rename to src/main/java/com/samskivert/depot/impl/FindAllKeysQuery.java
diff --git a/src/java/com/samskivert/depot/impl/FindAllQuery.java b/src/main/java/com/samskivert/depot/impl/FindAllQuery.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/FindAllQuery.java
rename to src/main/java/com/samskivert/depot/impl/FindAllQuery.java
diff --git a/src/java/com/samskivert/depot/impl/FindOneQuery.java b/src/main/java/com/samskivert/depot/impl/FindOneQuery.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/FindOneQuery.java
rename to src/main/java/com/samskivert/depot/impl/FindOneQuery.java
diff --git a/src/java/com/samskivert/depot/impl/FragmentVisitor.java b/src/main/java/com/samskivert/depot/impl/FragmentVisitor.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/FragmentVisitor.java
rename to src/main/java/com/samskivert/depot/impl/FragmentVisitor.java
diff --git a/src/java/com/samskivert/depot/impl/HSQLBuilder.java b/src/main/java/com/samskivert/depot/impl/HSQLBuilder.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/HSQLBuilder.java
rename to src/main/java/com/samskivert/depot/impl/HSQLBuilder.java
diff --git a/src/java/com/samskivert/depot/impl/IdentityValueGenerator.java b/src/main/java/com/samskivert/depot/impl/IdentityValueGenerator.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/IdentityValueGenerator.java
rename to src/main/java/com/samskivert/depot/impl/IdentityValueGenerator.java
diff --git a/src/java/com/samskivert/depot/impl/KeyCacheKey.java b/src/main/java/com/samskivert/depot/impl/KeyCacheKey.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/KeyCacheKey.java
rename to src/main/java/com/samskivert/depot/impl/KeyCacheKey.java
diff --git a/src/java/com/samskivert/depot/impl/Modifier.java b/src/main/java/com/samskivert/depot/impl/Modifier.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/Modifier.java
rename to src/main/java/com/samskivert/depot/impl/Modifier.java
diff --git a/src/java/com/samskivert/depot/impl/MySQLBuilder.java b/src/main/java/com/samskivert/depot/impl/MySQLBuilder.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/MySQLBuilder.java
rename to src/main/java/com/samskivert/depot/impl/MySQLBuilder.java
diff --git a/src/java/com/samskivert/depot/impl/Operation.java b/src/main/java/com/samskivert/depot/impl/Operation.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/Operation.java
rename to src/main/java/com/samskivert/depot/impl/Operation.java
diff --git a/src/java/com/samskivert/depot/impl/PostgreSQL4Builder.java b/src/main/java/com/samskivert/depot/impl/PostgreSQL4Builder.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/PostgreSQL4Builder.java
rename to src/main/java/com/samskivert/depot/impl/PostgreSQL4Builder.java
diff --git a/src/java/com/samskivert/depot/impl/PostgreSQLBuilder.java b/src/main/java/com/samskivert/depot/impl/PostgreSQLBuilder.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/PostgreSQLBuilder.java
rename to src/main/java/com/samskivert/depot/impl/PostgreSQLBuilder.java
diff --git a/src/java/com/samskivert/depot/impl/Query.java b/src/main/java/com/samskivert/depot/impl/Query.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/Query.java
rename to src/main/java/com/samskivert/depot/impl/Query.java
diff --git a/src/java/com/samskivert/depot/impl/SQLBuilder.java b/src/main/java/com/samskivert/depot/impl/SQLBuilder.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/SQLBuilder.java
rename to src/main/java/com/samskivert/depot/impl/SQLBuilder.java
diff --git a/src/java/com/samskivert/depot/impl/SimpleCacheKey.java b/src/main/java/com/samskivert/depot/impl/SimpleCacheKey.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/SimpleCacheKey.java
rename to src/main/java/com/samskivert/depot/impl/SimpleCacheKey.java
diff --git a/src/java/com/samskivert/depot/impl/TableValueGenerator.java b/src/main/java/com/samskivert/depot/impl/TableValueGenerator.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/TableValueGenerator.java
rename to src/main/java/com/samskivert/depot/impl/TableValueGenerator.java
diff --git a/src/java/com/samskivert/depot/impl/ValueGenerator.java b/src/main/java/com/samskivert/depot/impl/ValueGenerator.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/ValueGenerator.java
rename to src/main/java/com/samskivert/depot/impl/ValueGenerator.java
diff --git a/src/java/com/samskivert/depot/impl/clause/CreateIndexClause.java b/src/main/java/com/samskivert/depot/impl/clause/CreateIndexClause.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/clause/CreateIndexClause.java
rename to src/main/java/com/samskivert/depot/impl/clause/CreateIndexClause.java
diff --git a/src/java/com/samskivert/depot/impl/clause/DeleteClause.java b/src/main/java/com/samskivert/depot/impl/clause/DeleteClause.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/clause/DeleteClause.java
rename to src/main/java/com/samskivert/depot/impl/clause/DeleteClause.java
diff --git a/src/java/com/samskivert/depot/impl/clause/DropIndexClause.java b/src/main/java/com/samskivert/depot/impl/clause/DropIndexClause.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/clause/DropIndexClause.java
rename to src/main/java/com/samskivert/depot/impl/clause/DropIndexClause.java
diff --git a/src/java/com/samskivert/depot/impl/clause/UpdateClause.java b/src/main/java/com/samskivert/depot/impl/clause/UpdateClause.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/clause/UpdateClause.java
rename to src/main/java/com/samskivert/depot/impl/clause/UpdateClause.java
diff --git a/src/java/com/samskivert/depot/impl/expression/AggregateFun.java b/src/main/java/com/samskivert/depot/impl/expression/AggregateFun.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/expression/AggregateFun.java
rename to src/main/java/com/samskivert/depot/impl/expression/AggregateFun.java
diff --git a/src/java/com/samskivert/depot/impl/expression/ArgumentExp.java b/src/main/java/com/samskivert/depot/impl/expression/ArgumentExp.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/expression/ArgumentExp.java
rename to src/main/java/com/samskivert/depot/impl/expression/ArgumentExp.java
diff --git a/src/java/com/samskivert/depot/impl/expression/ConditionalFun.java b/src/main/java/com/samskivert/depot/impl/expression/ConditionalFun.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/expression/ConditionalFun.java
rename to src/main/java/com/samskivert/depot/impl/expression/ConditionalFun.java
diff --git a/src/java/com/samskivert/depot/impl/expression/DateFun.java b/src/main/java/com/samskivert/depot/impl/expression/DateFun.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/expression/DateFun.java
rename to src/main/java/com/samskivert/depot/impl/expression/DateFun.java
diff --git a/src/java/com/samskivert/depot/impl/expression/Function.java b/src/main/java/com/samskivert/depot/impl/expression/Function.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/expression/Function.java
rename to src/main/java/com/samskivert/depot/impl/expression/Function.java
diff --git a/src/java/com/samskivert/depot/impl/expression/IntervalExp.java b/src/main/java/com/samskivert/depot/impl/expression/IntervalExp.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/expression/IntervalExp.java
rename to src/main/java/com/samskivert/depot/impl/expression/IntervalExp.java
diff --git a/src/java/com/samskivert/depot/impl/expression/LiteralExp.java b/src/main/java/com/samskivert/depot/impl/expression/LiteralExp.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/expression/LiteralExp.java
rename to src/main/java/com/samskivert/depot/impl/expression/LiteralExp.java
diff --git a/src/java/com/samskivert/depot/impl/expression/NumericalFun.java b/src/main/java/com/samskivert/depot/impl/expression/NumericalFun.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/expression/NumericalFun.java
rename to src/main/java/com/samskivert/depot/impl/expression/NumericalFun.java
diff --git a/src/java/com/samskivert/depot/impl/expression/StringFun.java b/src/main/java/com/samskivert/depot/impl/expression/StringFun.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/expression/StringFun.java
rename to src/main/java/com/samskivert/depot/impl/expression/StringFun.java
diff --git a/src/java/com/samskivert/depot/impl/expression/ValueExp.java b/src/main/java/com/samskivert/depot/impl/expression/ValueExp.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/expression/ValueExp.java
rename to src/main/java/com/samskivert/depot/impl/expression/ValueExp.java
diff --git a/src/java/com/samskivert/depot/impl/operator/Add.java b/src/main/java/com/samskivert/depot/impl/operator/Add.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/Add.java
rename to src/main/java/com/samskivert/depot/impl/operator/Add.java
diff --git a/src/java/com/samskivert/depot/impl/operator/Arithmetic.java b/src/main/java/com/samskivert/depot/impl/operator/Arithmetic.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/Arithmetic.java
rename to src/main/java/com/samskivert/depot/impl/operator/Arithmetic.java
diff --git a/src/java/com/samskivert/depot/impl/operator/BaseOperator.java b/src/main/java/com/samskivert/depot/impl/operator/BaseOperator.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/BaseOperator.java
rename to src/main/java/com/samskivert/depot/impl/operator/BaseOperator.java
diff --git a/src/java/com/samskivert/depot/impl/operator/BinaryOperator.java b/src/main/java/com/samskivert/depot/impl/operator/BinaryOperator.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/BinaryOperator.java
rename to src/main/java/com/samskivert/depot/impl/operator/BinaryOperator.java
diff --git a/src/java/com/samskivert/depot/impl/operator/BitAnd.java b/src/main/java/com/samskivert/depot/impl/operator/BitAnd.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/BitAnd.java
rename to src/main/java/com/samskivert/depot/impl/operator/BitAnd.java
diff --git a/src/java/com/samskivert/depot/impl/operator/BitOr.java b/src/main/java/com/samskivert/depot/impl/operator/BitOr.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/BitOr.java
rename to src/main/java/com/samskivert/depot/impl/operator/BitOr.java
diff --git a/src/java/com/samskivert/depot/impl/operator/Div.java b/src/main/java/com/samskivert/depot/impl/operator/Div.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/Div.java
rename to src/main/java/com/samskivert/depot/impl/operator/Div.java
diff --git a/src/java/com/samskivert/depot/impl/operator/Equals.java b/src/main/java/com/samskivert/depot/impl/operator/Equals.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/Equals.java
rename to src/main/java/com/samskivert/depot/impl/operator/Equals.java
diff --git a/src/java/com/samskivert/depot/impl/operator/Exists.java b/src/main/java/com/samskivert/depot/impl/operator/Exists.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/Exists.java
rename to src/main/java/com/samskivert/depot/impl/operator/Exists.java
diff --git a/src/java/com/samskivert/depot/impl/operator/GreaterThan.java b/src/main/java/com/samskivert/depot/impl/operator/GreaterThan.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/GreaterThan.java
rename to src/main/java/com/samskivert/depot/impl/operator/GreaterThan.java
diff --git a/src/java/com/samskivert/depot/impl/operator/GreaterThanEquals.java b/src/main/java/com/samskivert/depot/impl/operator/GreaterThanEquals.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/GreaterThanEquals.java
rename to src/main/java/com/samskivert/depot/impl/operator/GreaterThanEquals.java
diff --git a/src/java/com/samskivert/depot/impl/operator/In.java b/src/main/java/com/samskivert/depot/impl/operator/In.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/In.java
rename to src/main/java/com/samskivert/depot/impl/operator/In.java
diff --git a/src/java/com/samskivert/depot/impl/operator/IsNull.java b/src/main/java/com/samskivert/depot/impl/operator/IsNull.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/IsNull.java
rename to src/main/java/com/samskivert/depot/impl/operator/IsNull.java
diff --git a/src/java/com/samskivert/depot/impl/operator/LessThan.java b/src/main/java/com/samskivert/depot/impl/operator/LessThan.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/LessThan.java
rename to src/main/java/com/samskivert/depot/impl/operator/LessThan.java
diff --git a/src/java/com/samskivert/depot/impl/operator/LessThanEquals.java b/src/main/java/com/samskivert/depot/impl/operator/LessThanEquals.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/LessThanEquals.java
rename to src/main/java/com/samskivert/depot/impl/operator/LessThanEquals.java
diff --git a/src/java/com/samskivert/depot/impl/operator/Like.java b/src/main/java/com/samskivert/depot/impl/operator/Like.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/Like.java
rename to src/main/java/com/samskivert/depot/impl/operator/Like.java
diff --git a/src/java/com/samskivert/depot/impl/operator/Mul.java b/src/main/java/com/samskivert/depot/impl/operator/Mul.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/Mul.java
rename to src/main/java/com/samskivert/depot/impl/operator/Mul.java
diff --git a/src/java/com/samskivert/depot/impl/operator/MultiOperator.java b/src/main/java/com/samskivert/depot/impl/operator/MultiOperator.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/MultiOperator.java
rename to src/main/java/com/samskivert/depot/impl/operator/MultiOperator.java
diff --git a/src/java/com/samskivert/depot/impl/operator/Not.java b/src/main/java/com/samskivert/depot/impl/operator/Not.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/Not.java
rename to src/main/java/com/samskivert/depot/impl/operator/Not.java
diff --git a/src/java/com/samskivert/depot/impl/operator/NotEquals.java b/src/main/java/com/samskivert/depot/impl/operator/NotEquals.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/NotEquals.java
rename to src/main/java/com/samskivert/depot/impl/operator/NotEquals.java
diff --git a/src/java/com/samskivert/depot/impl/operator/Sub.java b/src/main/java/com/samskivert/depot/impl/operator/Sub.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/operator/Sub.java
rename to src/main/java/com/samskivert/depot/impl/operator/Sub.java
diff --git a/src/java/com/samskivert/depot/impl/util/SeqImpl.java b/src/main/java/com/samskivert/depot/impl/util/SeqImpl.java
similarity index 100%
rename from src/java/com/samskivert/depot/impl/util/SeqImpl.java
rename to src/main/java/com/samskivert/depot/impl/util/SeqImpl.java
diff --git a/src/java/com/samskivert/depot/operator/Case.java b/src/main/java/com/samskivert/depot/operator/Case.java
similarity index 100%
rename from src/java/com/samskivert/depot/operator/Case.java
rename to src/main/java/com/samskivert/depot/operator/Case.java
diff --git a/src/java/com/samskivert/depot/operator/FullText.java b/src/main/java/com/samskivert/depot/operator/FullText.java
similarity index 100%
rename from src/java/com/samskivert/depot/operator/FullText.java
rename to src/main/java/com/samskivert/depot/operator/FullText.java
diff --git a/src/java/com/samskivert/depot/operator/package-info.java b/src/main/java/com/samskivert/depot/operator/package-info.java
similarity index 100%
rename from src/java/com/samskivert/depot/operator/package-info.java
rename to src/main/java/com/samskivert/depot/operator/package-info.java
diff --git a/src/java/com/samskivert/depot/overview.html b/src/main/java/com/samskivert/depot/overview.html
similarity index 100%
rename from src/java/com/samskivert/depot/overview.html
rename to src/main/java/com/samskivert/depot/overview.html
diff --git a/src/java/com/samskivert/depot/package-info.java b/src/main/java/com/samskivert/depot/package-info.java
similarity index 100%
rename from src/java/com/samskivert/depot/package-info.java
rename to src/main/java/com/samskivert/depot/package-info.java
diff --git a/src/java/com/samskivert/depot/tools/GenRecordTask.java b/src/main/java/com/samskivert/depot/tools/GenRecordTask.java
similarity index 100%
rename from src/java/com/samskivert/depot/tools/GenRecordTask.java
rename to src/main/java/com/samskivert/depot/tools/GenRecordTask.java
diff --git a/src/java/com/samskivert/depot/tools/package-info.java b/src/main/java/com/samskivert/depot/tools/package-info.java
similarity index 100%
rename from src/java/com/samskivert/depot/tools/package-info.java
rename to src/main/java/com/samskivert/depot/tools/package-info.java
diff --git a/src/java/com/samskivert/depot/tools/record_column.tmpl b/src/main/java/com/samskivert/depot/tools/record_column.tmpl
similarity index 100%
rename from src/java/com/samskivert/depot/tools/record_column.tmpl
rename to src/main/java/com/samskivert/depot/tools/record_column.tmpl
diff --git a/src/java/com/samskivert/depot/tools/record_key.tmpl b/src/main/java/com/samskivert/depot/tools/record_key.tmpl
similarity index 100%
rename from src/java/com/samskivert/depot/tools/record_key.tmpl
rename to src/main/java/com/samskivert/depot/tools/record_key.tmpl
diff --git a/src/java/com/samskivert/depot/tools/record_proto.tmpl b/src/main/java/com/samskivert/depot/tools/record_proto.tmpl
similarity index 100%
rename from src/java/com/samskivert/depot/tools/record_proto.tmpl
rename to src/main/java/com/samskivert/depot/tools/record_proto.tmpl
diff --git a/src/java/com/samskivert/depot/util/RuntimeUtil.java b/src/main/java/com/samskivert/depot/util/RuntimeUtil.java
similarity index 100%
rename from src/java/com/samskivert/depot/util/RuntimeUtil.java
rename to src/main/java/com/samskivert/depot/util/RuntimeUtil.java
diff --git a/src/java/com/samskivert/depot/util/Sequence.java b/src/main/java/com/samskivert/depot/util/Sequence.java
similarity index 100%
rename from src/java/com/samskivert/depot/util/Sequence.java
rename to src/main/java/com/samskivert/depot/util/Sequence.java
diff --git a/src/java/com/samskivert/depot/util/package-info.java b/src/main/java/com/samskivert/depot/util/package-info.java
similarity index 100%
rename from src/java/com/samskivert/depot/util/package-info.java
rename to src/main/java/com/samskivert/depot/util/package-info.java