131 files changed, 10 insertions, 10 deletions
diff --git a/.classpath b/.classpath
index f917dfe..d90bb62 100644
--- a/.classpath
+++ b/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src" />
-	<classpathentry kind="src" path="tests" output="bin/test-classes" />
+	<classpathentry kind="src" path="src/main/java" />
+	<classpathentry kind="src" path="src/test/java" output="bin/test-classes" />
 	<classpathentry kind="lib" path="ext/jcommander-1.17.jar" sourcepath="ext/src/jcommander-1.17.jar" />
 	<classpathentry kind="lib" path="ext/h2-1.3.168.jar" sourcepath="ext/src/h2-1.3.168.jar" />
 	<classpathentry kind="lib" path="ext/hsqldb-2.2.8.jar" />
diff --git a/build.moxie b/build.moxie
index 779e69f..7b8c6a2 100644
--- a/build.moxie
+++ b/build.moxie
@@ -7,7 +7,7 @@ requires: 0.6.2
 
 # Project Metadata
 name: Iciql
-description: a model-based database access wrapper for JDBC
+description: 'a model-based database access wrapper for JDBC'
 groupId: com.iciql
 artifactId: iciql
 version: 1.2.0-SNAPSHOT
@@ -24,14 +24,14 @@ mavenUrl: 'http://gitblit.github.com/iciql/maven'
 
 licenses:
 - {
-    name: Apache ASL v2.0
+    name: 'Apache ASL v2.0'
     url: 'http://www.apache.org/licenses/LICENSE-2.0.html'
   }
 
 developers:
 - {
   id: james
-  name: James Moger
+  name: 'James Moger'
   url: 'https://plus.google.com/u/0/116428776452027956920'
   organization: VAS
   organizationUrl: 'http://www.vas.com'
@@ -49,12 +49,12 @@ scm: {
 mainclass: com.iciql.util.GenerateModels
 
 sourceDirectories:
-- compile 'src'
-- test 'tests'
-- site 'docs'
+- compile 'src/main/java'
+- test 'src/test/java'
+- site 'src/site'
 
 resourceDirectories:
-- site 'docs/resources'
+- site 'src/site/resources'
 
 # compile for Java 6 class format
 tasks: {
diff --git a/build.xml b/build.xml
index 391e31b..d7dbdde 100644
--- a/build.xml
+++ b/build.xml
@@ -146,7 +146,7 @@
 				<available file="${project.outputDirectory}/performance_db.txt" />
 			</not>
 			<then>
-				<fail />
+				<fail message="Please run the &quot;testsuite&quot; target!"/>
 			</then>
 		</mx:if>
 					
diff --git a/src/com/iciql/CompareType.java b/src/main/java/com/iciql/CompareType.java
index 84e29fe..84e29fe 100644
--- a/src/com/iciql/CompareType.java
+++ b/src/main/java/com/iciql/CompareType.java
diff --git a/src/com/iciql/Condition.java b/src/main/java/com/iciql/Condition.java
index 17cb117..17cb117 100644
--- a/src/com/iciql/Condition.java
+++ b/src/main/java/com/iciql/Condition.java
diff --git a/src/com/iciql/ConditionAndOr.java b/src/main/java/com/iciql/ConditionAndOr.java
index 4d1cd0e..4d1cd0e 100644
--- a/src/com/iciql/ConditionAndOr.java
+++ b/src/main/java/com/iciql/ConditionAndOr.java
diff --git a/src/com/iciql/Constants.java b/src/main/java/com/iciql/Constants.java
index 8b54493..8b54493 100644
--- a/src/com/iciql/Constants.java
+++ b/src/main/java/com/iciql/Constants.java
diff --git a/src/com/iciql/Db.java b/src/main/java/com/iciql/Db.java
index ecd373c..ecd373c 100644
--- a/src/com/iciql/Db.java
+++ b/src/main/java/com/iciql/Db.java
diff --git a/src/com/iciql/DbInspector.java b/src/main/java/com/iciql/DbInspector.java
index acaceea..acaceea 100644
--- a/src/com/iciql/DbInspector.java
+++ b/src/main/java/com/iciql/DbInspector.java
diff --git a/src/com/iciql/DbUpgrader.java b/src/main/java/com/iciql/DbUpgrader.java
index 1303f4e..1303f4e 100644
--- a/src/com/iciql/DbUpgrader.java
+++ b/src/main/java/com/iciql/DbUpgrader.java
diff --git a/src/com/iciql/DbVersion.java b/src/main/java/com/iciql/DbVersion.java
index 6270e14..6270e14 100644
--- a/src/com/iciql/DbVersion.java
+++ b/src/main/java/com/iciql/DbVersion.java
diff --git a/src/com/iciql/Define.java b/src/main/java/com/iciql/Define.java
index 1810a4b..1810a4b 100644
--- a/src/com/iciql/Define.java
+++ b/src/main/java/com/iciql/Define.java
diff --git a/src/com/iciql/Filter.java b/src/main/java/com/iciql/Filter.java
index 99dbdc3..99dbdc3 100644
--- a/src/com/iciql/Filter.java
+++ b/src/main/java/com/iciql/Filter.java
diff --git a/src/com/iciql/Function.java b/src/main/java/com/iciql/Function.java
index 3faddb7..3faddb7 100644
--- a/src/com/iciql/Function.java
+++ b/src/main/java/com/iciql/Function.java
diff --git a/src/com/iciql/Iciql.java b/src/main/java/com/iciql/Iciql.java
index 9f73ffa..9f73ffa 100644
--- a/src/com/iciql/Iciql.java
+++ b/src/main/java/com/iciql/Iciql.java
diff --git a/src/com/iciql/IciqlException.java b/src/main/java/com/iciql/IciqlException.java
index 3f27b73..3f27b73 100644
--- a/src/com/iciql/IciqlException.java
+++ b/src/main/java/com/iciql/IciqlException.java
diff --git a/src/com/iciql/ModelUtils.java b/src/main/java/com/iciql/ModelUtils.java
index 56e6440..56e6440 100644
--- a/src/com/iciql/ModelUtils.java
+++ b/src/main/java/com/iciql/ModelUtils.java
diff --git a/src/com/iciql/OrderExpression.java b/src/main/java/com/iciql/OrderExpression.java
index f450bfb..f450bfb 100644
--- a/src/com/iciql/OrderExpression.java
+++ b/src/main/java/com/iciql/OrderExpression.java
diff --git a/src/com/iciql/Query.java b/src/main/java/com/iciql/Query.java
index 5dc78a5..5dc78a5 100644
--- a/src/com/iciql/Query.java
+++ b/src/main/java/com/iciql/Query.java
diff --git a/src/com/iciql/QueryBetween.java b/src/main/java/com/iciql/QueryBetween.java
index 72d19dc..72d19dc 100644
--- a/src/com/iciql/QueryBetween.java
+++ b/src/main/java/com/iciql/QueryBetween.java
diff --git a/src/com/iciql/QueryCondition.java b/src/main/java/com/iciql/QueryCondition.java
index 9613b1b..9613b1b 100644
--- a/src/com/iciql/QueryCondition.java
+++ b/src/main/java/com/iciql/QueryCondition.java
diff --git a/src/com/iciql/QueryJoin.java b/src/main/java/com/iciql/QueryJoin.java
index 6d0484e..6d0484e 100644
--- a/src/com/iciql/QueryJoin.java
+++ b/src/main/java/com/iciql/QueryJoin.java
diff --git a/src/com/iciql/QueryJoinCondition.java b/src/main/java/com/iciql/QueryJoinCondition.java
index 6dfd218..6dfd218 100644
--- a/src/com/iciql/QueryJoinCondition.java
+++ b/src/main/java/com/iciql/QueryJoinCondition.java
diff --git a/src/com/iciql/QueryWhere.java b/src/main/java/com/iciql/QueryWhere.java
index 5baa5ab..5baa5ab 100644
--- a/src/com/iciql/QueryWhere.java
+++ b/src/main/java/com/iciql/QueryWhere.java
diff --git a/src/com/iciql/RuntimeParameter.java b/src/main/java/com/iciql/RuntimeParameter.java
index 0fbedba..0fbedba 100644
--- a/src/com/iciql/RuntimeParameter.java
+++ b/src/main/java/com/iciql/RuntimeParameter.java
diff --git a/src/com/iciql/RuntimeToken.java b/src/main/java/com/iciql/RuntimeToken.java
index cbfd882..cbfd882 100644
--- a/src/com/iciql/RuntimeToken.java
+++ b/src/main/java/com/iciql/RuntimeToken.java
diff --git a/src/com/iciql/SQLDialect.java b/src/main/java/com/iciql/SQLDialect.java
index f62168e..f62168e 100644
--- a/src/com/iciql/SQLDialect.java
+++ b/src/main/java/com/iciql/SQLDialect.java
diff --git a/src/com/iciql/SQLDialectDefault.java b/src/main/java/com/iciql/SQLDialectDefault.java
index 364db7b..364db7b 100644
--- a/src/com/iciql/SQLDialectDefault.java
+++ b/src/main/java/com/iciql/SQLDialectDefault.java
diff --git a/src/com/iciql/SQLDialectDerby.java b/src/main/java/com/iciql/SQLDialectDerby.java
index f954a7c..f954a7c 100644
--- a/src/com/iciql/SQLDialectDerby.java
+++ b/src/main/java/com/iciql/SQLDialectDerby.java
diff --git a/src/com/iciql/SQLDialectH2.java b/src/main/java/com/iciql/SQLDialectH2.java
index 6b3bab1..6b3bab1 100644
--- a/src/com/iciql/SQLDialectH2.java
+++ b/src/main/java/com/iciql/SQLDialectH2.java
diff --git a/src/com/iciql/SQLDialectHSQL.java b/src/main/java/com/iciql/SQLDialectHSQL.java
index 82e6833..82e6833 100644
--- a/src/com/iciql/SQLDialectHSQL.java
+++ b/src/main/java/com/iciql/SQLDialectHSQL.java
diff --git a/src/com/iciql/SQLDialectMSSQL.java b/src/main/java/com/iciql/SQLDialectMSSQL.java
index 92b1297..92b1297 100644
--- a/src/com/iciql/SQLDialectMSSQL.java
+++ b/src/main/java/com/iciql/SQLDialectMSSQL.java
diff --git a/src/com/iciql/SQLDialectMySQL.java b/src/main/java/com/iciql/SQLDialectMySQL.java
index 52676d4..52676d4 100644
--- a/src/com/iciql/SQLDialectMySQL.java
+++ b/src/main/java/com/iciql/SQLDialectMySQL.java
diff --git a/src/com/iciql/SQLDialectPostgreSQL.java b/src/main/java/com/iciql/SQLDialectPostgreSQL.java
index fc115ab..fc115ab 100644
--- a/src/com/iciql/SQLDialectPostgreSQL.java
+++ b/src/main/java/com/iciql/SQLDialectPostgreSQL.java
diff --git a/src/com/iciql/SQLStatement.java b/src/main/java/com/iciql/SQLStatement.java
index 394fc42..394fc42 100644
--- a/src/com/iciql/SQLStatement.java
+++ b/src/main/java/com/iciql/SQLStatement.java
diff --git a/src/com/iciql/SelectColumn.java b/src/main/java/com/iciql/SelectColumn.java
index 43a1a93..43a1a93 100644
--- a/src/com/iciql/SelectColumn.java
+++ b/src/main/java/com/iciql/SelectColumn.java
diff --git a/src/com/iciql/SelectTable.java b/src/main/java/com/iciql/SelectTable.java
index 37b42c4..37b42c4 100644
--- a/src/com/iciql/SelectTable.java
+++ b/src/main/java/com/iciql/SelectTable.java
diff --git a/src/com/iciql/SubQuery.java b/src/main/java/com/iciql/SubQuery.java
index 398d214..398d214 100644
--- a/src/com/iciql/SubQuery.java
+++ b/src/main/java/com/iciql/SubQuery.java
diff --git a/src/com/iciql/SubQueryCondition.java b/src/main/java/com/iciql/SubQueryCondition.java
index effea3b..effea3b 100644
--- a/src/com/iciql/SubQueryCondition.java
+++ b/src/main/java/com/iciql/SubQueryCondition.java
diff --git a/src/com/iciql/TableDefinition.java b/src/main/java/com/iciql/TableDefinition.java
index 6d8cb6e..6d8cb6e 100644
--- a/src/com/iciql/TableDefinition.java
+++ b/src/main/java/com/iciql/TableDefinition.java
diff --git a/src/com/iciql/TableInspector.java b/src/main/java/com/iciql/TableInspector.java
index b717203..b717203 100644
--- a/src/com/iciql/TableInspector.java
+++ b/src/main/java/com/iciql/TableInspector.java
diff --git a/src/com/iciql/TestCondition.java b/src/main/java/com/iciql/TestCondition.java
index 010f5a1..010f5a1 100644
--- a/src/com/iciql/TestCondition.java
+++ b/src/main/java/com/iciql/TestCondition.java
diff --git a/src/com/iciql/Token.java b/src/main/java/com/iciql/Token.java
index cc2203c..cc2203c 100644
--- a/src/com/iciql/Token.java
+++ b/src/main/java/com/iciql/Token.java
diff --git a/src/com/iciql/UpdateColumn.java b/src/main/java/com/iciql/UpdateColumn.java
index 1eaf14c..1eaf14c 100644
--- a/src/com/iciql/UpdateColumn.java
+++ b/src/main/java/com/iciql/UpdateColumn.java
diff --git a/src/com/iciql/UpdateColumnIncrement.java b/src/main/java/com/iciql/UpdateColumnIncrement.java
index 143ce48..143ce48 100644
--- a/src/com/iciql/UpdateColumnIncrement.java
+++ b/src/main/java/com/iciql/UpdateColumnIncrement.java
diff --git a/src/com/iciql/UpdateColumnSet.java b/src/main/java/com/iciql/UpdateColumnSet.java
index a961480..a961480 100644
--- a/src/com/iciql/UpdateColumnSet.java
+++ b/src/main/java/com/iciql/UpdateColumnSet.java
diff --git a/src/com/iciql/ValidationRemark.java b/src/main/java/com/iciql/ValidationRemark.java
index 33320ab..33320ab 100644
--- a/src/com/iciql/ValidationRemark.java
+++ b/src/main/java/com/iciql/ValidationRemark.java
diff --git a/src/com/iciql/bytecode/And.java b/src/main/java/com/iciql/bytecode/And.java
index 808a9c1..808a9c1 100644
--- a/src/com/iciql/bytecode/And.java
+++ b/src/main/java/com/iciql/bytecode/And.java
diff --git a/src/com/iciql/bytecode/ArrayGet.java b/src/main/java/com/iciql/bytecode/ArrayGet.java
index 29516c2..29516c2 100644
--- a/src/com/iciql/bytecode/ArrayGet.java
+++ b/src/main/java/com/iciql/bytecode/ArrayGet.java
diff --git a/src/com/iciql/bytecode/CaseWhen.java b/src/main/java/com/iciql/bytecode/CaseWhen.java
index 2a1d69e..2a1d69e 100644
--- a/src/com/iciql/bytecode/CaseWhen.java
+++ b/src/main/java/com/iciql/bytecode/CaseWhen.java
diff --git a/src/com/iciql/bytecode/ClassReader.java b/src/main/java/com/iciql/bytecode/ClassReader.java
index 38fd2f5..38fd2f5 100644
--- a/src/com/iciql/bytecode/ClassReader.java
+++ b/src/main/java/com/iciql/bytecode/ClassReader.java
diff --git a/src/com/iciql/bytecode/Constant.java b/src/main/java/com/iciql/bytecode/Constant.java
index 65cd66b..65cd66b 100644
--- a/src/com/iciql/bytecode/Constant.java
+++ b/src/main/java/com/iciql/bytecode/Constant.java
diff --git a/src/com/iciql/bytecode/ConstantNumber.java b/src/main/java/com/iciql/bytecode/ConstantNumber.java
index 934de3d..934de3d 100644
--- a/src/com/iciql/bytecode/ConstantNumber.java
+++ b/src/main/java/com/iciql/bytecode/ConstantNumber.java
diff --git a/src/com/iciql/bytecode/ConstantString.java b/src/main/java/com/iciql/bytecode/ConstantString.java
index 985f97d..985f97d 100644
--- a/src/com/iciql/bytecode/ConstantString.java
+++ b/src/main/java/com/iciql/bytecode/ConstantString.java
diff --git a/src/com/iciql/bytecode/Function.java b/src/main/java/com/iciql/bytecode/Function.java
index 56a55ea..56a55ea 100644
--- a/src/com/iciql/bytecode/Function.java
+++ b/src/main/java/com/iciql/bytecode/Function.java
diff --git a/src/com/iciql/bytecode/Not.java b/src/main/java/com/iciql/bytecode/Not.java
index ab5ab84..ab5ab84 100644
--- a/src/com/iciql/bytecode/Not.java
+++ b/src/main/java/com/iciql/bytecode/Not.java
diff --git a/src/com/iciql/bytecode/Null.java b/src/main/java/com/iciql/bytecode/Null.java
index a28de56..a28de56 100644
--- a/src/com/iciql/bytecode/Null.java
+++ b/src/main/java/com/iciql/bytecode/Null.java
diff --git a/src/com/iciql/bytecode/Operation.java b/src/main/java/com/iciql/bytecode/Operation.java
index 7cd42d9..7cd42d9 100644
--- a/src/com/iciql/bytecode/Operation.java
+++ b/src/main/java/com/iciql/bytecode/Operation.java
diff --git a/src/com/iciql/bytecode/Or.java b/src/main/java/com/iciql/bytecode/Or.java
index 37da2a6..37da2a6 100644
--- a/src/com/iciql/bytecode/Or.java
+++ b/src/main/java/com/iciql/bytecode/Or.java
diff --git a/src/com/iciql/bytecode/Variable.java b/src/main/java/com/iciql/bytecode/Variable.java
index f3dbc01..f3dbc01 100644
--- a/src/com/iciql/bytecode/Variable.java
+++ b/src/main/java/com/iciql/bytecode/Variable.java
diff --git a/src/com/iciql/bytecode/package.html b/src/main/java/com/iciql/bytecode/package.html
index 5107481..5107481 100644
--- a/src/com/iciql/bytecode/package.html
+++ b/src/main/java/com/iciql/bytecode/package.html
diff --git a/src/com/iciql/package.html b/src/main/java/com/iciql/package.html
index 769837b..769837b 100644
--- a/src/com/iciql/package.html
+++ b/src/main/java/com/iciql/package.html
diff --git a/src/com/iciql/util/GenerateModels.java b/src/main/java/com/iciql/util/GenerateModels.java
index eac9f6c..eac9f6c 100644
--- a/src/com/iciql/util/GenerateModels.java
+++ b/src/main/java/com/iciql/util/GenerateModels.java
diff --git a/src/com/iciql/util/IciqlLogger.java b/src/main/java/com/iciql/util/IciqlLogger.java
index d8005bb..d8005bb 100644
--- a/src/com/iciql/util/IciqlLogger.java
+++ b/src/main/java/com/iciql/util/IciqlLogger.java
diff --git a/src/com/iciql/util/JdbcUtils.java b/src/main/java/com/iciql/util/JdbcUtils.java
index 4a4a2b6..4a4a2b6 100644
--- a/src/com/iciql/util/JdbcUtils.java
+++ b/src/main/java/com/iciql/util/JdbcUtils.java
diff --git a/src/com/iciql/util/Slf4jIciqlListener.java b/src/main/java/com/iciql/util/Slf4jIciqlListener.java
index ded393f..ded393f 100644
--- a/src/com/iciql/util/Slf4jIciqlListener.java
+++ b/src/main/java/com/iciql/util/Slf4jIciqlListener.java
diff --git a/src/com/iciql/util/StatementBuilder.java b/src/main/java/com/iciql/util/StatementBuilder.java
index 47e8054..47e8054 100644
--- a/src/com/iciql/util/StatementBuilder.java
+++ b/src/main/java/com/iciql/util/StatementBuilder.java
diff --git a/src/com/iciql/util/StringUtils.java b/src/main/java/com/iciql/util/StringUtils.java
index dd3f180..dd3f180 100644
--- a/src/com/iciql/util/StringUtils.java
+++ b/src/main/java/com/iciql/util/StringUtils.java
diff --git a/src/com/iciql/util/Utils.java b/src/main/java/com/iciql/util/Utils.java
index 77110b8..77110b8 100644
--- a/src/com/iciql/util/Utils.java
+++ b/src/main/java/com/iciql/util/Utils.java
diff --git a/src/com/iciql/util/WeakIdentityHashMap.java b/src/main/java/com/iciql/util/WeakIdentityHashMap.java
index bc03cd0..bc03cd0 100644
--- a/src/com/iciql/util/WeakIdentityHashMap.java
+++ b/src/main/java/com/iciql/util/WeakIdentityHashMap.java
diff --git a/src/com/iciql/util/package.html b/src/main/java/com/iciql/util/package.html
index 3d24dee..3d24dee 100644
--- a/src/com/iciql/util/package.html
+++ b/src/main/java/com/iciql/util/package.html
diff --git a/docs/00_index.mkd b/src/site/00_index.mkd
index 1c2bbd3..1c2bbd3 100644
--- a/docs/00_index.mkd
+++ b/src/site/00_index.mkd
diff --git a/docs/01_model_classes.mkd b/src/site/01_model_classes.mkd
index 8fedf18..8fedf18 100644
--- a/docs/01_model_classes.mkd
+++ b/src/site/01_model_classes.mkd
diff --git a/docs/02_table_versioning.mkd b/src/site/02_table_versioning.mkd
index 2e95aaa..2e95aaa 100644
--- a/docs/02_table_versioning.mkd
+++ b/src/site/02_table_versioning.mkd
diff --git a/docs/02_usage.mkd b/src/site/02_usage.mkd
index 7b9d89d..7b9d89d 100644
--- a/docs/02_usage.mkd
+++ b/src/site/02_usage.mkd
diff --git a/docs/03_performance.mkd b/src/site/03_performance.mkd
index 34e545c..34e545c 100644
--- a/docs/03_performance.mkd
+++ b/src/site/03_performance.mkd
diff --git a/docs/04_examples.mkd b/src/site/04_examples.mkd
index 33cb9c4..33cb9c4 100644
--- a/docs/04_examples.mkd
+++ b/src/site/04_examples.mkd
diff --git a/docs/04_tools.mkd b/src/site/04_tools.mkd
index 6d8c348..6d8c348 100644
--- a/docs/04_tools.mkd
+++ b/src/site/04_tools.mkd
diff --git a/docs/05_building.mkd b/src/site/05_building.mkd
index b5548bc..b5548bc 100644
--- a/docs/05_building.mkd
+++ b/src/site/05_building.mkd
diff --git a/docs/05_javadoc.mkd b/src/site/05_javadoc.mkd
index 0d0f161..0d0f161 100644
--- a/docs/05_javadoc.mkd
+++ b/src/site/05_javadoc.mkd
diff --git a/docs/05_releases.mkd b/src/site/05_releases.mkd
index 3e66494..3e66494 100644
--- a/docs/05_releases.mkd
+++ b/src/site/05_releases.mkd
diff --git a/docs/06_jaqu_comparison.mkd b/src/site/06_jaqu_comparison.mkd
index 20df5d5..20df5d5 100644
--- a/docs/06_jaqu_comparison.mkd
+++ b/src/site/06_jaqu_comparison.mkd
diff --git a/docs/custom.less b/src/site/custom.less
index 31098f5..31098f5 100644
--- a/docs/custom.less
+++ b/src/site/custom.less
diff --git a/docs/resources/.gitignore b/src/site/resources/.gitignore
index 1277f62..1277f62 100644
--- a/docs/resources/.gitignore
+++ b/src/site/resources/.gitignore
diff --git a/docs/resources/iciql-favicon.png b/src/site/resources/iciql-favicon.png
index dda916b..dda916b 100644
--- a/docs/resources/iciql-favicon.png
+++ b/src/site/resources/iciql-favicon.png
diff --git a/docs/resources/iciql.png b/src/site/resources/iciql.png
index aa1da69..aa1da69 100644
--- a/docs/resources/iciql.png
+++ b/src/site/resources/iciql.png
diff --git a/docs/resources/iciql.xcf b/src/site/resources/iciql.xcf
index 1f9f501..1f9f501 100644
--- a/docs/resources/iciql.xcf
+++ b/src/site/resources/iciql.xcf
diff --git a/docs/resources/iciql2.png b/src/site/resources/iciql2.png
index 9e96ae5..9e96ae5 100644
--- a/docs/resources/iciql2.png
+++ b/src/site/resources/iciql2.png
diff --git a/docs/resources/iciql2.xcf b/src/site/resources/iciql2.xcf
index c07a46b..c07a46b 100644
--- a/docs/resources/iciql2.xcf
+++ b/src/site/resources/iciql2.xcf
diff --git a/docs/resources/iciql_white.png b/src/site/resources/iciql_white.png
index 4a97147..4a97147 100644
--- a/docs/resources/iciql_white.png
+++ b/src/site/resources/iciql_white.png
diff --git a/docs/resources/javadoc.css b/src/site/resources/javadoc.css
index 8a8b972..8a8b972 100644
--- a/docs/resources/javadoc.css
+++ b/src/site/resources/javadoc.css
diff --git a/tests/com/iciql/test/AliasMapTest.java b/src/test/java/com/iciql/test/AliasMapTest.java
index 092f38b..092f38b 100644
--- a/tests/com/iciql/test/AliasMapTest.java
+++ b/src/test/java/com/iciql/test/AliasMapTest.java
diff --git a/tests/com/iciql/test/AnnotationsTest.java b/src/test/java/com/iciql/test/AnnotationsTest.java
index 6aa75ad..6aa75ad 100644
--- a/tests/com/iciql/test/AnnotationsTest.java
+++ b/src/test/java/com/iciql/test/AnnotationsTest.java
diff --git a/tests/com/iciql/test/BooleanModelTest.java b/src/test/java/com/iciql/test/BooleanModelTest.java
index 1e1630a..1e1630a 100644
--- a/tests/com/iciql/test/BooleanModelTest.java
+++ b/src/test/java/com/iciql/test/BooleanModelTest.java
diff --git a/tests/com/iciql/test/ClobTest.java b/src/test/java/com/iciql/test/ClobTest.java
index 49cee72..49cee72 100644
--- a/tests/com/iciql/test/ClobTest.java
+++ b/src/test/java/com/iciql/test/ClobTest.java
diff --git a/tests/com/iciql/test/ConcurrencyTest.java b/src/test/java/com/iciql/test/ConcurrencyTest.java
index e248265..e248265 100644
--- a/tests/com/iciql/test/ConcurrencyTest.java
+++ b/src/test/java/com/iciql/test/ConcurrencyTest.java
diff --git a/tests/com/iciql/test/DefaultValuesTest.java b/src/test/java/com/iciql/test/DefaultValuesTest.java
index 1374379..1374379 100644
--- a/tests/com/iciql/test/DefaultValuesTest.java
+++ b/src/test/java/com/iciql/test/DefaultValuesTest.java
diff --git a/tests/com/iciql/test/EnumsTest.java b/src/test/java/com/iciql/test/EnumsTest.java
index d8a0589..d8a0589 100644
--- a/tests/com/iciql/test/EnumsTest.java
+++ b/src/test/java/com/iciql/test/EnumsTest.java
diff --git a/tests/com/iciql/test/ForeignKeyTest.java b/src/test/java/com/iciql/test/ForeignKeyTest.java
index 6b4a3e7..6b4a3e7 100644
--- a/tests/com/iciql/test/ForeignKeyTest.java
+++ b/src/test/java/com/iciql/test/ForeignKeyTest.java
diff --git a/tests/com/iciql/test/IciqlSuite.java b/src/test/java/com/iciql/test/IciqlSuite.java
index a474404..a474404 100644
--- a/tests/com/iciql/test/IciqlSuite.java
+++ b/src/test/java/com/iciql/test/IciqlSuite.java
diff --git a/tests/com/iciql/test/JoinTest.java b/src/test/java/com/iciql/test/JoinTest.java
index 0e5e39d..0e5e39d 100644
--- a/tests/com/iciql/test/JoinTest.java
+++ b/src/test/java/com/iciql/test/JoinTest.java
diff --git a/tests/com/iciql/test/ModelsTest.java b/src/test/java/com/iciql/test/ModelsTest.java
index c5ba27a..c5ba27a 100644
--- a/tests/com/iciql/test/ModelsTest.java
+++ b/src/test/java/com/iciql/test/ModelsTest.java
diff --git a/tests/com/iciql/test/PrimitivesTest.java b/src/test/java/com/iciql/test/PrimitivesTest.java
index 3d3811e..3d3811e 100644
--- a/tests/com/iciql/test/PrimitivesTest.java
+++ b/src/test/java/com/iciql/test/PrimitivesTest.java
diff --git a/tests/com/iciql/test/RuntimeQueryTest.java b/src/test/java/com/iciql/test/RuntimeQueryTest.java
index c23527f..c23527f 100644
--- a/tests/com/iciql/test/RuntimeQueryTest.java
+++ b/src/test/java/com/iciql/test/RuntimeQueryTest.java
diff --git a/tests/com/iciql/test/SamplesTest.java b/src/test/java/com/iciql/test/SamplesTest.java
index 49a64f5..49a64f5 100644
--- a/tests/com/iciql/test/SamplesTest.java
+++ b/src/test/java/com/iciql/test/SamplesTest.java
diff --git a/tests/com/iciql/test/TransactionTest.java b/src/test/java/com/iciql/test/TransactionTest.java
index 026366e..026366e 100644
--- a/tests/com/iciql/test/TransactionTest.java
+++ b/src/test/java/com/iciql/test/TransactionTest.java
diff --git a/tests/com/iciql/test/UUIDTest.java b/src/test/java/com/iciql/test/UUIDTest.java
index bb09c9f..bb09c9f 100644
--- a/tests/com/iciql/test/UUIDTest.java
+++ b/src/test/java/com/iciql/test/UUIDTest.java
diff --git a/tests/com/iciql/test/UpdateTest.java b/src/test/java/com/iciql/test/UpdateTest.java
index 717c23a..717c23a 100644
--- a/tests/com/iciql/test/UpdateTest.java
+++ b/src/test/java/com/iciql/test/UpdateTest.java
diff --git a/tests/com/iciql/test/UpgradesTest.java b/src/test/java/com/iciql/test/UpgradesTest.java
index 7de691f..7de691f 100644
--- a/tests/com/iciql/test/UpgradesTest.java
+++ b/src/test/java/com/iciql/test/UpgradesTest.java
diff --git a/tests/com/iciql/test/ViewsTest.java b/src/test/java/com/iciql/test/ViewsTest.java
index be2e085..be2e085 100644
--- a/tests/com/iciql/test/ViewsTest.java
+++ b/src/test/java/com/iciql/test/ViewsTest.java
diff --git a/tests/com/iciql/test/models/BooleanModel.java b/src/test/java/com/iciql/test/models/BooleanModel.java
index d22e3c1..d22e3c1 100644
--- a/tests/com/iciql/test/models/BooleanModel.java
+++ b/src/test/java/com/iciql/test/models/BooleanModel.java
diff --git a/tests/com/iciql/test/models/CategoryAnnotationOnly.java b/src/test/java/com/iciql/test/models/CategoryAnnotationOnly.java
index b96ab04..b96ab04 100644
--- a/tests/com/iciql/test/models/CategoryAnnotationOnly.java
+++ b/src/test/java/com/iciql/test/models/CategoryAnnotationOnly.java
diff --git a/tests/com/iciql/test/models/ComplexObject.java b/src/test/java/com/iciql/test/models/ComplexObject.java
index ce9b9ec..ce9b9ec 100644
--- a/tests/com/iciql/test/models/ComplexObject.java
+++ b/src/test/java/com/iciql/test/models/ComplexObject.java
diff --git a/tests/com/iciql/test/models/Customer.java b/src/test/java/com/iciql/test/models/Customer.java
index ae8e40d..ae8e40d 100644
--- a/tests/com/iciql/test/models/Customer.java
+++ b/src/test/java/com/iciql/test/models/Customer.java
diff --git a/tests/com/iciql/test/models/DefaultValuesModel.java b/src/test/java/com/iciql/test/models/DefaultValuesModel.java
index cb3b421..cb3b421 100644
--- a/tests/com/iciql/test/models/DefaultValuesModel.java
+++ b/src/test/java/com/iciql/test/models/DefaultValuesModel.java
diff --git a/tests/com/iciql/test/models/EnumModels.java b/src/test/java/com/iciql/test/models/EnumModels.java
index a865f6c..a865f6c 100644
--- a/tests/com/iciql/test/models/EnumModels.java
+++ b/src/test/java/com/iciql/test/models/EnumModels.java
diff --git a/tests/com/iciql/test/models/MultipleBoolsModel.java b/src/test/java/com/iciql/test/models/MultipleBoolsModel.java
index 7bc429c..7bc429c 100644
--- a/tests/com/iciql/test/models/MultipleBoolsModel.java
+++ b/src/test/java/com/iciql/test/models/MultipleBoolsModel.java
diff --git a/tests/com/iciql/test/models/Order.java b/src/test/java/com/iciql/test/models/Order.java
index 1fa9097..1fa9097 100644
--- a/tests/com/iciql/test/models/Order.java
+++ b/src/test/java/com/iciql/test/models/Order.java
diff --git a/tests/com/iciql/test/models/PrimitivesModel.java b/src/test/java/com/iciql/test/models/PrimitivesModel.java
index 44e8b9b..44e8b9b 100644
--- a/tests/com/iciql/test/models/PrimitivesModel.java
+++ b/src/test/java/com/iciql/test/models/PrimitivesModel.java
diff --git a/tests/com/iciql/test/models/Product.java b/src/test/java/com/iciql/test/models/Product.java
index 241a3d3..241a3d3 100644
--- a/tests/com/iciql/test/models/Product.java
+++ b/src/test/java/com/iciql/test/models/Product.java
diff --git a/tests/com/iciql/test/models/ProductAnnotationOnly.java b/src/test/java/com/iciql/test/models/ProductAnnotationOnly.java
index 1f6b4e2..1f6b4e2 100644
--- a/tests/com/iciql/test/models/ProductAnnotationOnly.java
+++ b/src/test/java/com/iciql/test/models/ProductAnnotationOnly.java
diff --git a/tests/com/iciql/test/models/ProductAnnotationOnlyWithForeignKey.java b/src/test/java/com/iciql/test/models/ProductAnnotationOnlyWithForeignKey.java
index 4268a89..4268a89 100644
--- a/tests/com/iciql/test/models/ProductAnnotationOnlyWithForeignKey.java
+++ b/src/test/java/com/iciql/test/models/ProductAnnotationOnlyWithForeignKey.java
diff --git a/tests/com/iciql/test/models/ProductInheritedAnnotation.java b/src/test/java/com/iciql/test/models/ProductInheritedAnnotation.java
index 112f4ef..112f4ef 100644
--- a/tests/com/iciql/test/models/ProductInheritedAnnotation.java
+++ b/src/test/java/com/iciql/test/models/ProductInheritedAnnotation.java
diff --git a/tests/com/iciql/test/models/ProductMixedAnnotation.java b/src/test/java/com/iciql/test/models/ProductMixedAnnotation.java
index a893a69..a893a69 100644
--- a/tests/com/iciql/test/models/ProductMixedAnnotation.java
+++ b/src/test/java/com/iciql/test/models/ProductMixedAnnotation.java
diff --git a/tests/com/iciql/test/models/ProductNoCreateTable.java b/src/test/java/com/iciql/test/models/ProductNoCreateTable.java
index cbf96e9..cbf96e9 100644
--- a/tests/com/iciql/test/models/ProductNoCreateTable.java
+++ b/src/test/java/com/iciql/test/models/ProductNoCreateTable.java
diff --git a/tests/com/iciql/test/models/ProductView.java b/src/test/java/com/iciql/test/models/ProductView.java
index 2efe9eb..2efe9eb 100644
--- a/tests/com/iciql/test/models/ProductView.java
+++ b/src/test/java/com/iciql/test/models/ProductView.java
diff --git a/tests/com/iciql/test/models/ProductViewFromQuery.java b/src/test/java/com/iciql/test/models/ProductViewFromQuery.java
index 2f2f194..2f2f194 100644
--- a/tests/com/iciql/test/models/ProductViewFromQuery.java
+++ b/src/test/java/com/iciql/test/models/ProductViewFromQuery.java
diff --git a/tests/com/iciql/test/models/ProductViewInherited.java b/src/test/java/com/iciql/test/models/ProductViewInherited.java
index e9c274b..e9c274b 100644
--- a/tests/com/iciql/test/models/ProductViewInherited.java
+++ b/src/test/java/com/iciql/test/models/ProductViewInherited.java
diff --git a/tests/com/iciql/test/models/ProductViewInheritedComplex.java b/src/test/java/com/iciql/test/models/ProductViewInheritedComplex.java
index 55e7ba8..55e7ba8 100644
--- a/tests/com/iciql/test/models/ProductViewInheritedComplex.java
+++ b/src/test/java/com/iciql/test/models/ProductViewInheritedComplex.java
diff --git a/tests/com/iciql/test/models/StaticQueries.java b/src/test/java/com/iciql/test/models/StaticQueries.java
index 09f84e6..09f84e6 100644
--- a/tests/com/iciql/test/models/StaticQueries.java
+++ b/src/test/java/com/iciql/test/models/StaticQueries.java
diff --git a/tests/com/iciql/test/models/SupportedTypes.java b/src/test/java/com/iciql/test/models/SupportedTypes.java
index 1aaa833..1aaa833 100644
--- a/tests/com/iciql/test/models/SupportedTypes.java
+++ b/src/test/java/com/iciql/test/models/SupportedTypes.java